From b11a8f91923aaa8c55d54d1281ef5edc262802f3 Mon Sep 17 00:00:00 2001
From: Rick Herrick <jrherrick@wustl.edu>
Date: Thu, 4 Feb 2016 16:04:51 -0600
Subject: [PATCH] Removed code to be generated. Added source sets for generated
 code.

---
 .gitignore                                    |    1 +
 build.gradle                                  |   31 +-
 .../nrg/xdat/om/ArcArchivespecification.java  |   41 -
 ...cArchivespecificationNotificationType.java |   41 -
 .../nrg/xdat/om/ArcFieldspecification.java    |   41 -
 .../java/org/nrg/xdat/om/ArcPathinfo.java     |   41 -
 .../java/org/nrg/xdat/om/ArcPipelinedata.java |   41 -
 .../nrg/xdat/om/ArcPipelineparameterdata.java |   41 -
 src/main/java/org/nrg/xdat/om/ArcProject.java |   41 -
 .../org/nrg/xdat/om/ArcProjectDescendant.java |   41 -
 .../xdat/om/ArcProjectDescendantPipeline.java |   41 -
 .../org/nrg/xdat/om/ArcProjectPipeline.java   |   41 -
 .../java/org/nrg/xdat/om/ArcProperty.java     |   41 -
 src/main/java/org/nrg/xdat/om/CatCatalog.java |   41 -
 .../org/nrg/xdat/om/CatCatalogMetafield.java  |   41 -
 .../java/org/nrg/xdat/om/CatCatalogTag.java   |   41 -
 .../java/org/nrg/xdat/om/CatDcmcatalog.java   |   41 -
 .../java/org/nrg/xdat/om/CatDcmentry.java     |   41 -
 src/main/java/org/nrg/xdat/om/CatEntry.java   |   41 -
 .../org/nrg/xdat/om/CatEntryMetafield.java    |   41 -
 .../java/org/nrg/xdat/om/CatEntryTag.java     |   41 -
 .../org/nrg/xdat/om/PipePipelinedetails.java  |   41 -
 .../xdat/om/PipePipelinedetailsElement.java   |   41 -
 .../xdat/om/PipePipelinedetailsParameter.java |   41 -
 .../nrg/xdat/om/PipePipelinerepository.java   |   41 -
 .../java/org/nrg/xdat/om/ProvProcess.java     |   41 -
 .../java/org/nrg/xdat/om/ProvProcessstep.java |   41 -
 .../nrg/xdat/om/ProvProcessstepLibrary.java   |   41 -
 .../nrg/xdat/om/ScrScreeningassessment.java   |   41 -
 .../org/nrg/xdat/om/ScrScreeningscandata.java |   41 -
 .../org/nrg/xdat/om/ValAdditionalval.java     |   41 -
 .../java/org/nrg/xdat/om/ValProtocoldata.java |   41 -
 .../nrg/xdat/om/ValProtocoldataComment.java   |   41 -
 .../nrg/xdat/om/ValProtocoldataCondition.java |   41 -
 .../nrg/xdat/om/ValProtocoldataScanCheck.java |   41 -
 .../om/ValProtocoldataScanCheckComment.java   |   41 -
 .../om/ValProtocoldataScanCheckCondition.java |   41 -
 .../om/WrkAbstractexecutionenvironment.java   |   41 -
 .../java/org/nrg/xdat/om/WrkWorkflowdata.java |   41 -
 .../xdat/om/WrkXnatexecutionenvironment.java  |   41 -
 .../om/WrkXnatexecutionenvironmentNotify.java |   41 -
 .../WrkXnatexecutionenvironmentParameter.java |   41 -
 .../xdat/om/XnatAbstractdemographicdata.java  |   41 -
 .../org/nrg/xdat/om/XnatAbstractprotocol.java |   41 -
 .../org/nrg/xdat/om/XnatAbstractresource.java |   41 -
 .../nrg/xdat/om/XnatAbstractresourceTag.java  |   41 -
 .../nrg/xdat/om/XnatAbstractstatistics.java   |   41 -
 .../xdat/om/XnatAbstractsubjectmetadata.java  |   41 -
 .../java/org/nrg/xdat/om/XnatAddfield.java    |   41 -
 .../nrg/xdat/om/XnatAscidresearchdata.java    |   41 -
 .../om/XnatAsideeffectspittsburghdata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatAupdrs3data.java |   41 -
 .../java/org/nrg/xdat/om/XnatAybocsdata.java  |   41 -
 .../java/org/nrg/xdat/om/XnatAygtssdata.java  |   41 -
 .../org/nrg/xdat/om/XnatComputationdata.java  |   41 -
 .../org/nrg/xdat/om/XnatContrastbolus.java    |   41 -
 .../java/org/nrg/xdat/om/XnatCrscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatCrsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatCtscandata.java  |   41 -
 .../nrg/xdat/om/XnatCtscandataFocalspot.java  |   41 -
 .../org/nrg/xdat/om/XnatCtsessiondata.java    |   41 -
 .../org/nrg/xdat/om/XnatDatatypeprotocol.java |   41 -
 .../org/nrg/xdat/om/XnatDemographicdata.java  |   41 -
 .../java/org/nrg/xdat/om/XnatDeriveddata.java |   41 -
 .../java/org/nrg/xdat/om/XnatDicomseries.java |   41 -
 .../org/nrg/xdat/om/XnatDicomseriesImage.java |   41 -
 .../xdat/om/XnatDx3dcraniofacialscandata.java |   41 -
 .../om/XnatDx3dcraniofacialsessiondata.java   |   41 -
 .../java/org/nrg/xdat/om/XnatDxscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatDxsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatEcgscandata.java |   41 -
 .../org/nrg/xdat/om/XnatEcgsessiondata.java   |   41 -
 .../java/org/nrg/xdat/om/XnatEegscandata.java |   41 -
 .../org/nrg/xdat/om/XnatEegsessiondata.java   |   41 -
 .../java/org/nrg/xdat/om/XnatEpsscandata.java |   41 -
 .../org/nrg/xdat/om/XnatEpssessiondata.java   |   41 -
 .../java/org/nrg/xdat/om/XnatEsscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatEssessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatEsvscandata.java |   41 -
 .../org/nrg/xdat/om/XnatEsvsessiondata.java   |   41 -
 .../org/nrg/xdat/om/XnatExperimentdata.java   |   41 -
 .../nrg/xdat/om/XnatExperimentdataField.java  |   41 -
 .../nrg/xdat/om/XnatExperimentdataShare.java  |   41 -
 .../nrg/xdat/om/XnatFielddefinitiongroup.java |   41 -
 .../om/XnatFielddefinitiongroupField.java     |   41 -
 ...ielddefinitiongroupFieldPossiblevalue.java |   41 -
 .../java/org/nrg/xdat/om/XnatGenericdata.java |   41 -
 .../java/org/nrg/xdat/om/XnatGmscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatGmsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatGmvscandata.java |   41 -
 .../org/nrg/xdat/om/XnatGmvsessiondata.java   |   41 -
 .../java/org/nrg/xdat/om/XnatHdscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatHdsessiondata.java    |   41 -
 .../nrg/xdat/om/XnatImageassessordata.java    |   41 -
 .../org/nrg/xdat/om/XnatImageresource.java    |   41 -
 .../nrg/xdat/om/XnatImageresourceseries.java  |   41 -
 .../org/nrg/xdat/om/XnatImagescandata.java    |   41 -
 .../nrg/xdat/om/XnatImagescandataShare.java   |   41 -
 .../org/nrg/xdat/om/XnatImagesessiondata.java |   41 -
 .../org/nrg/xdat/om/XnatInvestigatordata.java |   41 -
 .../java/org/nrg/xdat/om/XnatIoscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatIosessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatMegscandata.java |   41 -
 .../org/nrg/xdat/om/XnatMegsessiondata.java   |   41 -
 .../java/org/nrg/xdat/om/XnatMgscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatMgsessiondata.java    |   41 -
 .../org/nrg/xdat/om/XnatMrassessordata.java   |   41 -
 .../org/nrg/xdat/om/XnatMrqcscandata.java     |   41 -
 .../java/org/nrg/xdat/om/XnatMrscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatMrsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatMrsscandata.java |   41 -
 .../java/org/nrg/xdat/om/XnatNmscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatNmsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatOpscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatOpsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatOptscandata.java |   41 -
 .../org/nrg/xdat/om/XnatOptsessiondata.java   |   41 -
 .../nrg/xdat/om/XnatOtherdicomscandata.java   |   41 -
 .../xdat/om/XnatOtherdicomsessiondata.java    |   41 -
 .../org/nrg/xdat/om/XnatOtherqcscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatPetassessordata.java  |   41 -
 .../org/nrg/xdat/om/XnatPetmrsessiondata.java |   41 -
 .../org/nrg/xdat/om/XnatPetqcscandata.java    |   41 -
 .../om/XnatPetqcscandataProcessingerror.java  |   41 -
 .../java/org/nrg/xdat/om/XnatPetscandata.java |   41 -
 .../org/nrg/xdat/om/XnatPetscandataFrame.java |   41 -
 .../org/nrg/xdat/om/XnatPetsessiondata.java   |   41 -
 .../java/org/nrg/xdat/om/XnatProjectdata.java |   41 -
 .../org/nrg/xdat/om/XnatProjectdataAlias.java |   41 -
 .../org/nrg/xdat/om/XnatProjectdataField.java |   41 -
 .../nrg/xdat/om/XnatProjectparticipant.java   |   41 -
 .../nrg/xdat/om/XnatPublicationresource.java  |   41 -
 .../java/org/nrg/xdat/om/XnatPvisitdata.java  |   41 -
 .../org/nrg/xdat/om/XnatQcassessmentdata.java |   41 -
 .../nrg/xdat/om/XnatQcassessmentdataScan.java |   41 -
 .../om/XnatQcassessmentdataScanSlice.java     |   41 -
 .../nrg/xdat/om/XnatQcmanualassessordata.java |   41 -
 .../java/org/nrg/xdat/om/XnatQcscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatQcscandataField.java  |   41 -
 .../xdat/om/XnatReconstructedimagedata.java   |   41 -
 .../om/XnatReconstructedimagedataScanid.java  |   41 -
 .../org/nrg/xdat/om/XnatRegionresource.java   |   41 -
 .../nrg/xdat/om/XnatRegionresourceLabel.java  |   41 -
 .../java/org/nrg/xdat/om/XnatResource.java    |   41 -
 .../org/nrg/xdat/om/XnatResourcecatalog.java  |   41 -
 .../org/nrg/xdat/om/XnatResourceseries.java   |   41 -
 .../java/org/nrg/xdat/om/XnatRfscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatRfsessiondata.java    |   41 -
 .../org/nrg/xdat/om/XnatRtimagescandata.java  |   41 -
 .../org/nrg/xdat/om/XnatRtsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatScscandata.java  |   41 -
 .../java/org/nrg/xdat/om/XnatSegscandata.java |   41 -
 .../java/org/nrg/xdat/om/XnatSmscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatSmsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatSrscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatSrsessiondata.java    |   41 -
 .../org/nrg/xdat/om/XnatStatisticsdata.java   |   41 -
 .../xdat/om/XnatStatisticsdataAddfield.java   |   41 -
 ...natStatisticsdataAdditionalstatistics.java |   41 -
 .../org/nrg/xdat/om/XnatStudyprotocol.java    |   41 -
 .../xdat/om/XnatStudyprotocolCondition.java   |   41 -
 .../nrg/xdat/om/XnatStudyprotocolGroup.java   |   41 -
 .../nrg/xdat/om/XnatStudyprotocolSession.java |   41 -
 .../xdat/om/XnatStudyprotocolVariable.java    |   41 -
 .../nrg/xdat/om/XnatSubjectassessordata.java  |   41 -
 .../java/org/nrg/xdat/om/XnatSubjectdata.java |   41 -
 .../org/nrg/xdat/om/XnatSubjectdataAddid.java |   41 -
 .../org/nrg/xdat/om/XnatSubjectdataField.java |   41 -
 .../org/nrg/xdat/om/XnatSubjectmetadata.java  |   41 -
 .../nrg/xdat/om/XnatSubjectvariablesdata.java |   41 -
 .../om/XnatSubjectvariablesdataVariable.java  |   41 -
 .../java/org/nrg/xdat/om/XnatUsscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatUssessiondata.java    |   41 -
 .../org/nrg/xdat/om/XnatValidationdata.java   |   41 -
 .../nrg/xdat/om/XnatVoiceaudioscandata.java   |   41 -
 .../org/nrg/xdat/om/XnatVolumetricregion.java |   41 -
 .../om/XnatVolumetricregionSubregion.java     |   41 -
 .../org/nrg/xdat/om/XnatXa3dscandata.java     |   41 -
 .../org/nrg/xdat/om/XnatXa3dsessiondata.java  |   41 -
 .../java/org/nrg/xdat/om/XnatXascandata.java  |   41 -
 .../org/nrg/xdat/om/XnatXasessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatXcscandata.java  |   41 -
 .../org/nrg/xdat/om/XnatXcsessiondata.java    |   41 -
 .../java/org/nrg/xdat/om/XnatXcvscandata.java |   41 -
 .../org/nrg/xdat/om/XnatXcvsessiondata.java   |   41 -
 .../org/nrg/xdat/om/base/BaseCatCatalog.java  |   41 -
 .../xdat/om/base/BaseCatCatalogMetafield.java |   41 -
 .../nrg/xdat/om/base/BaseCatCatalogTag.java   |   41 -
 .../nrg/xdat/om/base/BaseCatDcmcatalog.java   |   41 -
 .../org/nrg/xdat/om/base/BaseCatDcmentry.java |   41 -
 .../org/nrg/xdat/om/base/BaseCatEntry.java    |   41 -
 .../xdat/om/base/BaseCatEntryMetafield.java   |   41 -
 .../org/nrg/xdat/om/base/BaseCatEntryTag.java |   41 -
 .../auto/AutoArcArchivespecification.java     | 1000 ----
 ...cArchivespecificationNotificationType.java |  213 -
 .../base/auto/AutoArcFieldspecification.java  |  213 -
 .../xdat/om/base/auto/AutoArcPathinfo.java    |  329 --
 .../om/base/auto/AutoArcPipelinedata.java     |  364 --
 .../auto/AutoArcPipelineparameterdata.java    |  387 --
 .../nrg/xdat/om/base/auto/AutoArcProject.java |  627 ---
 .../base/auto/AutoArcProjectDescendant.java   |  246 -
 .../AutoArcProjectDescendantPipeline.java     |  247 -
 .../om/base/auto/AutoArcProjectPipeline.java  |  247 -
 .../xdat/om/base/auto/AutoArcProperty.java    |  213 -
 .../nrg/xdat/om/base/auto/AutoCatCatalog.java |  492 --
 .../om/base/auto/AutoCatCatalogMetafield.java |  213 -
 .../xdat/om/base/auto/AutoCatCatalogTag.java  |  184 -
 .../xdat/om/base/auto/AutoCatDcmcatalog.java  |  479 --
 .../xdat/om/base/auto/AutoCatDcmentry.java    |  247 -
 .../nrg/xdat/om/base/auto/AutoCatEntry.java   |  687 ---
 .../om/base/auto/AutoCatEntryMetafield.java   |  213 -
 .../xdat/om/base/auto/AutoCatEntryTag.java    |  184 -
 .../om/base/auto/AutoPipePipelinedetails.java |  366 --
 .../auto/AutoPipePipelinedetailsElement.java  |  184 -
 .../AutoPipePipelinedetailsParameter.java     |  271 --
 .../base/auto/AutoPipePipelinerepository.java |  217 -
 .../xdat/om/base/auto/AutoProvProcess.java    |  217 -
 .../om/base/auto/AutoProvProcessstep.java     |  536 ---
 .../base/auto/AutoProvProcessstepLibrary.java |  213 -
 .../base/auto/AutoScrScreeningassessment.java |  338 --
 .../base/auto/AutoScrScreeningscandata.java   |  242 -
 .../om/base/auto/AutoValAdditionalval.java    |  155 -
 .../om/base/auto/AutoValProtocoldata.java     |  496 --
 .../base/auto/AutoValProtocoldataComment.java |  242 -
 .../auto/AutoValProtocoldataCondition.java    |  300 --
 .../auto/AutoValProtocoldataScanCheck.java    |  429 --
 .../AutoValProtocoldataScanCheckComment.java  |  242 -
 ...AutoValProtocoldataScanCheckCondition.java |  300 --
 .../AutoWrkAbstractexecutionenvironment.java  |  157 -
 .../om/base/auto/AutoWrkWorkflowdata.java     |  827 ----
 .../auto/AutoWrkXnatexecutionenvironment.java |  632 ---
 ...AutoWrkXnatexecutionenvironmentNotify.java |  184 -
 ...oWrkXnatexecutionenvironmentParameter.java |  213 -
 .../auto/AutoXnatAbstractdemographicdata.java |  157 -
 .../base/auto/AutoXnatAbstractprotocol.java   |  289 --
 .../base/auto/AutoXnatAbstractresource.java   |  319 --
 .../auto/AutoXnatAbstractresourceTag.java     |  213 -
 .../base/auto/AutoXnatAbstractstatistics.java |  157 -
 .../auto/AutoXnatAbstractsubjectmetadata.java |  157 -
 .../xdat/om/base/auto/AutoXnatAddfield.java   |  213 -
 .../base/auto/AutoXnatAscidresearchdata.java  | 4142 -----------------
 .../AutoXnatAsideeffectspittsburghdata.java   |  749 ---
 .../om/base/auto/AutoXnatAupdrs3data.java     | 1155 -----
 .../xdat/om/base/auto/AutoXnatAybocsdata.java |  691 ---
 .../xdat/om/base/auto/AutoXnatAygtssdata.java |  662 ---
 .../om/base/auto/AutoXnatComputationdata.java |  271 --
 .../om/base/auto/AutoXnatContrastbolus.java   |  387 --
 .../xdat/om/base/auto/AutoXnatCrscandata.java |  189 -
 .../om/base/auto/AutoXnatCrsessiondata.java   |  198 -
 .../xdat/om/base/auto/AutoXnatCtscandata.java | 1387 ------
 .../auto/AutoXnatCtscandataFocalspot.java     |  184 -
 .../om/base/auto/AutoXnatCtsessiondata.java   |  198 -
 .../base/auto/AutoXnatDatatypeprotocol.java   |  251 -
 .../om/base/auto/AutoXnatDemographicdata.java |  856 ----
 .../om/base/auto/AutoXnatDeriveddata.java     |  281 --
 .../om/base/auto/AutoXnatDicomseries.java     |  655 ---
 .../base/auto/AutoXnatDicomseriesImage.java   |  258 -
 .../AutoXnatDx3dcraniofacialscandata.java     |  189 -
 .../AutoXnatDx3dcraniofacialsessiondata.java  |  198 -
 .../xdat/om/base/auto/AutoXnatDxscandata.java |  189 -
 .../om/base/auto/AutoXnatDxsessiondata.java   |  198 -
 .../om/base/auto/AutoXnatEcgscandata.java     |  189 -
 .../om/base/auto/AutoXnatEcgsessiondata.java  |  198 -
 .../om/base/auto/AutoXnatEegscandata.java     |  189 -
 .../om/base/auto/AutoXnatEegsessiondata.java  |  198 -
 .../om/base/auto/AutoXnatEpsscandata.java     |  189 -
 .../om/base/auto/AutoXnatEpssessiondata.java  |  198 -
 .../xdat/om/base/auto/AutoXnatEsscandata.java |  189 -
 .../om/base/auto/AutoXnatEssessiondata.java   |  198 -
 .../om/base/auto/AutoXnatEsvscandata.java     |  189 -
 .../om/base/auto/AutoXnatEsvsessiondata.java  |  198 -
 .../om/base/auto/AutoXnatExperimentdata.java  |  937 ----
 .../auto/AutoXnatExperimentdataField.java     |  213 -
 .../auto/AutoXnatExperimentdataShare.java     |  300 --
 .../auto/AutoXnatFielddefinitiongroup.java    |  362 --
 .../AutoXnatFielddefinitiongroupField.java    |  420 --
 ...ielddefinitiongroupFieldPossiblevalue.java |  213 -
 .../om/base/auto/AutoXnatGenericdata.java     |  189 -
 .../xdat/om/base/auto/AutoXnatGmscandata.java |  189 -
 .../om/base/auto/AutoXnatGmsessiondata.java   |  198 -
 .../om/base/auto/AutoXnatGmvscandata.java     |  189 -
 .../om/base/auto/AutoXnatGmvsessiondata.java  |  198 -
 .../xdat/om/base/auto/AutoXnatHdscandata.java |  189 -
 .../om/base/auto/AutoXnatHdsessiondata.java   |  198 -
 .../base/auto/AutoXnatImageassessordata.java  |  412 --
 .../om/base/auto/AutoXnatImageresource.java   |  445 --
 .../auto/AutoXnatImageresourceseries.java     |  445 --
 .../om/base/auto/AutoXnatImagescandata.java   |  870 ----
 .../base/auto/AutoXnatImagescandataShare.java |  242 -
 .../base/auto/AutoXnatImagesessiondata.java   |  794 ----
 .../base/auto/AutoXnatInvestigatordata.java   |  387 --
 .../xdat/om/base/auto/AutoXnatIoscandata.java |  189 -
 .../om/base/auto/AutoXnatIosessiondata.java   |  198 -
 .../om/base/auto/AutoXnatMegscandata.java     |  189 -
 .../om/base/auto/AutoXnatMegsessiondata.java  |  198 -
 .../xdat/om/base/auto/AutoXnatMgscandata.java |  189 -
 .../om/base/auto/AutoXnatMgsessiondata.java   |  198 -
 .../om/base/auto/AutoXnatMrassessordata.java  |  200 -
 .../om/base/auto/AutoXnatMrqcscandata.java    |  392 --
 .../xdat/om/base/auto/AutoXnatMrscandata.java | 1237 -----
 .../om/base/auto/AutoXnatMrsessiondata.java   |  314 --
 .../om/base/auto/AutoXnatMrsscandata.java     |  189 -
 .../xdat/om/base/auto/AutoXnatNmscandata.java |  189 -
 .../om/base/auto/AutoXnatNmsessiondata.java   |  198 -
 .../xdat/om/base/auto/AutoXnatOpscandata.java |  189 -
 .../om/base/auto/AutoXnatOpsessiondata.java   |  198 -
 .../om/base/auto/AutoXnatOptscandata.java     |  537 ---
 .../om/base/auto/AutoXnatOptsessiondata.java  |  198 -
 .../base/auto/AutoXnatOtherdicomscandata.java |  189 -
 .../auto/AutoXnatOtherdicomsessiondata.java   |  198 -
 .../om/base/auto/AutoXnatOtherqcscandata.java |  218 -
 .../om/base/auto/AutoXnatPetassessordata.java |  189 -
 .../base/auto/AutoXnatPetmrsessiondata.java   |  952 ----
 .../om/base/auto/AutoXnatPetqcscandata.java   |  628 ---
 .../AutoXnatPetqcscandataProcessingerror.java |  184 -
 .../om/base/auto/AutoXnatPetscandata.java     | 2169 ---------
 .../base/auto/AutoXnatPetscandataFrame.java   |  271 --
 .../om/base/auto/AutoXnatPetsessiondata.java  |  865 ----
 .../om/base/auto/AutoXnatProjectdata.java     |  743 ---
 .../base/auto/AutoXnatProjectdataAlias.java   |  213 -
 .../base/auto/AutoXnatProjectdataField.java   |  213 -
 .../base/auto/AutoXnatProjectparticipant.java |  271 --
 .../auto/AutoXnatPublicationresource.java     |  583 ---
 .../xdat/om/base/auto/AutoXnatPvisitdata.java |  508 --
 .../base/auto/AutoXnatQcassessmentdata.java   |  291 --
 .../auto/AutoXnatQcassessmentdataScan.java    |  338 --
 .../AutoXnatQcassessmentdataScanSlice.java    |  276 --
 .../auto/AutoXnatQcmanualassessordata.java    |  512 --
 .../xdat/om/base/auto/AutoXnatQcscandata.java |  480 --
 .../om/base/auto/AutoXnatQcscandataField.java |  213 -
 .../auto/AutoXnatReconstructedimagedata.java  |  697 ---
 .../AutoXnatReconstructedimagedataScanid.java |  184 -
 .../om/base/auto/AutoXnatRegionresource.java  |  554 ---
 .../auto/AutoXnatRegionresourceLabel.java     |  242 -
 .../xdat/om/base/auto/AutoXnatResource.java   |  425 --
 .../om/base/auto/AutoXnatResourcecatalog.java |  184 -
 .../om/base/auto/AutoXnatResourceseries.java  |  416 --
 .../xdat/om/base/auto/AutoXnatRfscandata.java |  189 -
 .../om/base/auto/AutoXnatRfsessiondata.java   |  198 -
 .../om/base/auto/AutoXnatRtimagescandata.java |  189 -
 .../om/base/auto/AutoXnatRtsessiondata.java   |  198 -
 .../xdat/om/base/auto/AutoXnatScscandata.java |  189 -
 .../om/base/auto/AutoXnatSegscandata.java     |  189 -
 .../xdat/om/base/auto/AutoXnatSmscandata.java |  189 -
 .../om/base/auto/AutoXnatSmsessiondata.java   |  198 -
 .../xdat/om/base/auto/AutoXnatSrscandata.java |  189 -
 .../om/base/auto/AutoXnatSrsessiondata.java   |  198 -
 .../om/base/auto/AutoXnatStatisticsdata.java  |  487 --
 .../auto/AutoXnatStatisticsdataAddfield.java  |  213 -
 ...natStatisticsdataAdditionalstatistics.java |  213 -
 .../om/base/auto/AutoXnatStudyprotocol.java   |  437 --
 .../auto/AutoXnatStudyprotocolCondition.java  |  242 -
 .../base/auto/AutoXnatStudyprotocolGroup.java |  242 -
 .../auto/AutoXnatStudyprotocolSession.java    |  242 -
 .../auto/AutoXnatStudyprotocolVariable.java   |  242 -
 .../auto/AutoXnatSubjectassessordata.java     |  256 -
 .../om/base/auto/AutoXnatSubjectdata.java     |  890 ----
 .../base/auto/AutoXnatSubjectdataAddid.java   |  213 -
 .../base/auto/AutoXnatSubjectdataField.java   |  213 -
 .../om/base/auto/AutoXnatSubjectmetadata.java |  218 -
 .../auto/AutoXnatSubjectvariablesdata.java    |  260 --
 .../AutoXnatSubjectvariablesdataVariable.java |  213 -
 .../xdat/om/base/auto/AutoXnatUsscandata.java |  189 -
 .../om/base/auto/AutoXnatUssessiondata.java   |  198 -
 .../om/base/auto/AutoXnatValidationdata.java  |  300 --
 .../base/auto/AutoXnatVoiceaudioscandata.java |  189 -
 .../base/auto/AutoXnatVolumetricregion.java   |  333 --
 .../AutoXnatVolumetricregionSubregion.java    |  213 -
 .../om/base/auto/AutoXnatXa3dscandata.java    |  189 -
 .../om/base/auto/AutoXnatXa3dsessiondata.java |  198 -
 .../xdat/om/base/auto/AutoXnatXascandata.java |  542 ---
 .../om/base/auto/AutoXnatXasessiondata.java   |  198 -
 .../xdat/om/base/auto/AutoXnatXcscandata.java |  189 -
 .../om/base/auto/AutoXnatXcsessiondata.java   |  198 -
 .../om/base/auto/AutoXnatXcvscandata.java     |  189 -
 .../om/base/auto/AutoXnatXcvsessiondata.java  |  198 -
 376 files changed, 29 insertions(+), 73536 deletions(-)
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcArchivespecification.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcArchivespecificationNotificationType.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcFieldspecification.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcPathinfo.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcPipelinedata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcPipelineparameterdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcProject.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcProjectDescendant.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcProjectDescendantPipeline.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcProjectPipeline.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ArcProperty.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/CatCatalog.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/CatCatalogMetafield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/CatCatalogTag.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/CatDcmcatalog.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/CatDcmentry.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/CatEntry.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/CatEntryMetafield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/CatEntryTag.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/PipePipelinedetails.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/PipePipelinedetailsElement.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/PipePipelinedetailsParameter.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/PipePipelinerepository.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ProvProcess.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ProvProcessstep.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ProvProcessstepLibrary.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ScrScreeningassessment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ScrScreeningscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ValAdditionalval.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ValProtocoldata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ValProtocoldataComment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ValProtocoldataCondition.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheck.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheckComment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheckCondition.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/WrkAbstractexecutionenvironment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/WrkWorkflowdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironmentNotify.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironmentParameter.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAbstractdemographicdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAbstractprotocol.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAbstractresource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAbstractresourceTag.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAbstractstatistics.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAbstractsubjectmetadata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAddfield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAscidresearchdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAsideeffectspittsburghdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAupdrs3data.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAybocsdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatAygtssdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatComputationdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatContrastbolus.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatCrscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatCrsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatCtscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatCtscandataFocalspot.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatCtsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDatatypeprotocol.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDemographicdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDeriveddata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDicomseries.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDicomseriesImage.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDx3dcraniofacialscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDx3dcraniofacialsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDxscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatDxsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEcgscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEcgsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEegscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEegsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEpsscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEpssessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEsscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEssessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEsvscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatEsvsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatExperimentdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatExperimentdataField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatExperimentdataShare.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroup.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroupField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroupFieldPossiblevalue.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatGenericdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatGmscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatGmsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatGmvscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatGmvsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatHdscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatHdsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatImageassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatImageresource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatImageresourceseries.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatImagescandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatImagescandataShare.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatImagesessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatInvestigatordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatIoscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatIosessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMegscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMegsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMgscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMgsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMrassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMrqcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMrscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMrsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatMrsscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatNmscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatNmsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatOpscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatOpsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatOptscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatOptsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatOtherdicomscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatOtherdicomsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatOtherqcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPetassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPetmrsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPetqcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPetqcscandataProcessingerror.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPetscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPetscandataFrame.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPetsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatProjectdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatProjectdataAlias.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatProjectdataField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatProjectparticipant.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPublicationresource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatPvisitdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatQcassessmentdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatQcassessmentdataScan.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatQcassessmentdataScanSlice.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatQcmanualassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatQcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatQcscandataField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatReconstructedimagedata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatReconstructedimagedataScanid.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatRegionresource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatRegionresourceLabel.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatResource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatResourcecatalog.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatResourceseries.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatRfscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatRfsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatRtimagescandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatRtsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatScscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSegscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSmscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSmsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSrscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSrsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatStatisticsdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatStatisticsdataAddfield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatStatisticsdataAdditionalstatistics.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatStudyprotocol.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatStudyprotocolCondition.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatStudyprotocolGroup.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatStudyprotocolSession.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatStudyprotocolVariable.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSubjectassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSubjectdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSubjectdataAddid.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSubjectdataField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSubjectmetadata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSubjectvariablesdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatSubjectvariablesdataVariable.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatUsscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatUssessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatValidationdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatVoiceaudioscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatVolumetricregion.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatVolumetricregionSubregion.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatXa3dscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatXa3dsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatXascandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatXasessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatXcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatXcsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatXcvscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/XnatXcvsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/BaseCatCatalog.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/BaseCatCatalogMetafield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/BaseCatCatalogTag.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/BaseCatDcmcatalog.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/BaseCatDcmentry.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/BaseCatEntry.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/BaseCatEntryMetafield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/BaseCatEntryTag.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcArchivespecification.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcArchivespecificationNotificationType.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcFieldspecification.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcPathinfo.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcPipelinedata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcPipelineparameterdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcProject.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectDescendant.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectDescendantPipeline.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectPipeline.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoArcProperty.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalog.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalogMetafield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalogTag.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoCatDcmcatalog.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoCatDcmentry.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntry.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntryMetafield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntryTag.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetails.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetailsElement.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetailsParameter.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinerepository.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcess.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcessstep.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcessstepLibrary.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoScrScreeningassessment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoScrScreeningscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoValAdditionalval.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataComment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataCondition.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheck.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheckComment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheckCondition.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoWrkAbstractexecutionenvironment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoWrkWorkflowdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironment.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironmentNotify.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironmentParameter.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractdemographicdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractprotocol.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractresource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractresourceTag.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractstatistics.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractsubjectmetadata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAddfield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAscidresearchdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAsideeffectspittsburghdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAupdrs3data.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAybocsdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAygtssdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatComputationdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatContrastbolus.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCrscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCrsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtscandataFocalspot.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDatatypeprotocol.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDemographicdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDeriveddata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDicomseries.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDicomseriesImage.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDx3dcraniofacialscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDx3dcraniofacialsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDxscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDxsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEcgscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEcgsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEegscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEegsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEpsscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEpssessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEssessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsvscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsvsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdataField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdataShare.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroup.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroupField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroupFieldPossiblevalue.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGenericdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmvscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmvsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatHdscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatHdsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageresource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageresourceseries.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagescandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagescandataShare.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagesessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatInvestigatordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatIoscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatIosessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMegscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMegsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMgscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMgsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrqcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrsscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatNmscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatNmsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOpscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOpsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOptscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOptsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherdicomscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherdicomsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherqcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetmrsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetqcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetqcscandataProcessingerror.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetscandataFrame.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdataAlias.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdataField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectparticipant.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPublicationresource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPvisitdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdataScan.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdataScanSlice.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcmanualassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcscandataField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatReconstructedimagedata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatReconstructedimagedataScanid.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRegionresource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRegionresourceLabel.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResource.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResourcecatalog.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResourceseries.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRfscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRfsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRtimagescandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRtsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatScscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSegscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSmscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSmsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSrscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSrsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdataAddfield.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdataAdditionalstatistics.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocol.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolCondition.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolGroup.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolSession.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolVariable.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectassessordata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdataAddid.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdataField.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectmetadata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectvariablesdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectvariablesdataVariable.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatUsscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatUssessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatValidationdata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVoiceaudioscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVolumetricregion.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVolumetricregionSubregion.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXa3dscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXa3dsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXascandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXasessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcsessiondata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcvscandata.java
 delete mode 100644 src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcvsessiondata.java

diff --git a/.gitignore b/.gitignore
index 2018d065..ac244197 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 build
 *.iml
 *.log
+src/generated
diff --git a/build.gradle b/build.gradle
index f3fca1b3..28aa6049 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,10 +25,19 @@ println "Using Java version ${JavaVersion.current()}"
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'http://maven.xnat.org/libs-release'
+            name 'XNAT Release Repository'
+        }
+        maven {
+            url 'http://maven.xnat.org/libs-snapshot'
+            name 'XNAT Snapshot Repository'
+        }
     }
     dependencies {
-        classpath 'com.bmuschko:gradle-cargo-plugin:2.2.2'
-        classpath 'com.bmuschko:gradle-tomcat-plugin:2.2.4'
+        classpath "org.nrg.xnat.build:gradle-xnat-plugin:1.7.0-SNAPSHOT"
+        classpath "com.bmuschko:gradle-cargo-plugin:2.2.2"
+        classpath "com.bmuschko:gradle-tomcat-plugin:2.2.4"
     }
 }
 
@@ -50,6 +59,7 @@ repositories {
     }
 }
 
+apply plugin: 'gradle-xnat-plugin'
 apply plugin: 'groovy'
 apply plugin: 'java'
 apply plugin: 'idea'
@@ -63,6 +73,22 @@ targetCompatibility = 1.7
 
 war.baseName = "xnat-web"
 
+compileJava {
+    dependsOn xnat
+    source "${projectDir}/src/generated/java"
+}
+
+sourceSets {
+    xnat {
+        java {
+            srcDir 'src/generated/java'
+        }
+        resources {
+            srcDir 'src/generated/resources'
+        }
+    }
+}
+
 tomcatRun.contextPath = '/'
 tomcatRunWar.contextPath = '/'
 
@@ -228,7 +254,6 @@ dependencies {
     runtime "axis:axis-ant:1.4"
     runtime "axis:axis-schema:1.3"
     runtime "cglib:cglib:3.2.0"
-    runtime "fop:fop:0.20.5"
     runtime "org.hsqldb:hsqldb:1.8.0.10"
     runtime "org.codehaus.groovy.modules.http-builder:http-builder:0.7.2"
     runtime "net.imagej:ij:1.50e"
diff --git a/src/main/java/org/nrg/xdat/om/ArcArchivespecification.java b/src/main/java/org/nrg/xdat/om/ArcArchivespecification.java
deleted file mode 100644
index 908185fa..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcArchivespecification.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcArchivespecification extends BaseArcArchivespecification {
-
-	public ArcArchivespecification(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcArchivespecification(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcArchivespecification(UserI user)
-	 **/
-	public ArcArchivespecification()
-	{}
-
-	public ArcArchivespecification(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcArchivespecificationNotificationType.java b/src/main/java/org/nrg/xdat/om/ArcArchivespecificationNotificationType.java
deleted file mode 100644
index c808c22e..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcArchivespecificationNotificationType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcArchivespecificationNotificationType extends BaseArcArchivespecificationNotificationType {
-
-	public ArcArchivespecificationNotificationType(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcArchivespecificationNotificationType(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcArchivespecificationNotificationType(UserI user)
-	 **/
-	public ArcArchivespecificationNotificationType()
-	{}
-
-	public ArcArchivespecificationNotificationType(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcFieldspecification.java b/src/main/java/org/nrg/xdat/om/ArcFieldspecification.java
deleted file mode 100644
index 0c3d74f6..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcFieldspecification.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcFieldspecification extends BaseArcFieldspecification {
-
-	public ArcFieldspecification(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcFieldspecification(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcFieldspecification(UserI user)
-	 **/
-	public ArcFieldspecification()
-	{}
-
-	public ArcFieldspecification(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcPathinfo.java b/src/main/java/org/nrg/xdat/om/ArcPathinfo.java
deleted file mode 100644
index 34cff32c..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcPathinfo.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcPathinfo extends BaseArcPathinfo {
-
-	public ArcPathinfo(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcPathinfo(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcPathinfo(UserI user)
-	 **/
-	public ArcPathinfo()
-	{}
-
-	public ArcPathinfo(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcPipelinedata.java b/src/main/java/org/nrg/xdat/om/ArcPipelinedata.java
deleted file mode 100644
index 366ac54c..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcPipelinedata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcPipelinedata extends BaseArcPipelinedata {
-
-	public ArcPipelinedata(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcPipelinedata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcPipelinedata(UserI user)
-	 **/
-	public ArcPipelinedata()
-	{}
-
-	public ArcPipelinedata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcPipelineparameterdata.java b/src/main/java/org/nrg/xdat/om/ArcPipelineparameterdata.java
deleted file mode 100644
index ba336290..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcPipelineparameterdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcPipelineparameterdata extends BaseArcPipelineparameterdata {
-
-	public ArcPipelineparameterdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcPipelineparameterdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcPipelineparameterdata(UserI user)
-	 **/
-	public ArcPipelineparameterdata()
-	{}
-
-	public ArcPipelineparameterdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcProject.java b/src/main/java/org/nrg/xdat/om/ArcProject.java
deleted file mode 100644
index c62175e2..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcProject.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcProject extends BaseArcProject {
-
-	public ArcProject(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcProject(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcProject(UserI user)
-	 **/
-	public ArcProject()
-	{}
-
-	public ArcProject(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcProjectDescendant.java b/src/main/java/org/nrg/xdat/om/ArcProjectDescendant.java
deleted file mode 100644
index fed1fe8a..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcProjectDescendant.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcProjectDescendant extends BaseArcProjectDescendant {
-
-	public ArcProjectDescendant(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcProjectDescendant(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcProjectDescendant(UserI user)
-	 **/
-	public ArcProjectDescendant()
-	{}
-
-	public ArcProjectDescendant(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcProjectDescendantPipeline.java b/src/main/java/org/nrg/xdat/om/ArcProjectDescendantPipeline.java
deleted file mode 100644
index 2687ca1c..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcProjectDescendantPipeline.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcProjectDescendantPipeline extends BaseArcProjectDescendantPipeline {
-
-	public ArcProjectDescendantPipeline(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcProjectDescendantPipeline(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcProjectDescendantPipeline(UserI user)
-	 **/
-	public ArcProjectDescendantPipeline()
-	{}
-
-	public ArcProjectDescendantPipeline(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcProjectPipeline.java b/src/main/java/org/nrg/xdat/om/ArcProjectPipeline.java
deleted file mode 100644
index ebd75d9e..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcProjectPipeline.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcProjectPipeline extends BaseArcProjectPipeline {
-
-	public ArcProjectPipeline(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcProjectPipeline(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcProjectPipeline(UserI user)
-	 **/
-	public ArcProjectPipeline()
-	{}
-
-	public ArcProjectPipeline(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ArcProperty.java b/src/main/java/org/nrg/xdat/om/ArcProperty.java
deleted file mode 100644
index 53e80dbb..00000000
--- a/src/main/java/org/nrg/xdat/om/ArcProperty.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ArcProperty extends BaseArcProperty {
-
-	public ArcProperty(ItemI item)
-	{
-		super(item);
-	}
-
-	public ArcProperty(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseArcProperty(UserI user)
-	 **/
-	public ArcProperty()
-	{}
-
-	public ArcProperty(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/CatCatalog.java b/src/main/java/org/nrg/xdat/om/CatCatalog.java
deleted file mode 100644
index 68c6c094..00000000
--- a/src/main/java/org/nrg/xdat/om/CatCatalog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class CatCatalog extends BaseCatCatalog {
-
-	public CatCatalog(ItemI item)
-	{
-		super(item);
-	}
-
-	public CatCatalog(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatCatalog(UserI user)
-	 **/
-	public CatCatalog()
-	{}
-
-	public CatCatalog(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/CatCatalogMetafield.java b/src/main/java/org/nrg/xdat/om/CatCatalogMetafield.java
deleted file mode 100644
index 54dab024..00000000
--- a/src/main/java/org/nrg/xdat/om/CatCatalogMetafield.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class CatCatalogMetafield extends BaseCatCatalogMetafield {
-
-	public CatCatalogMetafield(ItemI item)
-	{
-		super(item);
-	}
-
-	public CatCatalogMetafield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatCatalogMetafield(UserI user)
-	 **/
-	public CatCatalogMetafield()
-	{}
-
-	public CatCatalogMetafield(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/CatCatalogTag.java b/src/main/java/org/nrg/xdat/om/CatCatalogTag.java
deleted file mode 100644
index 91c9a041..00000000
--- a/src/main/java/org/nrg/xdat/om/CatCatalogTag.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class CatCatalogTag extends BaseCatCatalogTag {
-
-	public CatCatalogTag(ItemI item)
-	{
-		super(item);
-	}
-
-	public CatCatalogTag(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatCatalogTag(UserI user)
-	 **/
-	public CatCatalogTag()
-	{}
-
-	public CatCatalogTag(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/CatDcmcatalog.java b/src/main/java/org/nrg/xdat/om/CatDcmcatalog.java
deleted file mode 100644
index ee800c2a..00000000
--- a/src/main/java/org/nrg/xdat/om/CatDcmcatalog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class CatDcmcatalog extends BaseCatDcmcatalog {
-
-	public CatDcmcatalog(ItemI item)
-	{
-		super(item);
-	}
-
-	public CatDcmcatalog(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatDcmcatalog(UserI user)
-	 **/
-	public CatDcmcatalog()
-	{}
-
-	public CatDcmcatalog(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/CatDcmentry.java b/src/main/java/org/nrg/xdat/om/CatDcmentry.java
deleted file mode 100644
index 76a68ab6..00000000
--- a/src/main/java/org/nrg/xdat/om/CatDcmentry.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class CatDcmentry extends BaseCatDcmentry {
-
-	public CatDcmentry(ItemI item)
-	{
-		super(item);
-	}
-
-	public CatDcmentry(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatDcmentry(UserI user)
-	 **/
-	public CatDcmentry()
-	{}
-
-	public CatDcmentry(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/CatEntry.java b/src/main/java/org/nrg/xdat/om/CatEntry.java
deleted file mode 100644
index 1b5e1e19..00000000
--- a/src/main/java/org/nrg/xdat/om/CatEntry.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class CatEntry extends BaseCatEntry {
-
-	public CatEntry(ItemI item)
-	{
-		super(item);
-	}
-
-	public CatEntry(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatEntry(UserI user)
-	 **/
-	public CatEntry()
-	{}
-
-	public CatEntry(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/CatEntryMetafield.java b/src/main/java/org/nrg/xdat/om/CatEntryMetafield.java
deleted file mode 100644
index 174528dd..00000000
--- a/src/main/java/org/nrg/xdat/om/CatEntryMetafield.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class CatEntryMetafield extends BaseCatEntryMetafield {
-
-	public CatEntryMetafield(ItemI item)
-	{
-		super(item);
-	}
-
-	public CatEntryMetafield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatEntryMetafield(UserI user)
-	 **/
-	public CatEntryMetafield()
-	{}
-
-	public CatEntryMetafield(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/CatEntryTag.java b/src/main/java/org/nrg/xdat/om/CatEntryTag.java
deleted file mode 100644
index fcbdd3ce..00000000
--- a/src/main/java/org/nrg/xdat/om/CatEntryTag.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class CatEntryTag extends BaseCatEntryTag {
-
-	public CatEntryTag(ItemI item)
-	{
-		super(item);
-	}
-
-	public CatEntryTag(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatEntryTag(UserI user)
-	 **/
-	public CatEntryTag()
-	{}
-
-	public CatEntryTag(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/PipePipelinedetails.java b/src/main/java/org/nrg/xdat/om/PipePipelinedetails.java
deleted file mode 100644
index 678f2bbe..00000000
--- a/src/main/java/org/nrg/xdat/om/PipePipelinedetails.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class PipePipelinedetails extends BasePipePipelinedetails {
-
-	public PipePipelinedetails(ItemI item)
-	{
-		super(item);
-	}
-
-	public PipePipelinedetails(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BasePipePipelinedetails(UserI user)
-	 **/
-	public PipePipelinedetails()
-	{}
-
-	public PipePipelinedetails(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/PipePipelinedetailsElement.java b/src/main/java/org/nrg/xdat/om/PipePipelinedetailsElement.java
deleted file mode 100644
index 97a2591c..00000000
--- a/src/main/java/org/nrg/xdat/om/PipePipelinedetailsElement.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class PipePipelinedetailsElement extends BasePipePipelinedetailsElement {
-
-	public PipePipelinedetailsElement(ItemI item)
-	{
-		super(item);
-	}
-
-	public PipePipelinedetailsElement(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BasePipePipelinedetailsElement(UserI user)
-	 **/
-	public PipePipelinedetailsElement()
-	{}
-
-	public PipePipelinedetailsElement(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/PipePipelinedetailsParameter.java b/src/main/java/org/nrg/xdat/om/PipePipelinedetailsParameter.java
deleted file mode 100644
index effcef1d..00000000
--- a/src/main/java/org/nrg/xdat/om/PipePipelinedetailsParameter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class PipePipelinedetailsParameter extends BasePipePipelinedetailsParameter {
-
-	public PipePipelinedetailsParameter(ItemI item)
-	{
-		super(item);
-	}
-
-	public PipePipelinedetailsParameter(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BasePipePipelinedetailsParameter(UserI user)
-	 **/
-	public PipePipelinedetailsParameter()
-	{}
-
-	public PipePipelinedetailsParameter(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/PipePipelinerepository.java b/src/main/java/org/nrg/xdat/om/PipePipelinerepository.java
deleted file mode 100644
index 431bb829..00000000
--- a/src/main/java/org/nrg/xdat/om/PipePipelinerepository.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class PipePipelinerepository extends BasePipePipelinerepository {
-
-	public PipePipelinerepository(ItemI item)
-	{
-		super(item);
-	}
-
-	public PipePipelinerepository(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BasePipePipelinerepository(UserI user)
-	 **/
-	public PipePipelinerepository()
-	{}
-
-	public PipePipelinerepository(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ProvProcess.java b/src/main/java/org/nrg/xdat/om/ProvProcess.java
deleted file mode 100644
index d15086cb..00000000
--- a/src/main/java/org/nrg/xdat/om/ProvProcess.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ProvProcess extends BaseProvProcess {
-
-	public ProvProcess(ItemI item)
-	{
-		super(item);
-	}
-
-	public ProvProcess(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseProvProcess(UserI user)
-	 **/
-	public ProvProcess()
-	{}
-
-	public ProvProcess(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ProvProcessstep.java b/src/main/java/org/nrg/xdat/om/ProvProcessstep.java
deleted file mode 100644
index c49be538..00000000
--- a/src/main/java/org/nrg/xdat/om/ProvProcessstep.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ProvProcessstep extends BaseProvProcessstep {
-
-	public ProvProcessstep(ItemI item)
-	{
-		super(item);
-	}
-
-	public ProvProcessstep(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseProvProcessstep(UserI user)
-	 **/
-	public ProvProcessstep()
-	{}
-
-	public ProvProcessstep(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ProvProcessstepLibrary.java b/src/main/java/org/nrg/xdat/om/ProvProcessstepLibrary.java
deleted file mode 100644
index ed483b89..00000000
--- a/src/main/java/org/nrg/xdat/om/ProvProcessstepLibrary.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ProvProcessstepLibrary extends BaseProvProcessstepLibrary {
-
-	public ProvProcessstepLibrary(ItemI item)
-	{
-		super(item);
-	}
-
-	public ProvProcessstepLibrary(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseProvProcessstepLibrary(UserI user)
-	 **/
-	public ProvProcessstepLibrary()
-	{}
-
-	public ProvProcessstepLibrary(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ScrScreeningassessment.java b/src/main/java/org/nrg/xdat/om/ScrScreeningassessment.java
deleted file mode 100644
index bc291f8b..00000000
--- a/src/main/java/org/nrg/xdat/om/ScrScreeningassessment.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ScrScreeningassessment extends BaseScrScreeningassessment {
-
-	public ScrScreeningassessment(ItemI item)
-	{
-		super(item);
-	}
-
-	public ScrScreeningassessment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseScrScreeningassessment(UserI user)
-	 **/
-	public ScrScreeningassessment()
-	{}
-
-	public ScrScreeningassessment(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ScrScreeningscandata.java b/src/main/java/org/nrg/xdat/om/ScrScreeningscandata.java
deleted file mode 100644
index 3b100f4d..00000000
--- a/src/main/java/org/nrg/xdat/om/ScrScreeningscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ScrScreeningscandata extends BaseScrScreeningscandata {
-
-	public ScrScreeningscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public ScrScreeningscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseScrScreeningscandata(UserI user)
-	 **/
-	public ScrScreeningscandata()
-	{}
-
-	public ScrScreeningscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ValAdditionalval.java b/src/main/java/org/nrg/xdat/om/ValAdditionalval.java
deleted file mode 100644
index 054a46ac..00000000
--- a/src/main/java/org/nrg/xdat/om/ValAdditionalval.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ValAdditionalval extends BaseValAdditionalval {
-
-	public ValAdditionalval(ItemI item)
-	{
-		super(item);
-	}
-
-	public ValAdditionalval(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseValAdditionalval(UserI user)
-	 **/
-	public ValAdditionalval()
-	{}
-
-	public ValAdditionalval(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ValProtocoldata.java b/src/main/java/org/nrg/xdat/om/ValProtocoldata.java
deleted file mode 100644
index b34d71f7..00000000
--- a/src/main/java/org/nrg/xdat/om/ValProtocoldata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ValProtocoldata extends BaseValProtocoldata {
-
-	public ValProtocoldata(ItemI item)
-	{
-		super(item);
-	}
-
-	public ValProtocoldata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseValProtocoldata(UserI user)
-	 **/
-	public ValProtocoldata()
-	{}
-
-	public ValProtocoldata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ValProtocoldataComment.java b/src/main/java/org/nrg/xdat/om/ValProtocoldataComment.java
deleted file mode 100644
index e08e811e..00000000
--- a/src/main/java/org/nrg/xdat/om/ValProtocoldataComment.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ValProtocoldataComment extends BaseValProtocoldataComment {
-
-	public ValProtocoldataComment(ItemI item)
-	{
-		super(item);
-	}
-
-	public ValProtocoldataComment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseValProtocoldataComment(UserI user)
-	 **/
-	public ValProtocoldataComment()
-	{}
-
-	public ValProtocoldataComment(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ValProtocoldataCondition.java b/src/main/java/org/nrg/xdat/om/ValProtocoldataCondition.java
deleted file mode 100644
index 3a38da55..00000000
--- a/src/main/java/org/nrg/xdat/om/ValProtocoldataCondition.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ValProtocoldataCondition extends BaseValProtocoldataCondition {
-
-	public ValProtocoldataCondition(ItemI item)
-	{
-		super(item);
-	}
-
-	public ValProtocoldataCondition(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseValProtocoldataCondition(UserI user)
-	 **/
-	public ValProtocoldataCondition()
-	{}
-
-	public ValProtocoldataCondition(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheck.java b/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheck.java
deleted file mode 100644
index c4ed39f8..00000000
--- a/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheck.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ValProtocoldataScanCheck extends BaseValProtocoldataScanCheck {
-
-	public ValProtocoldataScanCheck(ItemI item)
-	{
-		super(item);
-	}
-
-	public ValProtocoldataScanCheck(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseValProtocoldataScanCheck(UserI user)
-	 **/
-	public ValProtocoldataScanCheck()
-	{}
-
-	public ValProtocoldataScanCheck(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheckComment.java b/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheckComment.java
deleted file mode 100644
index 9333d1a9..00000000
--- a/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheckComment.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ValProtocoldataScanCheckComment extends BaseValProtocoldataScanCheckComment {
-
-	public ValProtocoldataScanCheckComment(ItemI item)
-	{
-		super(item);
-	}
-
-	public ValProtocoldataScanCheckComment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseValProtocoldataScanCheckComment(UserI user)
-	 **/
-	public ValProtocoldataScanCheckComment()
-	{}
-
-	public ValProtocoldataScanCheckComment(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheckCondition.java b/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheckCondition.java
deleted file mode 100644
index 4c5c5c35..00000000
--- a/src/main/java/org/nrg/xdat/om/ValProtocoldataScanCheckCondition.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class ValProtocoldataScanCheckCondition extends BaseValProtocoldataScanCheckCondition {
-
-	public ValProtocoldataScanCheckCondition(ItemI item)
-	{
-		super(item);
-	}
-
-	public ValProtocoldataScanCheckCondition(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseValProtocoldataScanCheckCondition(UserI user)
-	 **/
-	public ValProtocoldataScanCheckCondition()
-	{}
-
-	public ValProtocoldataScanCheckCondition(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/WrkAbstractexecutionenvironment.java b/src/main/java/org/nrg/xdat/om/WrkAbstractexecutionenvironment.java
deleted file mode 100644
index b1138eb0..00000000
--- a/src/main/java/org/nrg/xdat/om/WrkAbstractexecutionenvironment.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class WrkAbstractexecutionenvironment extends BaseWrkAbstractexecutionenvironment {
-
-	public WrkAbstractexecutionenvironment(ItemI item)
-	{
-		super(item);
-	}
-
-	public WrkAbstractexecutionenvironment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseWrkAbstractexecutionenvironment(UserI user)
-	 **/
-	public WrkAbstractexecutionenvironment()
-	{}
-
-	public WrkAbstractexecutionenvironment(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/WrkWorkflowdata.java b/src/main/java/org/nrg/xdat/om/WrkWorkflowdata.java
deleted file mode 100644
index 79671c4a..00000000
--- a/src/main/java/org/nrg/xdat/om/WrkWorkflowdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class WrkWorkflowdata extends BaseWrkWorkflowdata {
-
-	public WrkWorkflowdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public WrkWorkflowdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseWrkWorkflowdata(UserI user)
-	 **/
-	public WrkWorkflowdata()
-	{}
-
-	public WrkWorkflowdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironment.java b/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironment.java
deleted file mode 100644
index 1cebbefa..00000000
--- a/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironment.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class WrkXnatexecutionenvironment extends BaseWrkXnatexecutionenvironment {
-
-	public WrkXnatexecutionenvironment(ItemI item)
-	{
-		super(item);
-	}
-
-	public WrkXnatexecutionenvironment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseWrkXnatexecutionenvironment(UserI user)
-	 **/
-	public WrkXnatexecutionenvironment()
-	{}
-
-	public WrkXnatexecutionenvironment(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironmentNotify.java b/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironmentNotify.java
deleted file mode 100644
index a56450be..00000000
--- a/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironmentNotify.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class WrkXnatexecutionenvironmentNotify extends BaseWrkXnatexecutionenvironmentNotify {
-
-	public WrkXnatexecutionenvironmentNotify(ItemI item)
-	{
-		super(item);
-	}
-
-	public WrkXnatexecutionenvironmentNotify(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseWrkXnatexecutionenvironmentNotify(UserI user)
-	 **/
-	public WrkXnatexecutionenvironmentNotify()
-	{}
-
-	public WrkXnatexecutionenvironmentNotify(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironmentParameter.java b/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironmentParameter.java
deleted file mode 100644
index eb834051..00000000
--- a/src/main/java/org/nrg/xdat/om/WrkXnatexecutionenvironmentParameter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class WrkXnatexecutionenvironmentParameter extends BaseWrkXnatexecutionenvironmentParameter {
-
-	public WrkXnatexecutionenvironmentParameter(ItemI item)
-	{
-		super(item);
-	}
-
-	public WrkXnatexecutionenvironmentParameter(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseWrkXnatexecutionenvironmentParameter(UserI user)
-	 **/
-	public WrkXnatexecutionenvironmentParameter()
-	{}
-
-	public WrkXnatexecutionenvironmentParameter(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAbstractdemographicdata.java b/src/main/java/org/nrg/xdat/om/XnatAbstractdemographicdata.java
deleted file mode 100644
index 2610ef45..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAbstractdemographicdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAbstractdemographicdata extends BaseXnatAbstractdemographicdata {
-
-	public XnatAbstractdemographicdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAbstractdemographicdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAbstractdemographicdata(UserI user)
-	 **/
-	public XnatAbstractdemographicdata()
-	{}
-
-	public XnatAbstractdemographicdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAbstractprotocol.java b/src/main/java/org/nrg/xdat/om/XnatAbstractprotocol.java
deleted file mode 100644
index d6a15891..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAbstractprotocol.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAbstractprotocol extends BaseXnatAbstractprotocol {
-
-	public XnatAbstractprotocol(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAbstractprotocol(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAbstractprotocol(UserI user)
-	 **/
-	public XnatAbstractprotocol()
-	{}
-
-	public XnatAbstractprotocol(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAbstractresource.java b/src/main/java/org/nrg/xdat/om/XnatAbstractresource.java
deleted file mode 100644
index d2dc3328..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAbstractresource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class XnatAbstractresource extends BaseXnatAbstractresource {
-
-	public XnatAbstractresource(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAbstractresource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAbstractresource(UserI user)
-	 **/
-	public XnatAbstractresource()
-	{}
-
-	public XnatAbstractresource(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAbstractresourceTag.java b/src/main/java/org/nrg/xdat/om/XnatAbstractresourceTag.java
deleted file mode 100644
index 16712be4..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAbstractresourceTag.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAbstractresourceTag extends BaseXnatAbstractresourceTag {
-
-	public XnatAbstractresourceTag(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAbstractresourceTag(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAbstractresourceTag(UserI user)
-	 **/
-	public XnatAbstractresourceTag()
-	{}
-
-	public XnatAbstractresourceTag(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAbstractstatistics.java b/src/main/java/org/nrg/xdat/om/XnatAbstractstatistics.java
deleted file mode 100644
index 98e83ff4..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAbstractstatistics.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAbstractstatistics extends BaseXnatAbstractstatistics {
-
-	public XnatAbstractstatistics(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAbstractstatistics(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAbstractstatistics(UserI user)
-	 **/
-	public XnatAbstractstatistics()
-	{}
-
-	public XnatAbstractstatistics(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAbstractsubjectmetadata.java b/src/main/java/org/nrg/xdat/om/XnatAbstractsubjectmetadata.java
deleted file mode 100644
index 773e4cd0..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAbstractsubjectmetadata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAbstractsubjectmetadata extends BaseXnatAbstractsubjectmetadata {
-
-	public XnatAbstractsubjectmetadata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAbstractsubjectmetadata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAbstractsubjectmetadata(UserI user)
-	 **/
-	public XnatAbstractsubjectmetadata()
-	{}
-
-	public XnatAbstractsubjectmetadata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAddfield.java b/src/main/java/org/nrg/xdat/om/XnatAddfield.java
deleted file mode 100644
index dd759baf..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAddfield.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAddfield extends BaseXnatAddfield {
-
-	public XnatAddfield(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAddfield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAddfield(UserI user)
-	 **/
-	public XnatAddfield()
-	{}
-
-	public XnatAddfield(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAscidresearchdata.java b/src/main/java/org/nrg/xdat/om/XnatAscidresearchdata.java
deleted file mode 100644
index e74e1ff1..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAscidresearchdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAscidresearchdata extends BaseXnatAscidresearchdata {
-
-	public XnatAscidresearchdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAscidresearchdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAscidresearchdata(UserI user)
-	 **/
-	public XnatAscidresearchdata()
-	{}
-
-	public XnatAscidresearchdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAsideeffectspittsburghdata.java b/src/main/java/org/nrg/xdat/om/XnatAsideeffectspittsburghdata.java
deleted file mode 100644
index 165d5a29..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAsideeffectspittsburghdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAsideeffectspittsburghdata extends BaseXnatAsideeffectspittsburghdata {
-
-	public XnatAsideeffectspittsburghdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAsideeffectspittsburghdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAsideeffectspittsburghdata(UserI user)
-	 **/
-	public XnatAsideeffectspittsburghdata()
-	{}
-
-	public XnatAsideeffectspittsburghdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAupdrs3data.java b/src/main/java/org/nrg/xdat/om/XnatAupdrs3data.java
deleted file mode 100644
index ed8887cc..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAupdrs3data.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAupdrs3data extends BaseXnatAupdrs3data {
-
-	public XnatAupdrs3data(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAupdrs3data(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAupdrs3data(UserI user)
-	 **/
-	public XnatAupdrs3data()
-	{}
-
-	public XnatAupdrs3data(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAybocsdata.java b/src/main/java/org/nrg/xdat/om/XnatAybocsdata.java
deleted file mode 100644
index 21e6d725..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAybocsdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAybocsdata extends BaseXnatAybocsdata {
-
-	public XnatAybocsdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAybocsdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAybocsdata(UserI user)
-	 **/
-	public XnatAybocsdata()
-	{}
-
-	public XnatAybocsdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatAygtssdata.java b/src/main/java/org/nrg/xdat/om/XnatAygtssdata.java
deleted file mode 100644
index 425af92f..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatAygtssdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatAygtssdata extends BaseXnatAygtssdata {
-
-	public XnatAygtssdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatAygtssdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatAygtssdata(UserI user)
-	 **/
-	public XnatAygtssdata()
-	{}
-
-	public XnatAygtssdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatComputationdata.java b/src/main/java/org/nrg/xdat/om/XnatComputationdata.java
deleted file mode 100644
index d39b2dd4..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatComputationdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatComputationdata extends BaseXnatComputationdata {
-
-	public XnatComputationdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatComputationdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatComputationdata(UserI user)
-	 **/
-	public XnatComputationdata()
-	{}
-
-	public XnatComputationdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatContrastbolus.java b/src/main/java/org/nrg/xdat/om/XnatContrastbolus.java
deleted file mode 100644
index c3dd5885..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatContrastbolus.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatContrastbolus extends BaseXnatContrastbolus {
-
-	public XnatContrastbolus(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatContrastbolus(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatContrastbolus(UserI user)
-	 **/
-	public XnatContrastbolus()
-	{}
-
-	public XnatContrastbolus(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatCrscandata.java b/src/main/java/org/nrg/xdat/om/XnatCrscandata.java
deleted file mode 100644
index 9a2717ce..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatCrscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatCrscandata extends BaseXnatCrscandata {
-
-	public XnatCrscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatCrscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatCrscandata(UserI user)
-	 **/
-	public XnatCrscandata()
-	{}
-
-	public XnatCrscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatCrsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatCrsessiondata.java
deleted file mode 100644
index ccbeaec1..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatCrsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatCrsessiondata extends BaseXnatCrsessiondata {
-
-	public XnatCrsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatCrsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatCrsessiondata(UserI user)
-	 **/
-	public XnatCrsessiondata()
-	{}
-
-	public XnatCrsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatCtscandata.java b/src/main/java/org/nrg/xdat/om/XnatCtscandata.java
deleted file mode 100644
index 5306bae1..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatCtscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatCtscandata extends BaseXnatCtscandata {
-
-	public XnatCtscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatCtscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatCtscandata(UserI user)
-	 **/
-	public XnatCtscandata()
-	{}
-
-	public XnatCtscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatCtscandataFocalspot.java b/src/main/java/org/nrg/xdat/om/XnatCtscandataFocalspot.java
deleted file mode 100644
index 4f380729..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatCtscandataFocalspot.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatCtscandataFocalspot extends BaseXnatCtscandataFocalspot {
-
-	public XnatCtscandataFocalspot(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatCtscandataFocalspot(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatCtscandataFocalspot(UserI user)
-	 **/
-	public XnatCtscandataFocalspot()
-	{}
-
-	public XnatCtscandataFocalspot(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatCtsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatCtsessiondata.java
deleted file mode 100644
index 6e1f4633..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatCtsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatCtsessiondata extends BaseXnatCtsessiondata {
-
-	public XnatCtsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatCtsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatCtsessiondata(UserI user)
-	 **/
-	public XnatCtsessiondata()
-	{}
-
-	public XnatCtsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDatatypeprotocol.java b/src/main/java/org/nrg/xdat/om/XnatDatatypeprotocol.java
deleted file mode 100644
index 833f54f0..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDatatypeprotocol.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDatatypeprotocol extends BaseXnatDatatypeprotocol {
-
-	public XnatDatatypeprotocol(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDatatypeprotocol(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDatatypeprotocol(UserI user)
-	 **/
-	public XnatDatatypeprotocol()
-	{}
-
-	public XnatDatatypeprotocol(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDemographicdata.java b/src/main/java/org/nrg/xdat/om/XnatDemographicdata.java
deleted file mode 100644
index 0ed6f02a..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDemographicdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDemographicdata extends BaseXnatDemographicdata {
-
-	public XnatDemographicdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDemographicdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDemographicdata(UserI user)
-	 **/
-	public XnatDemographicdata()
-	{}
-
-	public XnatDemographicdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDeriveddata.java b/src/main/java/org/nrg/xdat/om/XnatDeriveddata.java
deleted file mode 100644
index b73b5014..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDeriveddata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDeriveddata extends BaseXnatDeriveddata {
-
-	public XnatDeriveddata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDeriveddata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDeriveddata(UserI user)
-	 **/
-	public XnatDeriveddata()
-	{}
-
-	public XnatDeriveddata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDicomseries.java b/src/main/java/org/nrg/xdat/om/XnatDicomseries.java
deleted file mode 100644
index fd6070d2..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDicomseries.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDicomseries extends BaseXnatDicomseries {
-
-	public XnatDicomseries(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDicomseries(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDicomseries(UserI user)
-	 **/
-	public XnatDicomseries()
-	{}
-
-	public XnatDicomseries(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDicomseriesImage.java b/src/main/java/org/nrg/xdat/om/XnatDicomseriesImage.java
deleted file mode 100644
index 45e0ae19..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDicomseriesImage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDicomseriesImage extends BaseXnatDicomseriesImage {
-
-	public XnatDicomseriesImage(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDicomseriesImage(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDicomseriesImage(UserI user)
-	 **/
-	public XnatDicomseriesImage()
-	{}
-
-	public XnatDicomseriesImage(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDx3dcraniofacialscandata.java b/src/main/java/org/nrg/xdat/om/XnatDx3dcraniofacialscandata.java
deleted file mode 100644
index dde6257c..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDx3dcraniofacialscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDx3dcraniofacialscandata extends BaseXnatDx3dcraniofacialscandata {
-
-	public XnatDx3dcraniofacialscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDx3dcraniofacialscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDx3dcraniofacialscandata(UserI user)
-	 **/
-	public XnatDx3dcraniofacialscandata()
-	{}
-
-	public XnatDx3dcraniofacialscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDx3dcraniofacialsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatDx3dcraniofacialsessiondata.java
deleted file mode 100644
index 0eac14c3..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDx3dcraniofacialsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDx3dcraniofacialsessiondata extends BaseXnatDx3dcraniofacialsessiondata {
-
-	public XnatDx3dcraniofacialsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDx3dcraniofacialsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDx3dcraniofacialsessiondata(UserI user)
-	 **/
-	public XnatDx3dcraniofacialsessiondata()
-	{}
-
-	public XnatDx3dcraniofacialsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDxscandata.java b/src/main/java/org/nrg/xdat/om/XnatDxscandata.java
deleted file mode 100644
index e2abae9e..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDxscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDxscandata extends BaseXnatDxscandata {
-
-	public XnatDxscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDxscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDxscandata(UserI user)
-	 **/
-	public XnatDxscandata()
-	{}
-
-	public XnatDxscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatDxsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatDxsessiondata.java
deleted file mode 100644
index 0c84d97f..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatDxsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatDxsessiondata extends BaseXnatDxsessiondata {
-
-	public XnatDxsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatDxsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatDxsessiondata(UserI user)
-	 **/
-	public XnatDxsessiondata()
-	{}
-
-	public XnatDxsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEcgscandata.java b/src/main/java/org/nrg/xdat/om/XnatEcgscandata.java
deleted file mode 100644
index af088863..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEcgscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEcgscandata extends BaseXnatEcgscandata {
-
-	public XnatEcgscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEcgscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEcgscandata(UserI user)
-	 **/
-	public XnatEcgscandata()
-	{}
-
-	public XnatEcgscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEcgsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatEcgsessiondata.java
deleted file mode 100644
index 928546ab..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEcgsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEcgsessiondata extends BaseXnatEcgsessiondata {
-
-	public XnatEcgsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEcgsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEcgsessiondata(UserI user)
-	 **/
-	public XnatEcgsessiondata()
-	{}
-
-	public XnatEcgsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEegscandata.java b/src/main/java/org/nrg/xdat/om/XnatEegscandata.java
deleted file mode 100644
index 220e5683..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEegscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEegscandata extends BaseXnatEegscandata {
-
-	public XnatEegscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEegscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEegscandata(UserI user)
-	 **/
-	public XnatEegscandata()
-	{}
-
-	public XnatEegscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEegsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatEegsessiondata.java
deleted file mode 100644
index 1765fff1..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEegsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEegsessiondata extends BaseXnatEegsessiondata {
-
-	public XnatEegsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEegsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEegsessiondata(UserI user)
-	 **/
-	public XnatEegsessiondata()
-	{}
-
-	public XnatEegsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEpsscandata.java b/src/main/java/org/nrg/xdat/om/XnatEpsscandata.java
deleted file mode 100644
index d7146e4f..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEpsscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEpsscandata extends BaseXnatEpsscandata {
-
-	public XnatEpsscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEpsscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEpsscandata(UserI user)
-	 **/
-	public XnatEpsscandata()
-	{}
-
-	public XnatEpsscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEpssessiondata.java b/src/main/java/org/nrg/xdat/om/XnatEpssessiondata.java
deleted file mode 100644
index 2ef763ab..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEpssessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEpssessiondata extends BaseXnatEpssessiondata {
-
-	public XnatEpssessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEpssessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEpssessiondata(UserI user)
-	 **/
-	public XnatEpssessiondata()
-	{}
-
-	public XnatEpssessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEsscandata.java b/src/main/java/org/nrg/xdat/om/XnatEsscandata.java
deleted file mode 100644
index 2d9df85b..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEsscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEsscandata extends BaseXnatEsscandata {
-
-	public XnatEsscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEsscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEsscandata(UserI user)
-	 **/
-	public XnatEsscandata()
-	{}
-
-	public XnatEsscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEssessiondata.java b/src/main/java/org/nrg/xdat/om/XnatEssessiondata.java
deleted file mode 100644
index 8042a379..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEssessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEssessiondata extends BaseXnatEssessiondata {
-
-	public XnatEssessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEssessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEssessiondata(UserI user)
-	 **/
-	public XnatEssessiondata()
-	{}
-
-	public XnatEssessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEsvscandata.java b/src/main/java/org/nrg/xdat/om/XnatEsvscandata.java
deleted file mode 100644
index 549b8dbc..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEsvscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEsvscandata extends BaseXnatEsvscandata {
-
-	public XnatEsvscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEsvscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEsvscandata(UserI user)
-	 **/
-	public XnatEsvscandata()
-	{}
-
-	public XnatEsvscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatEsvsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatEsvsessiondata.java
deleted file mode 100644
index 8b2218cf..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatEsvsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatEsvsessiondata extends BaseXnatEsvsessiondata {
-
-	public XnatEsvsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatEsvsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatEsvsessiondata(UserI user)
-	 **/
-	public XnatEsvsessiondata()
-	{}
-
-	public XnatEsvsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatExperimentdata.java b/src/main/java/org/nrg/xdat/om/XnatExperimentdata.java
deleted file mode 100644
index e506d33b..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatExperimentdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatExperimentdata extends BaseXnatExperimentdata {
-
-	public XnatExperimentdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatExperimentdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatExperimentdata(UserI user)
-	 **/
-	public XnatExperimentdata()
-	{}
-
-	public XnatExperimentdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatExperimentdataField.java b/src/main/java/org/nrg/xdat/om/XnatExperimentdataField.java
deleted file mode 100644
index afac0c6f..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatExperimentdataField.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatExperimentdataField extends BaseXnatExperimentdataField {
-
-	public XnatExperimentdataField(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatExperimentdataField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatExperimentdataField(UserI user)
-	 **/
-	public XnatExperimentdataField()
-	{}
-
-	public XnatExperimentdataField(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatExperimentdataShare.java b/src/main/java/org/nrg/xdat/om/XnatExperimentdataShare.java
deleted file mode 100644
index bedfcea7..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatExperimentdataShare.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatExperimentdataShare extends BaseXnatExperimentdataShare {
-
-	public XnatExperimentdataShare(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatExperimentdataShare(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatExperimentdataShare(UserI user)
-	 **/
-	public XnatExperimentdataShare()
-	{}
-
-	public XnatExperimentdataShare(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroup.java b/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroup.java
deleted file mode 100644
index 64288963..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroup.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatFielddefinitiongroup extends BaseXnatFielddefinitiongroup {
-
-	public XnatFielddefinitiongroup(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatFielddefinitiongroup(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatFielddefinitiongroup(UserI user)
-	 **/
-	public XnatFielddefinitiongroup()
-	{}
-
-	public XnatFielddefinitiongroup(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroupField.java b/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroupField.java
deleted file mode 100644
index a3d639ff..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroupField.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatFielddefinitiongroupField extends BaseXnatFielddefinitiongroupField {
-
-	public XnatFielddefinitiongroupField(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatFielddefinitiongroupField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatFielddefinitiongroupField(UserI user)
-	 **/
-	public XnatFielddefinitiongroupField()
-	{}
-
-	public XnatFielddefinitiongroupField(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroupFieldPossiblevalue.java b/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroupFieldPossiblevalue.java
deleted file mode 100644
index bb6725bb..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatFielddefinitiongroupFieldPossiblevalue.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatFielddefinitiongroupFieldPossiblevalue extends BaseXnatFielddefinitiongroupFieldPossiblevalue {
-
-	public XnatFielddefinitiongroupFieldPossiblevalue(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatFielddefinitiongroupFieldPossiblevalue(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatFielddefinitiongroupFieldPossiblevalue(UserI user)
-	 **/
-	public XnatFielddefinitiongroupFieldPossiblevalue()
-	{}
-
-	public XnatFielddefinitiongroupFieldPossiblevalue(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatGenericdata.java b/src/main/java/org/nrg/xdat/om/XnatGenericdata.java
deleted file mode 100644
index 778260bc..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatGenericdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatGenericdata extends BaseXnatGenericdata {
-
-	public XnatGenericdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatGenericdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatGenericdata(UserI user)
-	 **/
-	public XnatGenericdata()
-	{}
-
-	public XnatGenericdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatGmscandata.java b/src/main/java/org/nrg/xdat/om/XnatGmscandata.java
deleted file mode 100644
index 073692d5..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatGmscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatGmscandata extends BaseXnatGmscandata {
-
-	public XnatGmscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatGmscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatGmscandata(UserI user)
-	 **/
-	public XnatGmscandata()
-	{}
-
-	public XnatGmscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatGmsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatGmsessiondata.java
deleted file mode 100644
index 953c8a20..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatGmsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatGmsessiondata extends BaseXnatGmsessiondata {
-
-	public XnatGmsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatGmsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatGmsessiondata(UserI user)
-	 **/
-	public XnatGmsessiondata()
-	{}
-
-	public XnatGmsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatGmvscandata.java b/src/main/java/org/nrg/xdat/om/XnatGmvscandata.java
deleted file mode 100644
index 07a347f3..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatGmvscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatGmvscandata extends BaseXnatGmvscandata {
-
-	public XnatGmvscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatGmvscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatGmvscandata(UserI user)
-	 **/
-	public XnatGmvscandata()
-	{}
-
-	public XnatGmvscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatGmvsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatGmvsessiondata.java
deleted file mode 100644
index e136b70b..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatGmvsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatGmvsessiondata extends BaseXnatGmvsessiondata {
-
-	public XnatGmvsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatGmvsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatGmvsessiondata(UserI user)
-	 **/
-	public XnatGmvsessiondata()
-	{}
-
-	public XnatGmvsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatHdscandata.java b/src/main/java/org/nrg/xdat/om/XnatHdscandata.java
deleted file mode 100644
index 1fbc4956..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatHdscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatHdscandata extends BaseXnatHdscandata {
-
-	public XnatHdscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatHdscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatHdscandata(UserI user)
-	 **/
-	public XnatHdscandata()
-	{}
-
-	public XnatHdscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatHdsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatHdsessiondata.java
deleted file mode 100644
index d8ccfdbb..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatHdsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatHdsessiondata extends BaseXnatHdsessiondata {
-
-	public XnatHdsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatHdsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatHdsessiondata(UserI user)
-	 **/
-	public XnatHdsessiondata()
-	{}
-
-	public XnatHdsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatImageassessordata.java b/src/main/java/org/nrg/xdat/om/XnatImageassessordata.java
deleted file mode 100644
index 17ad6fad..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatImageassessordata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatImageassessordata extends BaseXnatImageassessordata {
-
-	public XnatImageassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatImageassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatImageassessordata(UserI user)
-	 **/
-	public XnatImageassessordata()
-	{}
-
-	public XnatImageassessordata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatImageresource.java b/src/main/java/org/nrg/xdat/om/XnatImageresource.java
deleted file mode 100644
index b8c1252a..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatImageresource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatImageresource extends BaseXnatImageresource {
-
-	public XnatImageresource(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatImageresource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatImageresource(UserI user)
-	 **/
-	public XnatImageresource()
-	{}
-
-	public XnatImageresource(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatImageresourceseries.java b/src/main/java/org/nrg/xdat/om/XnatImageresourceseries.java
deleted file mode 100644
index 65e779fd..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatImageresourceseries.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatImageresourceseries extends BaseXnatImageresourceseries {
-
-	public XnatImageresourceseries(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatImageresourceseries(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatImageresourceseries(UserI user)
-	 **/
-	public XnatImageresourceseries()
-	{}
-
-	public XnatImageresourceseries(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatImagescandata.java b/src/main/java/org/nrg/xdat/om/XnatImagescandata.java
deleted file mode 100644
index b9a6059c..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatImagescandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatImagescandata extends BaseXnatImagescandata {
-
-	public XnatImagescandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatImagescandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatImagescandata(UserI user)
-	 **/
-	public XnatImagescandata()
-	{}
-
-	public XnatImagescandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatImagescandataShare.java b/src/main/java/org/nrg/xdat/om/XnatImagescandataShare.java
deleted file mode 100644
index ecc8be07..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatImagescandataShare.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatImagescandataShare extends BaseXnatImagescandataShare {
-
-	public XnatImagescandataShare(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatImagescandataShare(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatImagescandataShare(UserI user)
-	 **/
-	public XnatImagescandataShare()
-	{}
-
-	public XnatImagescandataShare(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatImagesessiondata.java b/src/main/java/org/nrg/xdat/om/XnatImagesessiondata.java
deleted file mode 100644
index 8b516147..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatImagesessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatImagesessiondata extends BaseXnatImagesessiondata {
-
-	public XnatImagesessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatImagesessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatImagesessiondata(UserI user)
-	 **/
-	public XnatImagesessiondata()
-	{}
-
-	public XnatImagesessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatInvestigatordata.java b/src/main/java/org/nrg/xdat/om/XnatInvestigatordata.java
deleted file mode 100644
index 8564e844..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatInvestigatordata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatInvestigatordata extends BaseXnatInvestigatordata {
-
-	public XnatInvestigatordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatInvestigatordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatInvestigatordata(UserI user)
-	 **/
-	public XnatInvestigatordata()
-	{}
-
-	public XnatInvestigatordata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatIoscandata.java b/src/main/java/org/nrg/xdat/om/XnatIoscandata.java
deleted file mode 100644
index 6910d55f..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatIoscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatIoscandata extends BaseXnatIoscandata {
-
-	public XnatIoscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatIoscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatIoscandata(UserI user)
-	 **/
-	public XnatIoscandata()
-	{}
-
-	public XnatIoscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatIosessiondata.java b/src/main/java/org/nrg/xdat/om/XnatIosessiondata.java
deleted file mode 100644
index bb903ef4..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatIosessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatIosessiondata extends BaseXnatIosessiondata {
-
-	public XnatIosessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatIosessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatIosessiondata(UserI user)
-	 **/
-	public XnatIosessiondata()
-	{}
-
-	public XnatIosessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMegscandata.java b/src/main/java/org/nrg/xdat/om/XnatMegscandata.java
deleted file mode 100644
index 443e592d..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMegscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMegscandata extends BaseXnatMegscandata {
-
-	public XnatMegscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMegscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMegscandata(UserI user)
-	 **/
-	public XnatMegscandata()
-	{}
-
-	public XnatMegscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMegsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatMegsessiondata.java
deleted file mode 100644
index f9637652..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMegsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMegsessiondata extends BaseXnatMegsessiondata {
-
-	public XnatMegsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMegsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMegsessiondata(UserI user)
-	 **/
-	public XnatMegsessiondata()
-	{}
-
-	public XnatMegsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMgscandata.java b/src/main/java/org/nrg/xdat/om/XnatMgscandata.java
deleted file mode 100644
index 1e0ae230..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMgscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMgscandata extends BaseXnatMgscandata {
-
-	public XnatMgscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMgscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMgscandata(UserI user)
-	 **/
-	public XnatMgscandata()
-	{}
-
-	public XnatMgscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMgsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatMgsessiondata.java
deleted file mode 100644
index 0b81be65..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMgsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMgsessiondata extends BaseXnatMgsessiondata {
-
-	public XnatMgsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMgsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMgsessiondata(UserI user)
-	 **/
-	public XnatMgsessiondata()
-	{}
-
-	public XnatMgsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMrassessordata.java b/src/main/java/org/nrg/xdat/om/XnatMrassessordata.java
deleted file mode 100644
index bf455056..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMrassessordata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMrassessordata extends BaseXnatMrassessordata {
-
-	public XnatMrassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMrassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMrassessordata(UserI user)
-	 **/
-	public XnatMrassessordata()
-	{}
-
-	public XnatMrassessordata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMrqcscandata.java b/src/main/java/org/nrg/xdat/om/XnatMrqcscandata.java
deleted file mode 100644
index b6c88297..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMrqcscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMrqcscandata extends BaseXnatMrqcscandata {
-
-	public XnatMrqcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMrqcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMrqcscandata(UserI user)
-	 **/
-	public XnatMrqcscandata()
-	{}
-
-	public XnatMrqcscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMrscandata.java b/src/main/java/org/nrg/xdat/om/XnatMrscandata.java
deleted file mode 100644
index e1f28938..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMrscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMrscandata extends BaseXnatMrscandata {
-
-	public XnatMrscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMrscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMrscandata(UserI user)
-	 **/
-	public XnatMrscandata()
-	{}
-
-	public XnatMrscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMrsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatMrsessiondata.java
deleted file mode 100644
index 975a7bc4..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMrsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMrsessiondata extends BaseXnatMrsessiondata {
-
-	public XnatMrsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMrsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMrsessiondata(UserI user)
-	 **/
-	public XnatMrsessiondata()
-	{}
-
-	public XnatMrsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatMrsscandata.java b/src/main/java/org/nrg/xdat/om/XnatMrsscandata.java
deleted file mode 100644
index 8d9f7804..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatMrsscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatMrsscandata extends BaseXnatMrsscandata {
-
-	public XnatMrsscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatMrsscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatMrsscandata(UserI user)
-	 **/
-	public XnatMrsscandata()
-	{}
-
-	public XnatMrsscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatNmscandata.java b/src/main/java/org/nrg/xdat/om/XnatNmscandata.java
deleted file mode 100644
index c448bbc4..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatNmscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatNmscandata extends BaseXnatNmscandata {
-
-	public XnatNmscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatNmscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatNmscandata(UserI user)
-	 **/
-	public XnatNmscandata()
-	{}
-
-	public XnatNmscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatNmsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatNmsessiondata.java
deleted file mode 100644
index c98c4c83..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatNmsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatNmsessiondata extends BaseXnatNmsessiondata {
-
-	public XnatNmsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatNmsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatNmsessiondata(UserI user)
-	 **/
-	public XnatNmsessiondata()
-	{}
-
-	public XnatNmsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatOpscandata.java b/src/main/java/org/nrg/xdat/om/XnatOpscandata.java
deleted file mode 100644
index f70c876d..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatOpscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatOpscandata extends BaseXnatOpscandata {
-
-	public XnatOpscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatOpscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatOpscandata(UserI user)
-	 **/
-	public XnatOpscandata()
-	{}
-
-	public XnatOpscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatOpsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatOpsessiondata.java
deleted file mode 100644
index 0a762caf..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatOpsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatOpsessiondata extends BaseXnatOpsessiondata {
-
-	public XnatOpsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatOpsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatOpsessiondata(UserI user)
-	 **/
-	public XnatOpsessiondata()
-	{}
-
-	public XnatOpsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatOptscandata.java b/src/main/java/org/nrg/xdat/om/XnatOptscandata.java
deleted file mode 100644
index 9a7046ab..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatOptscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatOptscandata extends BaseXnatOptscandata {
-
-	public XnatOptscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatOptscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatOptscandata(UserI user)
-	 **/
-	public XnatOptscandata()
-	{}
-
-	public XnatOptscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatOptsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatOptsessiondata.java
deleted file mode 100644
index b2784b60..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatOptsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatOptsessiondata extends BaseXnatOptsessiondata {
-
-	public XnatOptsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatOptsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatOptsessiondata(UserI user)
-	 **/
-	public XnatOptsessiondata()
-	{}
-
-	public XnatOptsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatOtherdicomscandata.java b/src/main/java/org/nrg/xdat/om/XnatOtherdicomscandata.java
deleted file mode 100644
index c2ca5e73..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatOtherdicomscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatOtherdicomscandata extends BaseXnatOtherdicomscandata {
-
-	public XnatOtherdicomscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatOtherdicomscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatOtherdicomscandata(UserI user)
-	 **/
-	public XnatOtherdicomscandata()
-	{}
-
-	public XnatOtherdicomscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatOtherdicomsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatOtherdicomsessiondata.java
deleted file mode 100644
index 6b4cd226..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatOtherdicomsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatOtherdicomsessiondata extends BaseXnatOtherdicomsessiondata {
-
-	public XnatOtherdicomsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatOtherdicomsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatOtherdicomsessiondata(UserI user)
-	 **/
-	public XnatOtherdicomsessiondata()
-	{}
-
-	public XnatOtherdicomsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatOtherqcscandata.java b/src/main/java/org/nrg/xdat/om/XnatOtherqcscandata.java
deleted file mode 100644
index ea3be982..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatOtherqcscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatOtherqcscandata extends BaseXnatOtherqcscandata {
-
-	public XnatOtherqcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatOtherqcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatOtherqcscandata(UserI user)
-	 **/
-	public XnatOtherqcscandata()
-	{}
-
-	public XnatOtherqcscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPetassessordata.java b/src/main/java/org/nrg/xdat/om/XnatPetassessordata.java
deleted file mode 100644
index f151d041..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPetassessordata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPetassessordata extends BaseXnatPetassessordata {
-
-	public XnatPetassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPetassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPetassessordata(UserI user)
-	 **/
-	public XnatPetassessordata()
-	{}
-
-	public XnatPetassessordata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPetmrsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatPetmrsessiondata.java
deleted file mode 100644
index 3308d51e..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPetmrsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPetmrsessiondata extends BaseXnatPetmrsessiondata {
-
-	public XnatPetmrsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPetmrsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPetmrsessiondata(UserI user)
-	 **/
-	public XnatPetmrsessiondata()
-	{}
-
-	public XnatPetmrsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPetqcscandata.java b/src/main/java/org/nrg/xdat/om/XnatPetqcscandata.java
deleted file mode 100644
index 2d16f9c6..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPetqcscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPetqcscandata extends BaseXnatPetqcscandata {
-
-	public XnatPetqcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPetqcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPetqcscandata(UserI user)
-	 **/
-	public XnatPetqcscandata()
-	{}
-
-	public XnatPetqcscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPetqcscandataProcessingerror.java b/src/main/java/org/nrg/xdat/om/XnatPetqcscandataProcessingerror.java
deleted file mode 100644
index c26891da..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPetqcscandataProcessingerror.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPetqcscandataProcessingerror extends BaseXnatPetqcscandataProcessingerror {
-
-	public XnatPetqcscandataProcessingerror(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPetqcscandataProcessingerror(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPetqcscandataProcessingerror(UserI user)
-	 **/
-	public XnatPetqcscandataProcessingerror()
-	{}
-
-	public XnatPetqcscandataProcessingerror(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPetscandata.java b/src/main/java/org/nrg/xdat/om/XnatPetscandata.java
deleted file mode 100644
index 58914d72..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPetscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPetscandata extends BaseXnatPetscandata {
-
-	public XnatPetscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPetscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPetscandata(UserI user)
-	 **/
-	public XnatPetscandata()
-	{}
-
-	public XnatPetscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPetscandataFrame.java b/src/main/java/org/nrg/xdat/om/XnatPetscandataFrame.java
deleted file mode 100644
index d1b93d09..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPetscandataFrame.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPetscandataFrame extends BaseXnatPetscandataFrame {
-
-	public XnatPetscandataFrame(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPetscandataFrame(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPetscandataFrame(UserI user)
-	 **/
-	public XnatPetscandataFrame()
-	{}
-
-	public XnatPetscandataFrame(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPetsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatPetsessiondata.java
deleted file mode 100644
index ad0b6015..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPetsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPetsessiondata extends BaseXnatPetsessiondata {
-
-	public XnatPetsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPetsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPetsessiondata(UserI user)
-	 **/
-	public XnatPetsessiondata()
-	{}
-
-	public XnatPetsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatProjectdata.java b/src/main/java/org/nrg/xdat/om/XnatProjectdata.java
deleted file mode 100644
index 593cc4c3..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatProjectdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatProjectdata extends BaseXnatProjectdata {
-
-	public XnatProjectdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatProjectdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatProjectdata(UserI user)
-	 **/
-	public XnatProjectdata()
-	{}
-
-	public XnatProjectdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatProjectdataAlias.java b/src/main/java/org/nrg/xdat/om/XnatProjectdataAlias.java
deleted file mode 100644
index b270498c..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatProjectdataAlias.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatProjectdataAlias extends BaseXnatProjectdataAlias {
-
-	public XnatProjectdataAlias(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatProjectdataAlias(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatProjectdataAlias(UserI user)
-	 **/
-	public XnatProjectdataAlias()
-	{}
-
-	public XnatProjectdataAlias(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatProjectdataField.java b/src/main/java/org/nrg/xdat/om/XnatProjectdataField.java
deleted file mode 100644
index aa336c2b..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatProjectdataField.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatProjectdataField extends BaseXnatProjectdataField {
-
-	public XnatProjectdataField(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatProjectdataField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatProjectdataField(UserI user)
-	 **/
-	public XnatProjectdataField()
-	{}
-
-	public XnatProjectdataField(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatProjectparticipant.java b/src/main/java/org/nrg/xdat/om/XnatProjectparticipant.java
deleted file mode 100644
index 55b87399..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatProjectparticipant.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatProjectparticipant extends BaseXnatProjectparticipant {
-
-	public XnatProjectparticipant(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatProjectparticipant(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatProjectparticipant(UserI user)
-	 **/
-	public XnatProjectparticipant()
-	{}
-
-	public XnatProjectparticipant(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPublicationresource.java b/src/main/java/org/nrg/xdat/om/XnatPublicationresource.java
deleted file mode 100644
index 655d3ec7..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPublicationresource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPublicationresource extends BaseXnatPublicationresource {
-
-	public XnatPublicationresource(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPublicationresource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPublicationresource(UserI user)
-	 **/
-	public XnatPublicationresource()
-	{}
-
-	public XnatPublicationresource(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatPvisitdata.java b/src/main/java/org/nrg/xdat/om/XnatPvisitdata.java
deleted file mode 100644
index b6eb6f7f..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatPvisitdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatPvisitdata extends BaseXnatPvisitdata {
-
-	public XnatPvisitdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatPvisitdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatPvisitdata(UserI user)
-	 **/
-	public XnatPvisitdata()
-	{}
-
-	public XnatPvisitdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatQcassessmentdata.java b/src/main/java/org/nrg/xdat/om/XnatQcassessmentdata.java
deleted file mode 100644
index fa9af124..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatQcassessmentdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatQcassessmentdata extends BaseXnatQcassessmentdata {
-
-	public XnatQcassessmentdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatQcassessmentdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatQcassessmentdata(UserI user)
-	 **/
-	public XnatQcassessmentdata()
-	{}
-
-	public XnatQcassessmentdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatQcassessmentdataScan.java b/src/main/java/org/nrg/xdat/om/XnatQcassessmentdataScan.java
deleted file mode 100644
index 88216eca..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatQcassessmentdataScan.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatQcassessmentdataScan extends BaseXnatQcassessmentdataScan {
-
-	public XnatQcassessmentdataScan(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatQcassessmentdataScan(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatQcassessmentdataScan(UserI user)
-	 **/
-	public XnatQcassessmentdataScan()
-	{}
-
-	public XnatQcassessmentdataScan(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatQcassessmentdataScanSlice.java b/src/main/java/org/nrg/xdat/om/XnatQcassessmentdataScanSlice.java
deleted file mode 100644
index cc708382..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatQcassessmentdataScanSlice.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatQcassessmentdataScanSlice extends BaseXnatQcassessmentdataScanSlice {
-
-	public XnatQcassessmentdataScanSlice(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatQcassessmentdataScanSlice(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatQcassessmentdataScanSlice(UserI user)
-	 **/
-	public XnatQcassessmentdataScanSlice()
-	{}
-
-	public XnatQcassessmentdataScanSlice(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatQcmanualassessordata.java b/src/main/java/org/nrg/xdat/om/XnatQcmanualassessordata.java
deleted file mode 100644
index 6232ba8a..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatQcmanualassessordata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatQcmanualassessordata extends BaseXnatQcmanualassessordata {
-
-	public XnatQcmanualassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatQcmanualassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatQcmanualassessordata(UserI user)
-	 **/
-	public XnatQcmanualassessordata()
-	{}
-
-	public XnatQcmanualassessordata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatQcscandata.java b/src/main/java/org/nrg/xdat/om/XnatQcscandata.java
deleted file mode 100644
index 59763d63..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatQcscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatQcscandata extends BaseXnatQcscandata {
-
-	public XnatQcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatQcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatQcscandata(UserI user)
-	 **/
-	public XnatQcscandata()
-	{}
-
-	public XnatQcscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatQcscandataField.java b/src/main/java/org/nrg/xdat/om/XnatQcscandataField.java
deleted file mode 100644
index 984ff52c..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatQcscandataField.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatQcscandataField extends BaseXnatQcscandataField {
-
-	public XnatQcscandataField(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatQcscandataField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatQcscandataField(UserI user)
-	 **/
-	public XnatQcscandataField()
-	{}
-
-	public XnatQcscandataField(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatReconstructedimagedata.java b/src/main/java/org/nrg/xdat/om/XnatReconstructedimagedata.java
deleted file mode 100644
index bbde5d90..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatReconstructedimagedata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatReconstructedimagedata extends BaseXnatReconstructedimagedata {
-
-	public XnatReconstructedimagedata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatReconstructedimagedata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatReconstructedimagedata(UserI user)
-	 **/
-	public XnatReconstructedimagedata()
-	{}
-
-	public XnatReconstructedimagedata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatReconstructedimagedataScanid.java b/src/main/java/org/nrg/xdat/om/XnatReconstructedimagedataScanid.java
deleted file mode 100644
index 1cf09fe8..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatReconstructedimagedataScanid.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatReconstructedimagedataScanid extends BaseXnatReconstructedimagedataScanid {
-
-	public XnatReconstructedimagedataScanid(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatReconstructedimagedataScanid(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatReconstructedimagedataScanid(UserI user)
-	 **/
-	public XnatReconstructedimagedataScanid()
-	{}
-
-	public XnatReconstructedimagedataScanid(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatRegionresource.java b/src/main/java/org/nrg/xdat/om/XnatRegionresource.java
deleted file mode 100644
index f8310659..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatRegionresource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatRegionresource extends BaseXnatRegionresource {
-
-	public XnatRegionresource(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatRegionresource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatRegionresource(UserI user)
-	 **/
-	public XnatRegionresource()
-	{}
-
-	public XnatRegionresource(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatRegionresourceLabel.java b/src/main/java/org/nrg/xdat/om/XnatRegionresourceLabel.java
deleted file mode 100644
index 59afd3e0..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatRegionresourceLabel.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatRegionresourceLabel extends BaseXnatRegionresourceLabel {
-
-	public XnatRegionresourceLabel(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatRegionresourceLabel(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatRegionresourceLabel(UserI user)
-	 **/
-	public XnatRegionresourceLabel()
-	{}
-
-	public XnatRegionresourceLabel(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatResource.java b/src/main/java/org/nrg/xdat/om/XnatResource.java
deleted file mode 100644
index 2147e7a1..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatResource.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatResource extends BaseXnatResource {
-
-	public XnatResource(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatResource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatResource(UserI user)
-	 **/
-	public XnatResource()
-	{}
-
-	public XnatResource(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatResourcecatalog.java b/src/main/java/org/nrg/xdat/om/XnatResourcecatalog.java
deleted file mode 100644
index b99b5609..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatResourcecatalog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatResourcecatalog extends BaseXnatResourcecatalog {
-
-	public XnatResourcecatalog(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatResourcecatalog(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatResourcecatalog(UserI user)
-	 **/
-	public XnatResourcecatalog()
-	{}
-
-	public XnatResourcecatalog(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatResourceseries.java b/src/main/java/org/nrg/xdat/om/XnatResourceseries.java
deleted file mode 100644
index fa860179..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatResourceseries.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatResourceseries extends BaseXnatResourceseries {
-
-	public XnatResourceseries(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatResourceseries(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatResourceseries(UserI user)
-	 **/
-	public XnatResourceseries()
-	{}
-
-	public XnatResourceseries(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatRfscandata.java b/src/main/java/org/nrg/xdat/om/XnatRfscandata.java
deleted file mode 100644
index 54cbcee4..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatRfscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatRfscandata extends BaseXnatRfscandata {
-
-	public XnatRfscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatRfscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatRfscandata(UserI user)
-	 **/
-	public XnatRfscandata()
-	{}
-
-	public XnatRfscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatRfsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatRfsessiondata.java
deleted file mode 100644
index 4e73b312..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatRfsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatRfsessiondata extends BaseXnatRfsessiondata {
-
-	public XnatRfsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatRfsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatRfsessiondata(UserI user)
-	 **/
-	public XnatRfsessiondata()
-	{}
-
-	public XnatRfsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatRtimagescandata.java b/src/main/java/org/nrg/xdat/om/XnatRtimagescandata.java
deleted file mode 100644
index feafb5d3..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatRtimagescandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatRtimagescandata extends BaseXnatRtimagescandata {
-
-	public XnatRtimagescandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatRtimagescandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatRtimagescandata(UserI user)
-	 **/
-	public XnatRtimagescandata()
-	{}
-
-	public XnatRtimagescandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatRtsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatRtsessiondata.java
deleted file mode 100644
index 254dc90f..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatRtsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatRtsessiondata extends BaseXnatRtsessiondata {
-
-	public XnatRtsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatRtsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatRtsessiondata(UserI user)
-	 **/
-	public XnatRtsessiondata()
-	{}
-
-	public XnatRtsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatScscandata.java b/src/main/java/org/nrg/xdat/om/XnatScscandata.java
deleted file mode 100644
index bd0a9bea..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatScscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatScscandata extends BaseXnatScscandata {
-
-	public XnatScscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatScscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatScscandata(UserI user)
-	 **/
-	public XnatScscandata()
-	{}
-
-	public XnatScscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSegscandata.java b/src/main/java/org/nrg/xdat/om/XnatSegscandata.java
deleted file mode 100644
index f79d0f9d..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSegscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSegscandata extends BaseXnatSegscandata {
-
-	public XnatSegscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSegscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSegscandata(UserI user)
-	 **/
-	public XnatSegscandata()
-	{}
-
-	public XnatSegscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSmscandata.java b/src/main/java/org/nrg/xdat/om/XnatSmscandata.java
deleted file mode 100644
index 78df74fc..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSmscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSmscandata extends BaseXnatSmscandata {
-
-	public XnatSmscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSmscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSmscandata(UserI user)
-	 **/
-	public XnatSmscandata()
-	{}
-
-	public XnatSmscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSmsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatSmsessiondata.java
deleted file mode 100644
index 3df69da5..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSmsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSmsessiondata extends BaseXnatSmsessiondata {
-
-	public XnatSmsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSmsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSmsessiondata(UserI user)
-	 **/
-	public XnatSmsessiondata()
-	{}
-
-	public XnatSmsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSrscandata.java b/src/main/java/org/nrg/xdat/om/XnatSrscandata.java
deleted file mode 100644
index 61194f55..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSrscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSrscandata extends BaseXnatSrscandata {
-
-	public XnatSrscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSrscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSrscandata(UserI user)
-	 **/
-	public XnatSrscandata()
-	{}
-
-	public XnatSrscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSrsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatSrsessiondata.java
deleted file mode 100644
index 20e4d5d2..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSrsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSrsessiondata extends BaseXnatSrsessiondata {
-
-	public XnatSrsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSrsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSrsessiondata(UserI user)
-	 **/
-	public XnatSrsessiondata()
-	{}
-
-	public XnatSrsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatStatisticsdata.java b/src/main/java/org/nrg/xdat/om/XnatStatisticsdata.java
deleted file mode 100644
index 430bee79..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatStatisticsdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatStatisticsdata extends BaseXnatStatisticsdata {
-
-	public XnatStatisticsdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatStatisticsdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatStatisticsdata(UserI user)
-	 **/
-	public XnatStatisticsdata()
-	{}
-
-	public XnatStatisticsdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatStatisticsdataAddfield.java b/src/main/java/org/nrg/xdat/om/XnatStatisticsdataAddfield.java
deleted file mode 100644
index 05dd6cf5..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatStatisticsdataAddfield.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatStatisticsdataAddfield extends BaseXnatStatisticsdataAddfield {
-
-	public XnatStatisticsdataAddfield(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatStatisticsdataAddfield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatStatisticsdataAddfield(UserI user)
-	 **/
-	public XnatStatisticsdataAddfield()
-	{}
-
-	public XnatStatisticsdataAddfield(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatStatisticsdataAdditionalstatistics.java b/src/main/java/org/nrg/xdat/om/XnatStatisticsdataAdditionalstatistics.java
deleted file mode 100644
index bd3a8cf6..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatStatisticsdataAdditionalstatistics.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatStatisticsdataAdditionalstatistics extends BaseXnatStatisticsdataAdditionalstatistics {
-
-	public XnatStatisticsdataAdditionalstatistics(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatStatisticsdataAdditionalstatistics(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatStatisticsdataAdditionalstatistics(UserI user)
-	 **/
-	public XnatStatisticsdataAdditionalstatistics()
-	{}
-
-	public XnatStatisticsdataAdditionalstatistics(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatStudyprotocol.java b/src/main/java/org/nrg/xdat/om/XnatStudyprotocol.java
deleted file mode 100644
index b7701454..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatStudyprotocol.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatStudyprotocol extends BaseXnatStudyprotocol {
-
-	public XnatStudyprotocol(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatStudyprotocol(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatStudyprotocol(UserI user)
-	 **/
-	public XnatStudyprotocol()
-	{}
-
-	public XnatStudyprotocol(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatStudyprotocolCondition.java b/src/main/java/org/nrg/xdat/om/XnatStudyprotocolCondition.java
deleted file mode 100644
index 86f02a77..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatStudyprotocolCondition.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatStudyprotocolCondition extends BaseXnatStudyprotocolCondition {
-
-	public XnatStudyprotocolCondition(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatStudyprotocolCondition(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatStudyprotocolCondition(UserI user)
-	 **/
-	public XnatStudyprotocolCondition()
-	{}
-
-	public XnatStudyprotocolCondition(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatStudyprotocolGroup.java b/src/main/java/org/nrg/xdat/om/XnatStudyprotocolGroup.java
deleted file mode 100644
index cd249fa1..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatStudyprotocolGroup.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatStudyprotocolGroup extends BaseXnatStudyprotocolGroup {
-
-	public XnatStudyprotocolGroup(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatStudyprotocolGroup(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatStudyprotocolGroup(UserI user)
-	 **/
-	public XnatStudyprotocolGroup()
-	{}
-
-	public XnatStudyprotocolGroup(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatStudyprotocolSession.java b/src/main/java/org/nrg/xdat/om/XnatStudyprotocolSession.java
deleted file mode 100644
index 49331083..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatStudyprotocolSession.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatStudyprotocolSession extends BaseXnatStudyprotocolSession {
-
-	public XnatStudyprotocolSession(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatStudyprotocolSession(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatStudyprotocolSession(UserI user)
-	 **/
-	public XnatStudyprotocolSession()
-	{}
-
-	public XnatStudyprotocolSession(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatStudyprotocolVariable.java b/src/main/java/org/nrg/xdat/om/XnatStudyprotocolVariable.java
deleted file mode 100644
index 2ae44545..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatStudyprotocolVariable.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatStudyprotocolVariable extends BaseXnatStudyprotocolVariable {
-
-	public XnatStudyprotocolVariable(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatStudyprotocolVariable(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatStudyprotocolVariable(UserI user)
-	 **/
-	public XnatStudyprotocolVariable()
-	{}
-
-	public XnatStudyprotocolVariable(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSubjectassessordata.java b/src/main/java/org/nrg/xdat/om/XnatSubjectassessordata.java
deleted file mode 100644
index 1b7338f7..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSubjectassessordata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSubjectassessordata extends BaseXnatSubjectassessordata {
-
-	public XnatSubjectassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSubjectassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSubjectassessordata(UserI user)
-	 **/
-	public XnatSubjectassessordata()
-	{}
-
-	public XnatSubjectassessordata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSubjectdata.java b/src/main/java/org/nrg/xdat/om/XnatSubjectdata.java
deleted file mode 100644
index 0c73d36e..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSubjectdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSubjectdata extends BaseXnatSubjectdata {
-
-	public XnatSubjectdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSubjectdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSubjectdata(UserI user)
-	 **/
-	public XnatSubjectdata()
-	{}
-
-	public XnatSubjectdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSubjectdataAddid.java b/src/main/java/org/nrg/xdat/om/XnatSubjectdataAddid.java
deleted file mode 100644
index 2fceec25..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSubjectdataAddid.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSubjectdataAddid extends BaseXnatSubjectdataAddid {
-
-	public XnatSubjectdataAddid(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSubjectdataAddid(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSubjectdataAddid(UserI user)
-	 **/
-	public XnatSubjectdataAddid()
-	{}
-
-	public XnatSubjectdataAddid(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSubjectdataField.java b/src/main/java/org/nrg/xdat/om/XnatSubjectdataField.java
deleted file mode 100644
index f27ef5cd..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSubjectdataField.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSubjectdataField extends BaseXnatSubjectdataField {
-
-	public XnatSubjectdataField(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSubjectdataField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSubjectdataField(UserI user)
-	 **/
-	public XnatSubjectdataField()
-	{}
-
-	public XnatSubjectdataField(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSubjectmetadata.java b/src/main/java/org/nrg/xdat/om/XnatSubjectmetadata.java
deleted file mode 100644
index 57cb17d3..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSubjectmetadata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSubjectmetadata extends BaseXnatSubjectmetadata {
-
-	public XnatSubjectmetadata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSubjectmetadata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSubjectmetadata(UserI user)
-	 **/
-	public XnatSubjectmetadata()
-	{}
-
-	public XnatSubjectmetadata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSubjectvariablesdata.java b/src/main/java/org/nrg/xdat/om/XnatSubjectvariablesdata.java
deleted file mode 100644
index bdb429e9..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSubjectvariablesdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSubjectvariablesdata extends BaseXnatSubjectvariablesdata {
-
-	public XnatSubjectvariablesdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSubjectvariablesdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSubjectvariablesdata(UserI user)
-	 **/
-	public XnatSubjectvariablesdata()
-	{}
-
-	public XnatSubjectvariablesdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatSubjectvariablesdataVariable.java b/src/main/java/org/nrg/xdat/om/XnatSubjectvariablesdataVariable.java
deleted file mode 100644
index a56c1ddc..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatSubjectvariablesdataVariable.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatSubjectvariablesdataVariable extends BaseXnatSubjectvariablesdataVariable {
-
-	public XnatSubjectvariablesdataVariable(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatSubjectvariablesdataVariable(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatSubjectvariablesdataVariable(UserI user)
-	 **/
-	public XnatSubjectvariablesdataVariable()
-	{}
-
-	public XnatSubjectvariablesdataVariable(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatUsscandata.java b/src/main/java/org/nrg/xdat/om/XnatUsscandata.java
deleted file mode 100644
index 74ace009..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatUsscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatUsscandata extends BaseXnatUsscandata {
-
-	public XnatUsscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatUsscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatUsscandata(UserI user)
-	 **/
-	public XnatUsscandata()
-	{}
-
-	public XnatUsscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatUssessiondata.java b/src/main/java/org/nrg/xdat/om/XnatUssessiondata.java
deleted file mode 100644
index 320307cb..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatUssessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatUssessiondata extends BaseXnatUssessiondata {
-
-	public XnatUssessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatUssessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatUssessiondata(UserI user)
-	 **/
-	public XnatUssessiondata()
-	{}
-
-	public XnatUssessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatValidationdata.java b/src/main/java/org/nrg/xdat/om/XnatValidationdata.java
deleted file mode 100644
index c7c473d3..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatValidationdata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatValidationdata extends BaseXnatValidationdata {
-
-	public XnatValidationdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatValidationdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatValidationdata(UserI user)
-	 **/
-	public XnatValidationdata()
-	{}
-
-	public XnatValidationdata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatVoiceaudioscandata.java b/src/main/java/org/nrg/xdat/om/XnatVoiceaudioscandata.java
deleted file mode 100644
index c30a31d6..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatVoiceaudioscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatVoiceaudioscandata extends BaseXnatVoiceaudioscandata {
-
-	public XnatVoiceaudioscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatVoiceaudioscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatVoiceaudioscandata(UserI user)
-	 **/
-	public XnatVoiceaudioscandata()
-	{}
-
-	public XnatVoiceaudioscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatVolumetricregion.java b/src/main/java/org/nrg/xdat/om/XnatVolumetricregion.java
deleted file mode 100644
index 55838a41..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatVolumetricregion.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatVolumetricregion extends BaseXnatVolumetricregion {
-
-	public XnatVolumetricregion(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatVolumetricregion(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatVolumetricregion(UserI user)
-	 **/
-	public XnatVolumetricregion()
-	{}
-
-	public XnatVolumetricregion(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatVolumetricregionSubregion.java b/src/main/java/org/nrg/xdat/om/XnatVolumetricregionSubregion.java
deleted file mode 100644
index ae0a21e8..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatVolumetricregionSubregion.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:02 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatVolumetricregionSubregion extends BaseXnatVolumetricregionSubregion {
-
-	public XnatVolumetricregionSubregion(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatVolumetricregionSubregion(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatVolumetricregionSubregion(UserI user)
-	 **/
-	public XnatVolumetricregionSubregion()
-	{}
-
-	public XnatVolumetricregionSubregion(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatXa3dscandata.java b/src/main/java/org/nrg/xdat/om/XnatXa3dscandata.java
deleted file mode 100644
index cd555bc8..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatXa3dscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatXa3dscandata extends BaseXnatXa3dscandata {
-
-	public XnatXa3dscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatXa3dscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatXa3dscandata(UserI user)
-	 **/
-	public XnatXa3dscandata()
-	{}
-
-	public XnatXa3dscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatXa3dsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatXa3dsessiondata.java
deleted file mode 100644
index 48726981..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatXa3dsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatXa3dsessiondata extends BaseXnatXa3dsessiondata {
-
-	public XnatXa3dsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatXa3dsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatXa3dsessiondata(UserI user)
-	 **/
-	public XnatXa3dsessiondata()
-	{}
-
-	public XnatXa3dsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatXascandata.java b/src/main/java/org/nrg/xdat/om/XnatXascandata.java
deleted file mode 100644
index b981bb94..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatXascandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatXascandata extends BaseXnatXascandata {
-
-	public XnatXascandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatXascandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatXascandata(UserI user)
-	 **/
-	public XnatXascandata()
-	{}
-
-	public XnatXascandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatXasessiondata.java b/src/main/java/org/nrg/xdat/om/XnatXasessiondata.java
deleted file mode 100644
index 3317f80d..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatXasessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatXasessiondata extends BaseXnatXasessiondata {
-
-	public XnatXasessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatXasessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatXasessiondata(UserI user)
-	 **/
-	public XnatXasessiondata()
-	{}
-
-	public XnatXasessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatXcscandata.java b/src/main/java/org/nrg/xdat/om/XnatXcscandata.java
deleted file mode 100644
index 4d3bcdc5..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatXcscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatXcscandata extends BaseXnatXcscandata {
-
-	public XnatXcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatXcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatXcscandata(UserI user)
-	 **/
-	public XnatXcscandata()
-	{}
-
-	public XnatXcscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatXcsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatXcsessiondata.java
deleted file mode 100644
index 7cee0e67..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatXcsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatXcsessiondata extends BaseXnatXcsessiondata {
-
-	public XnatXcsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatXcsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatXcsessiondata(UserI user)
-	 **/
-	public XnatXcsessiondata()
-	{}
-
-	public XnatXcsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatXcvscandata.java b/src/main/java/org/nrg/xdat/om/XnatXcvscandata.java
deleted file mode 100644
index 36907a37..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatXcvscandata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatXcvscandata extends BaseXnatXcvscandata {
-
-	public XnatXcvscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatXcvscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatXcvscandata(UserI user)
-	 **/
-	public XnatXcvscandata()
-	{}
-
-	public XnatXcvscandata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/XnatXcvsessiondata.java b/src/main/java/org/nrg/xdat/om/XnatXcvsessiondata.java
deleted file mode 100644
index 08bd22dc..00000000
--- a/src/main/java/org/nrg/xdat/om/XnatXcvsessiondata.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om;
-import org.nrg.xft.*;
-import org.nrg.xdat.om.base.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public class XnatXcvsessiondata extends BaseXnatXcvsessiondata {
-
-	public XnatXcvsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public XnatXcvsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseXnatXcvsessiondata(UserI user)
-	 **/
-	public XnatXcvsessiondata()
-	{}
-
-	public XnatXcvsessiondata(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseCatCatalog.java b/src/main/java/org/nrg/xdat/om/base/BaseCatCatalog.java
deleted file mode 100644
index f51d550a..00000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseCatCatalog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseCatCatalog extends AutoCatCatalog {
-
-	public BaseCatCatalog(ItemI item)
-	{
-		super(item);
-	}
-
-	public BaseCatCatalog(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatCatalog(UserI user)
-	 **/
-	public BaseCatCatalog()
-	{}
-
-	public BaseCatCatalog(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseCatCatalogMetafield.java b/src/main/java/org/nrg/xdat/om/base/BaseCatCatalogMetafield.java
deleted file mode 100644
index 3a42c99f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseCatCatalogMetafield.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseCatCatalogMetafield extends AutoCatCatalogMetafield {
-
-	public BaseCatCatalogMetafield(ItemI item)
-	{
-		super(item);
-	}
-
-	public BaseCatCatalogMetafield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatCatalogMetafield(UserI user)
-	 **/
-	public BaseCatCatalogMetafield()
-	{}
-
-	public BaseCatCatalogMetafield(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseCatCatalogTag.java b/src/main/java/org/nrg/xdat/om/base/BaseCatCatalogTag.java
deleted file mode 100644
index 8e4e051f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseCatCatalogTag.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseCatCatalogTag extends AutoCatCatalogTag {
-
-	public BaseCatCatalogTag(ItemI item)
-	{
-		super(item);
-	}
-
-	public BaseCatCatalogTag(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatCatalogTag(UserI user)
-	 **/
-	public BaseCatCatalogTag()
-	{}
-
-	public BaseCatCatalogTag(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseCatDcmcatalog.java b/src/main/java/org/nrg/xdat/om/base/BaseCatDcmcatalog.java
deleted file mode 100644
index 810c29e1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseCatDcmcatalog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseCatDcmcatalog extends AutoCatDcmcatalog {
-
-	public BaseCatDcmcatalog(ItemI item)
-	{
-		super(item);
-	}
-
-	public BaseCatDcmcatalog(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatDcmcatalog(UserI user)
-	 **/
-	public BaseCatDcmcatalog()
-	{}
-
-	public BaseCatDcmcatalog(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseCatDcmentry.java b/src/main/java/org/nrg/xdat/om/base/BaseCatDcmentry.java
deleted file mode 100644
index 52aead8d..00000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseCatDcmentry.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseCatDcmentry extends AutoCatDcmentry {
-
-	public BaseCatDcmentry(ItemI item)
-	{
-		super(item);
-	}
-
-	public BaseCatDcmentry(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatDcmentry(UserI user)
-	 **/
-	public BaseCatDcmentry()
-	{}
-
-	public BaseCatDcmentry(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseCatEntry.java b/src/main/java/org/nrg/xdat/om/base/BaseCatEntry.java
deleted file mode 100644
index 6868a636..00000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseCatEntry.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseCatEntry extends AutoCatEntry {
-
-	public BaseCatEntry(ItemI item)
-	{
-		super(item);
-	}
-
-	public BaseCatEntry(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatEntry(UserI user)
-	 **/
-	public BaseCatEntry()
-	{}
-
-	public BaseCatEntry(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseCatEntryMetafield.java b/src/main/java/org/nrg/xdat/om/base/BaseCatEntryMetafield.java
deleted file mode 100644
index 97a0d666..00000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseCatEntryMetafield.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseCatEntryMetafield extends AutoCatEntryMetafield {
-
-	public BaseCatEntryMetafield(ItemI item)
-	{
-		super(item);
-	}
-
-	public BaseCatEntryMetafield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatEntryMetafield(UserI user)
-	 **/
-	public BaseCatEntryMetafield()
-	{}
-
-	public BaseCatEntryMetafield(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/BaseCatEntryTag.java b/src/main/java/org/nrg/xdat/om/base/BaseCatEntryTag.java
deleted file mode 100644
index 834d580f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/BaseCatEntryTag.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:01 UTC 2016
- *
- */
-package org.nrg.xdat.om.base;
-import org.nrg.xdat.om.base.auto.*;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class BaseCatEntryTag extends AutoCatEntryTag {
-
-	public BaseCatEntryTag(ItemI item)
-	{
-		super(item);
-	}
-
-	public BaseCatEntryTag(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use BaseCatEntryTag(UserI user)
-	 **/
-	public BaseCatEntryTag()
-	{}
-
-	public BaseCatEntryTag(Hashtable properties, UserI user)
-	{
-		super(properties,user);
-	}
-
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcArchivespecification.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcArchivespecification.java
deleted file mode 100644
index f836e496..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcArchivespecification.java
+++ /dev/null
@@ -1,1000 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcArchivespecification extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcArchivespecificationI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcArchivespecification.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:ArchiveSpecification";
-
-	public AutoArcArchivespecification(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcArchivespecification(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcArchivespecification(UserI user)
-	 **/
-	public AutoArcArchivespecification(){}
-
-	public AutoArcArchivespecification(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:ArchiveSpecification";
-	}
-	 private org.nrg.xdat.om.ArcPathinfo _Globalpaths =null;
-
-	/**
-	 * globalPaths
-	 * @return org.nrg.xdat.om.ArcPathinfo
-	 */
-	public org.nrg.xdat.om.ArcPathinfo getGlobalpaths() {
-		try{
-			if (_Globalpaths==null){
-				_Globalpaths=((ArcPathinfo)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("globalPaths")));
-				return _Globalpaths;
-			}else {
-				return _Globalpaths;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for globalPaths.
-	 * @param v Value to Set.
-	 */
-	public void setGlobalpaths(ItemI v) throws Exception{
-		_Globalpaths =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/globalPaths",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/globalPaths",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * globalPaths
-	 * set org.nrg.xdat.model.ArcPathinfoI
-	 */
-	public <A extends org.nrg.xdat.model.ArcPathinfoI> void setGlobalpaths(A item) throws Exception{
-	setGlobalpaths((ItemI)item);
-	}
-
-	/**
-	 * Removes the globalPaths.
-	 * */
-	public void removeGlobalpaths() {
-		_Globalpaths =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/globalPaths",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _GlobalpathsFK=null;
-
-	/**
-	 * @return Returns the arc:ArchiveSpecification/globalpaths_arc_pathinfo_id.
-	 */
-	public Integer getGlobalpathsFK(){
-		try{
-			if (_GlobalpathsFK==null){
-				_GlobalpathsFK=getIntegerProperty("arc:ArchiveSpecification/globalpaths_arc_pathinfo_id");
-				return _GlobalpathsFK;
-			}else {
-				return _GlobalpathsFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc:ArchiveSpecification/globalpaths_arc_pathinfo_id.
-	 * @param v Value to Set.
-	 */
-	public void setGlobalpathsFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/globalpaths_arc_pathinfo_id",v);
-		_GlobalpathsFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcFieldspecification> _Fieldspecifications_fieldspecification =null;
-
-	/**
-	 * fieldSpecifications/fieldSpecification
-	 * @return Returns an List of org.nrg.xdat.om.ArcFieldspecification
-	 */
-	public <A extends org.nrg.xdat.model.ArcFieldspecificationI> List<A> getFieldspecifications_fieldspecification() {
-		try{
-			if (_Fieldspecifications_fieldspecification==null){
-				_Fieldspecifications_fieldspecification=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("fieldSpecifications/fieldSpecification"));
-			}
-			return (List<A>) _Fieldspecifications_fieldspecification;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcFieldspecification>();}
-	}
-
-	/**
-	 * Sets the value for fieldSpecifications/fieldSpecification.
-	 * @param v Value to Set.
-	 */
-	public void setFieldspecifications_fieldspecification(ItemI v) throws Exception{
-		_Fieldspecifications_fieldspecification =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fieldSpecifications/fieldSpecification",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fieldSpecifications/fieldSpecification",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * fieldSpecifications/fieldSpecification
-	 * Adds org.nrg.xdat.model.ArcFieldspecificationI
-	 */
-	public <A extends org.nrg.xdat.model.ArcFieldspecificationI> void addFieldspecifications_fieldspecification(A item) throws Exception{
-	setFieldspecifications_fieldspecification((ItemI)item);
-	}
-
-	/**
-	 * Removes the fieldSpecifications/fieldSpecification of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeFieldspecifications_fieldspecification(int index) throws java.lang.IndexOutOfBoundsException {
-		_Fieldspecifications_fieldspecification =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/fieldSpecifications/fieldSpecification",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcProject> _Projects_project =null;
-
-	/**
-	 * projects/project
-	 * @return Returns an List of org.nrg.xdat.om.ArcProject
-	 */
-	public <A extends org.nrg.xdat.model.ArcProjectI> List<A> getProjects_project() {
-		try{
-			if (_Projects_project==null){
-				_Projects_project=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("projects/project"));
-			}
-			return (List<A>) _Projects_project;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcProject>();}
-	}
-
-	/**
-	 * Sets the value for projects/project.
-	 * @param v Value to Set.
-	 */
-	public void setProjects_project(ItemI v) throws Exception{
-		_Projects_project =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/projects/project",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/projects/project",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * projects/project
-	 * Adds org.nrg.xdat.model.ArcProjectI
-	 */
-	public <A extends org.nrg.xdat.model.ArcProjectI> void addProjects_project(A item) throws Exception{
-	setProjects_project((ItemI)item);
-	}
-
-	/**
-	 * Removes the projects/project of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeProjects_project(int index) throws java.lang.IndexOutOfBoundsException {
-		_Projects_project =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/projects/project",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Emailspecifications_newUserRegistration=null;
-
-	/**
-	 * @return Returns the emailSpecifications/new_user_registration.
-	 */
-	public Boolean getEmailspecifications_newUserRegistration() {
-		try{
-			if (_Emailspecifications_newUserRegistration==null){
-				_Emailspecifications_newUserRegistration=getBooleanProperty("emailSpecifications/new_user_registration");
-				return _Emailspecifications_newUserRegistration;
-			}else {
-				return _Emailspecifications_newUserRegistration;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for emailSpecifications/new_user_registration.
-	 * @param v Value to Set.
-	 */
-	public void setEmailspecifications_newUserRegistration(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/emailSpecifications/new_user_registration",v);
-		_Emailspecifications_newUserRegistration=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Emailspecifications_pipeline=null;
-
-	/**
-	 * @return Returns the emailSpecifications/pipeline.
-	 */
-	public Boolean getEmailspecifications_pipeline() {
-		try{
-			if (_Emailspecifications_pipeline==null){
-				_Emailspecifications_pipeline=getBooleanProperty("emailSpecifications/pipeline");
-				return _Emailspecifications_pipeline;
-			}else {
-				return _Emailspecifications_pipeline;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for emailSpecifications/pipeline.
-	 * @param v Value to Set.
-	 */
-	public void setEmailspecifications_pipeline(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/emailSpecifications/pipeline",v);
-		_Emailspecifications_pipeline=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Emailspecifications_projectAccess=null;
-
-	/**
-	 * @return Returns the emailSpecifications/project_access.
-	 */
-	public Boolean getEmailspecifications_projectAccess() {
-		try{
-			if (_Emailspecifications_projectAccess==null){
-				_Emailspecifications_projectAccess=getBooleanProperty("emailSpecifications/project_access");
-				return _Emailspecifications_projectAccess;
-			}else {
-				return _Emailspecifications_projectAccess;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for emailSpecifications/project_access.
-	 * @param v Value to Set.
-	 */
-	public void setEmailspecifications_projectAccess(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/emailSpecifications/project_access",v);
-		_Emailspecifications_projectAccess=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Emailspecifications_transfer=null;
-
-	/**
-	 * @return Returns the emailSpecifications/transfer.
-	 */
-	public Boolean getEmailspecifications_transfer() {
-		try{
-			if (_Emailspecifications_transfer==null){
-				_Emailspecifications_transfer=getBooleanProperty("emailSpecifications/transfer");
-				return _Emailspecifications_transfer;
-			}else {
-				return _Emailspecifications_transfer;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for emailSpecifications/transfer.
-	 * @param v Value to Set.
-	 */
-	public void setEmailspecifications_transfer(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/emailSpecifications/transfer",v);
-		_Emailspecifications_transfer=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Emailspecifications_pageEmail=null;
-
-	/**
-	 * @return Returns the emailSpecifications/page_email.
-	 */
-	public Boolean getEmailspecifications_pageEmail() {
-		try{
-			if (_Emailspecifications_pageEmail==null){
-				_Emailspecifications_pageEmail=getBooleanProperty("emailSpecifications/page_email");
-				return _Emailspecifications_pageEmail;
-			}else {
-				return _Emailspecifications_pageEmail;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for emailSpecifications/page_email.
-	 * @param v Value to Set.
-	 */
-	public void setEmailspecifications_pageEmail(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/emailSpecifications/page_email",v);
-		_Emailspecifications_pageEmail=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType> _NotificationTypes_notificationType =null;
-
-	/**
-	 * notification_types/notification_type
-	 * @return Returns an List of org.nrg.xdat.om.ArcArchivespecificationNotificationType
-	 */
-	public <A extends org.nrg.xdat.model.ArcArchivespecificationNotificationTypeI> List<A> getNotificationTypes_notificationType() {
-		try{
-			if (_NotificationTypes_notificationType==null){
-				_NotificationTypes_notificationType=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("notification_types/notification_type"));
-			}
-			return (List<A>) _NotificationTypes_notificationType;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType>();}
-	}
-
-	/**
-	 * Sets the value for notification_types/notification_type.
-	 * @param v Value to Set.
-	 */
-	public void setNotificationTypes_notificationType(ItemI v) throws Exception{
-		_NotificationTypes_notificationType =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/notification_types/notification_type",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/notification_types/notification_type",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * notification_types/notification_type
-	 * Adds org.nrg.xdat.model.ArcArchivespecificationNotificationTypeI
-	 */
-	public <A extends org.nrg.xdat.model.ArcArchivespecificationNotificationTypeI> void addNotificationTypes_notificationType(A item) throws Exception{
-	setNotificationTypes_notificationType((ItemI)item);
-	}
-
-	/**
-	 * Removes the notification_types/notification_type of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeNotificationTypes_notificationType(int index) throws java.lang.IndexOutOfBoundsException {
-		_NotificationTypes_notificationType =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/notification_types/notification_type",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcm_dcmHost=null;
-
-	/**
-	 * @return Returns the dcm/dcm_host.
-	 */
-	public String getDcm_dcmHost(){
-		try{
-			if (_Dcm_dcmHost==null){
-				_Dcm_dcmHost=getStringProperty("dcm/dcm_host");
-				return _Dcm_dcmHost;
-			}else {
-				return _Dcm_dcmHost;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcm/dcm_host.
-	 * @param v Value to Set.
-	 */
-	public void setDcm_dcmHost(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcm/dcm_host",v);
-		_Dcm_dcmHost=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcm_dcmPort=null;
-
-	/**
-	 * @return Returns the dcm/dcm_port.
-	 */
-	public String getDcm_dcmPort(){
-		try{
-			if (_Dcm_dcmPort==null){
-				_Dcm_dcmPort=getStringProperty("dcm/dcm_port");
-				return _Dcm_dcmPort;
-			}else {
-				return _Dcm_dcmPort;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcm/dcm_port.
-	 * @param v Value to Set.
-	 */
-	public void setDcm_dcmPort(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcm/dcm_port",v);
-		_Dcm_dcmPort=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcm_dcmAe=null;
-
-	/**
-	 * @return Returns the dcm/dcm_ae.
-	 */
-	public String getDcm_dcmAe(){
-		try{
-			if (_Dcm_dcmAe==null){
-				_Dcm_dcmAe=getStringProperty("dcm/dcm_ae");
-				return _Dcm_dcmAe;
-			}else {
-				return _Dcm_dcmAe;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcm/dcm_ae.
-	 * @param v Value to Set.
-	 */
-	public void setDcm_dcmAe(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcm/dcm_ae",v);
-		_Dcm_dcmAe=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcm_httpUrl=null;
-
-	/**
-	 * @return Returns the dcm/http_url.
-	 */
-	public String getDcm_httpUrl(){
-		try{
-			if (_Dcm_httpUrl==null){
-				_Dcm_httpUrl=getStringProperty("dcm/http_url");
-				return _Dcm_httpUrl;
-			}else {
-				return _Dcm_httpUrl;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcm/http_url.
-	 * @param v Value to Set.
-	 */
-	public void setDcm_httpUrl(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcm/http_url",v);
-		_Dcm_httpUrl=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Dcm_appletLink=null;
-
-	/**
-	 * @return Returns the dcm/applet_link.
-	 */
-	public Boolean getDcm_appletLink() {
-		try{
-			if (_Dcm_appletLink==null){
-				_Dcm_appletLink=getBooleanProperty("dcm/applet_link");
-				return _Dcm_appletLink;
-			}else {
-				return _Dcm_appletLink;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcm/applet_link.
-	 * @param v Value to Set.
-	 */
-	public void setDcm_appletLink(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/dcm/applet_link",v);
-		_Dcm_appletLink=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SiteId=null;
-
-	/**
-	 * @return Returns the site_id.
-	 */
-	public String getSiteId(){
-		try{
-			if (_SiteId==null){
-				_SiteId=getStringProperty("site_id");
-				return _SiteId;
-			}else {
-				return _SiteId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for site_id.
-	 * @param v Value to Set.
-	 */
-	public void setSiteId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/site_id",v);
-		_SiteId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SiteAdminEmail=null;
-
-	/**
-	 * @return Returns the site_admin_email.
-	 */
-	public String getSiteAdminEmail(){
-		try{
-			if (_SiteAdminEmail==null){
-				_SiteAdminEmail=getStringProperty("site_admin_email");
-				return _SiteAdminEmail;
-			}else {
-				return _SiteAdminEmail;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for site_admin_email.
-	 * @param v Value to Set.
-	 */
-	public void setSiteAdminEmail(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/site_admin_email",v);
-		_SiteAdminEmail=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SiteUrl=null;
-
-	/**
-	 * @return Returns the site_url.
-	 */
-	public String getSiteUrl(){
-		try{
-			if (_SiteUrl==null){
-				_SiteUrl=getStringProperty("site_url");
-				return _SiteUrl;
-			}else {
-				return _SiteUrl;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for site_url.
-	 * @param v Value to Set.
-	 */
-	public void setSiteUrl(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/site_url",v);
-		_SiteUrl=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SmtpHost=null;
-
-	/**
-	 * @return Returns the smtp_host.
-	 */
-	public String getSmtpHost(){
-		try{
-			if (_SmtpHost==null){
-				_SmtpHost=getStringProperty("smtp_host");
-				return _SmtpHost;
-			}else {
-				return _SmtpHost;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for smtp_host.
-	 * @param v Value to Set.
-	 */
-	public void setSmtpHost(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/smtp_host",v);
-		_SmtpHost=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _RequireLogin=null;
-
-	/**
-	 * @return Returns the require_login.
-	 */
-	public Boolean getRequireLogin() {
-		try{
-			if (_RequireLogin==null){
-				_RequireLogin=getBooleanProperty("require_login");
-				return _RequireLogin;
-			}else {
-				return _RequireLogin;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for require_login.
-	 * @param v Value to Set.
-	 */
-	public void setRequireLogin(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/require_login",v);
-		_RequireLogin=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _EnableNewRegistrations=null;
-
-	/**
-	 * @return Returns the enable_new_registrations.
-	 */
-	public Boolean getEnableNewRegistrations() {
-		try{
-			if (_EnableNewRegistrations==null){
-				_EnableNewRegistrations=getBooleanProperty("enable_new_registrations");
-				return _EnableNewRegistrations;
-			}else {
-				return _EnableNewRegistrations;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for enable_new_registrations.
-	 * @param v Value to Set.
-	 */
-	public void setEnableNewRegistrations(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/enable_new_registrations",v);
-		_EnableNewRegistrations=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _EnableCsrfToken=null;
-
-	/**
-	 * @return Returns the enable_csrf_token.
-	 */
-	public Boolean getEnableCsrfToken() {
-		try{
-			if (_EnableCsrfToken==null){
-				_EnableCsrfToken=getBooleanProperty("enable_csrf_token");
-				return _EnableCsrfToken;
-			}else {
-				return _EnableCsrfToken;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for enable_csrf_token.
-	 * @param v Value to Set.
-	 */
-	public void setEnableCsrfToken(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/enable_csrf_token",v);
-		_EnableCsrfToken=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _QuarantineCode=null;
-
-	/**
-	 * @return Returns the quarantine_code.
-	 */
-	public Integer getQuarantineCode() {
-		try{
-			if (_QuarantineCode==null){
-				_QuarantineCode=getIntegerProperty("quarantine_code");
-				return _QuarantineCode;
-			}else {
-				return _QuarantineCode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for quarantine_code.
-	 * @param v Value to Set.
-	 */
-	public void setQuarantineCode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/quarantine_code",v);
-		_QuarantineCode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _PrearchiveCode=null;
-
-	/**
-	 * @return Returns the prearchive_code.
-	 */
-	public Integer getPrearchiveCode() {
-		try{
-			if (_PrearchiveCode==null){
-				_PrearchiveCode=getIntegerProperty("prearchive_code");
-				return _PrearchiveCode;
-			}else {
-				return _PrearchiveCode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for prearchive_code.
-	 * @param v Value to Set.
-	 */
-	public void setPrearchiveCode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/prearchive_code",v);
-		_PrearchiveCode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcArchivespecificationId=null;
-
-	/**
-	 * @return Returns the arc_ArchiveSpecification_id.
-	 */
-	public Integer getArcArchivespecificationId() {
-		try{
-			if (_ArcArchivespecificationId==null){
-				_ArcArchivespecificationId=getIntegerProperty("arc_ArchiveSpecification_id");
-				return _ArcArchivespecificationId;
-			}else {
-				return _ArcArchivespecificationId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_ArchiveSpecification_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcArchivespecificationId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_ArchiveSpecification_id",v);
-		_ArcArchivespecificationId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcArchivespecification> getAllArcArchivespecifications(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcArchivespecification> al = new ArrayList<org.nrg.xdat.om.ArcArchivespecification>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcArchivespecification> getArcArchivespecificationsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcArchivespecification> al = new ArrayList<org.nrg.xdat.om.ArcArchivespecification>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcArchivespecification> getArcArchivespecificationsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcArchivespecification> al = new ArrayList<org.nrg.xdat.om.ArcArchivespecification>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcArchivespecification getArcArchivespecificationsByArcArchivespecificationId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:ArchiveSpecification/arc_ArchiveSpecification_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcArchivespecification) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArcArchivespecification getArcArchivespecificationsBySiteId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:ArchiveSpecification/site_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcArchivespecification) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //globalPaths
-	        ArcPathinfo childGlobalpaths = (ArcPathinfo)this.getGlobalpaths();
-	            if (childGlobalpaths!=null){
-	              for(ResourceFile rf: ((ArcPathinfo)childGlobalpaths).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("globalPaths[" + ((ArcPathinfo)childGlobalpaths).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("globalPaths/" + ((ArcPathinfo)childGlobalpaths).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //fieldSpecifications/fieldSpecification
-	        for(org.nrg.xdat.model.ArcFieldspecificationI childFieldspecifications_fieldspecification : this.getFieldspecifications_fieldspecification()){
-	            if (childFieldspecifications_fieldspecification!=null){
-	              for(ResourceFile rf: ((ArcFieldspecification)childFieldspecifications_fieldspecification).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("fieldSpecifications/fieldSpecification[" + ((ArcFieldspecification)childFieldspecifications_fieldspecification).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("fieldSpecifications/fieldSpecification/" + ((ArcFieldspecification)childFieldspecifications_fieldspecification).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //projects/project
-	        for(org.nrg.xdat.model.ArcProjectI childProjects_project : this.getProjects_project()){
-	            if (childProjects_project!=null){
-	              for(ResourceFile rf: ((ArcProject)childProjects_project).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("projects/project[" + ((ArcProject)childProjects_project).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("projects/project/" + ((ArcProject)childProjects_project).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //notification_types/notification_type
-	        for(org.nrg.xdat.model.ArcArchivespecificationNotificationTypeI childNotificationTypes_notificationType : this.getNotificationTypes_notificationType()){
-	            if (childNotificationTypes_notificationType!=null){
-	              for(ResourceFile rf: ((ArcArchivespecificationNotificationType)childNotificationTypes_notificationType).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("notification_types/notification_type[" + ((ArcArchivespecificationNotificationType)childNotificationTypes_notificationType).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("notification_types/notification_type/" + ((ArcArchivespecificationNotificationType)childNotificationTypes_notificationType).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcArchivespecificationNotificationType.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcArchivespecificationNotificationType.java
deleted file mode 100644
index 7e1c8479..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcArchivespecificationNotificationType.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcArchivespecificationNotificationType extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcArchivespecificationNotificationTypeI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcArchivespecificationNotificationType.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:ArchiveSpecification_notification_type";
-
-	public AutoArcArchivespecificationNotificationType(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcArchivespecificationNotificationType(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcArchivespecificationNotificationType(UserI user)
-	 **/
-	public AutoArcArchivespecificationNotificationType(){}
-
-	public AutoArcArchivespecificationNotificationType(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:ArchiveSpecification_notification_type";
-	}
-
-	//FIELD
-
-	private String _NotificationType=null;
-
-	/**
-	 * @return Returns the notification_type.
-	 */
-	public String getNotificationType(){
-		try{
-			if (_NotificationType==null){
-				_NotificationType=getStringProperty("notification_type");
-				return _NotificationType;
-			}else {
-				return _NotificationType;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for notification_type.
-	 * @param v Value to Set.
-	 */
-	public void setNotificationType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/notification_type",v);
-		_NotificationType=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _EmailAddresses=null;
-
-	/**
-	 * @return Returns the email_addresses.
-	 */
-	public String getEmailAddresses(){
-		try{
-			if (_EmailAddresses==null){
-				_EmailAddresses=getStringProperty("email_addresses");
-				return _EmailAddresses;
-			}else {
-				return _EmailAddresses;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for email_addresses.
-	 * @param v Value to Set.
-	 */
-	public void setEmailAddresses(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/email_addresses",v);
-		_EmailAddresses=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcArchivespecificationNotificationTypeId=null;
-
-	/**
-	 * @return Returns the arc_ArchiveSpecification_notification_type_id.
-	 */
-	public Integer getArcArchivespecificationNotificationTypeId() {
-		try{
-			if (_ArcArchivespecificationNotificationTypeId==null){
-				_ArcArchivespecificationNotificationTypeId=getIntegerProperty("arc_ArchiveSpecification_notification_type_id");
-				return _ArcArchivespecificationNotificationTypeId;
-			}else {
-				return _ArcArchivespecificationNotificationTypeId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_ArchiveSpecification_notification_type_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcArchivespecificationNotificationTypeId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_ArchiveSpecification_notification_type_id",v);
-		_ArcArchivespecificationNotificationTypeId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType> getAllArcArchivespecificationNotificationTypes(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType> al = new ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType> getArcArchivespecificationNotificationTypesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType> al = new ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType> getArcArchivespecificationNotificationTypesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType> al = new ArrayList<org.nrg.xdat.om.ArcArchivespecificationNotificationType>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcArchivespecificationNotificationType getArcArchivespecificationNotificationTypesByArcArchivespecificationNotificationTypeId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:ArchiveSpecification_notification_type/arc_ArchiveSpecification_notification_type_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcArchivespecificationNotificationType) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcFieldspecification.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcFieldspecification.java
deleted file mode 100644
index 4ed2ecfa..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcFieldspecification.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcFieldspecification extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcFieldspecificationI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcFieldspecification.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:fieldSpecification";
-
-	public AutoArcFieldspecification(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcFieldspecification(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcFieldspecification(UserI user)
-	 **/
-	public AutoArcFieldspecification(){}
-
-	public AutoArcFieldspecification(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:fieldSpecification";
-	}
-
-	//FIELD
-
-	private String _Fieldspecification=null;
-
-	/**
-	 * @return Returns the fieldSpecification.
-	 */
-	public String getFieldspecification(){
-		try{
-			if (_Fieldspecification==null){
-				_Fieldspecification=getStringProperty("fieldSpecification");
-				return _Fieldspecification;
-			}else {
-				return _Fieldspecification;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for fieldSpecification.
-	 * @param v Value to Set.
-	 */
-	public void setFieldspecification(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/fieldSpecification",v);
-		_Fieldspecification=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcFieldspecificationId=null;
-
-	/**
-	 * @return Returns the arc_fieldSpecification_id.
-	 */
-	public Integer getArcFieldspecificationId() {
-		try{
-			if (_ArcFieldspecificationId==null){
-				_ArcFieldspecificationId=getIntegerProperty("arc_fieldSpecification_id");
-				return _ArcFieldspecificationId;
-			}else {
-				return _ArcFieldspecificationId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_fieldSpecification_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcFieldspecificationId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_fieldSpecification_id",v);
-		_ArcFieldspecificationId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcFieldspecification> getAllArcFieldspecifications(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcFieldspecification> al = new ArrayList<org.nrg.xdat.om.ArcFieldspecification>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcFieldspecification> getArcFieldspecificationsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcFieldspecification> al = new ArrayList<org.nrg.xdat.om.ArcFieldspecification>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcFieldspecification> getArcFieldspecificationsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcFieldspecification> al = new ArrayList<org.nrg.xdat.om.ArcFieldspecification>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcFieldspecification getArcFieldspecificationsByArcFieldspecificationId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:fieldSpecification/arc_fieldSpecification_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcFieldspecification) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPathinfo.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPathinfo.java
deleted file mode 100644
index 9ffb0f11..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPathinfo.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcPathinfo extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcPathinfoI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcPathinfo.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:pathInfo";
-
-	public AutoArcPathinfo(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcPathinfo(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcPathinfo(UserI user)
-	 **/
-	public AutoArcPathinfo(){}
-
-	public AutoArcPathinfo(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:pathInfo";
-	}
-
-	//FIELD
-
-	private String _Archivepath=null;
-
-	/**
-	 * @return Returns the archivePath.
-	 */
-	public String getArchivepath(){
-		try{
-			if (_Archivepath==null){
-				_Archivepath=getStringProperty("archivePath");
-				return _Archivepath;
-			}else {
-				return _Archivepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for archivePath.
-	 * @param v Value to Set.
-	 */
-	public void setArchivepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/archivePath",v);
-		_Archivepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Prearchivepath=null;
-
-	/**
-	 * @return Returns the prearchivePath.
-	 */
-	public String getPrearchivepath(){
-		try{
-			if (_Prearchivepath==null){
-				_Prearchivepath=getStringProperty("prearchivePath");
-				return _Prearchivepath;
-			}else {
-				return _Prearchivepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for prearchivePath.
-	 * @param v Value to Set.
-	 */
-	public void setPrearchivepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/prearchivePath",v);
-		_Prearchivepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Cachepath=null;
-
-	/**
-	 * @return Returns the cachePath.
-	 */
-	public String getCachepath(){
-		try{
-			if (_Cachepath==null){
-				_Cachepath=getStringProperty("cachePath");
-				return _Cachepath;
-			}else {
-				return _Cachepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cachePath.
-	 * @param v Value to Set.
-	 */
-	public void setCachepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cachePath",v);
-		_Cachepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Buildpath=null;
-
-	/**
-	 * @return Returns the buildPath.
-	 */
-	public String getBuildpath(){
-		try{
-			if (_Buildpath==null){
-				_Buildpath=getStringProperty("buildPath");
-				return _Buildpath;
-			}else {
-				return _Buildpath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for buildPath.
-	 * @param v Value to Set.
-	 */
-	public void setBuildpath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/buildPath",v);
-		_Buildpath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Ftppath=null;
-
-	/**
-	 * @return Returns the ftpPath.
-	 */
-	public String getFtppath(){
-		try{
-			if (_Ftppath==null){
-				_Ftppath=getStringProperty("ftpPath");
-				return _Ftppath;
-			}else {
-				return _Ftppath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ftpPath.
-	 * @param v Value to Set.
-	 */
-	public void setFtppath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ftpPath",v);
-		_Ftppath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Pipelinepath=null;
-
-	/**
-	 * @return Returns the pipelinePath.
-	 */
-	public String getPipelinepath(){
-		try{
-			if (_Pipelinepath==null){
-				_Pipelinepath=getStringProperty("pipelinePath");
-				return _Pipelinepath;
-			}else {
-				return _Pipelinepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pipelinePath.
-	 * @param v Value to Set.
-	 */
-	public void setPipelinepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pipelinePath",v);
-		_Pipelinepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcPathinfoId=null;
-
-	/**
-	 * @return Returns the arc_pathInfo_id.
-	 */
-	public Integer getArcPathinfoId() {
-		try{
-			if (_ArcPathinfoId==null){
-				_ArcPathinfoId=getIntegerProperty("arc_pathInfo_id");
-				return _ArcPathinfoId;
-			}else {
-				return _ArcPathinfoId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_pathInfo_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcPathinfoId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_pathInfo_id",v);
-		_ArcPathinfoId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPathinfo> getAllArcPathinfos(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPathinfo> al = new ArrayList<org.nrg.xdat.om.ArcPathinfo>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPathinfo> getArcPathinfosByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPathinfo> al = new ArrayList<org.nrg.xdat.om.ArcPathinfo>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPathinfo> getArcPathinfosByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPathinfo> al = new ArrayList<org.nrg.xdat.om.ArcPathinfo>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcPathinfo getArcPathinfosByArcPathinfoId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:pathInfo/arc_pathInfo_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcPathinfo) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPipelinedata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPipelinedata.java
deleted file mode 100644
index 231d27fe..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPipelinedata.java
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcPipelinedata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcPipelinedataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcPipelinedata.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:pipelineData";
-
-	public AutoArcPipelinedata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcPipelinedata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcPipelinedata(UserI user)
-	 **/
-	public AutoArcPipelinedata(){}
-
-	public AutoArcPipelinedata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:pipelineData";
-	}
-
-	//FIELD
-
-	private String _Displaytext=null;
-
-	/**
-	 * @return Returns the displayText.
-	 */
-	public String getDisplaytext(){
-		try{
-			if (_Displaytext==null){
-				_Displaytext=getStringProperty("displayText");
-				return _Displaytext;
-			}else {
-				return _Displaytext;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for displayText.
-	 * @param v Value to Set.
-	 */
-	public void setDisplaytext(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/displayText",v);
-		_Displaytext=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Location=null;
-
-	/**
-	 * @return Returns the location.
-	 */
-	public String getLocation(){
-		try{
-			if (_Location==null){
-				_Location=getStringProperty("location");
-				return _Location;
-			}else {
-				return _Location;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for location.
-	 * @param v Value to Set.
-	 */
-	public void setLocation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/location",v);
-		_Location=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata> _Parameters_parameter =null;
-
-	/**
-	 * parameters/parameter
-	 * @return Returns an List of org.nrg.xdat.om.ArcPipelineparameterdata
-	 */
-	public <A extends org.nrg.xdat.model.ArcPipelineparameterdataI> List<A> getParameters_parameter() {
-		try{
-			if (_Parameters_parameter==null){
-				_Parameters_parameter=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/parameter"));
-			}
-			return (List<A>) _Parameters_parameter;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata>();}
-	}
-
-	/**
-	 * Sets the value for parameters/parameter.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_parameter(ItemI v) throws Exception{
-		_Parameters_parameter =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/parameter
-	 * Adds org.nrg.xdat.model.ArcPipelineparameterdataI
-	 */
-	public <A extends org.nrg.xdat.model.ArcPipelineparameterdataI> void addParameters_parameter(A item) throws Exception{
-	setParameters_parameter((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/parameter of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_parameter(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_parameter =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Customwebpage=null;
-
-	/**
-	 * @return Returns the customwebpage.
-	 */
-	public String getCustomwebpage(){
-		try{
-			if (_Customwebpage==null){
-				_Customwebpage=getStringProperty("customwebpage");
-				return _Customwebpage;
-			}else {
-				return _Customwebpage;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for customwebpage.
-	 * @param v Value to Set.
-	 */
-	public void setCustomwebpage(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/customwebpage",v);
-		_Customwebpage=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcPipelinedataId=null;
-
-	/**
-	 * @return Returns the arc_pipelineData_id.
-	 */
-	public Integer getArcPipelinedataId() {
-		try{
-			if (_ArcPipelinedataId==null){
-				_ArcPipelinedataId=getIntegerProperty("arc_pipelineData_id");
-				return _ArcPipelinedataId;
-			}else {
-				return _ArcPipelinedataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_pipelineData_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcPipelinedataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_pipelineData_id",v);
-		_ArcPipelinedataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPipelinedata> getAllArcPipelinedatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPipelinedata> al = new ArrayList<org.nrg.xdat.om.ArcPipelinedata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPipelinedata> getArcPipelinedatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPipelinedata> al = new ArrayList<org.nrg.xdat.om.ArcPipelinedata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPipelinedata> getArcPipelinedatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPipelinedata> al = new ArrayList<org.nrg.xdat.om.ArcPipelinedata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcPipelinedata getArcPipelinedatasByArcPipelinedataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:pipelineData/arc_pipelineData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcPipelinedata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //parameters/parameter
-	        for(org.nrg.xdat.model.ArcPipelineparameterdataI childParameters_parameter : this.getParameters_parameter()){
-	            if (childParameters_parameter!=null){
-	              for(ResourceFile rf: ((ArcPipelineparameterdata)childParameters_parameter).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/parameter[" + ((ArcPipelineparameterdata)childParameters_parameter).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/parameter/" + ((ArcPipelineparameterdata)childParameters_parameter).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPipelineparameterdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPipelineparameterdata.java
deleted file mode 100644
index 9880df02..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcPipelineparameterdata.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcPipelineparameterdata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcPipelineparameterdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcPipelineparameterdata.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:pipelineParameterData";
-
-	public AutoArcPipelineparameterdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcPipelineparameterdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcPipelineparameterdata(UserI user)
-	 **/
-	public AutoArcPipelineparameterdata(){}
-
-	public AutoArcPipelineparameterdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:pipelineParameterData";
-	}
-
-	//FIELD
-
-	private String _Schemalink=null;
-
-	/**
-	 * @return Returns the schemaLink.
-	 */
-	public String getSchemalink(){
-		try{
-			if (_Schemalink==null){
-				_Schemalink=getStringProperty("schemaLink");
-				return _Schemalink;
-			}else {
-				return _Schemalink;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for schemaLink.
-	 * @param v Value to Set.
-	 */
-	public void setSchemalink(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/schemaLink",v);
-		_Schemalink=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Csvvalues=null;
-
-	/**
-	 * @return Returns the csvValues.
-	 */
-	public String getCsvvalues(){
-		try{
-			if (_Csvvalues==null){
-				_Csvvalues=getStringProperty("csvValues");
-				return _Csvvalues;
-			}else {
-				return _Csvvalues;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for csvValues.
-	 * @param v Value to Set.
-	 */
-	public void setCsvvalues(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/csvValues",v);
-		_Csvvalues=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Csvvalues_selected=null;
-
-	/**
-	 * @return Returns the csvValues/selected.
-	 */
-	public String getCsvvalues_selected(){
-		try{
-			if (_Csvvalues_selected==null){
-				_Csvvalues_selected=getStringProperty("csvValues/selected");
-				return _Csvvalues_selected;
-			}else {
-				return _Csvvalues_selected;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for csvValues/selected.
-	 * @param v Value to Set.
-	 */
-	public void setCsvvalues_selected(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/csvValues/selected",v);
-		_Csvvalues_selected=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Multiplevalues=null;
-
-	/**
-	 * @return Returns the multipleValues.
-	 */
-	public Boolean getMultiplevalues() {
-		try{
-			if (_Multiplevalues==null){
-				_Multiplevalues=getBooleanProperty("multipleValues");
-				return _Multiplevalues;
-			}else {
-				return _Multiplevalues;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for multipleValues.
-	 * @param v Value to Set.
-	 */
-	public void setMultiplevalues(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/multipleValues",v);
-		_Multiplevalues=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Editable=null;
-
-	/**
-	 * @return Returns the editable.
-	 */
-	public Boolean getEditable() {
-		try{
-			if (_Editable==null){
-				_Editable=getBooleanProperty("editable");
-				return _Editable;
-			}else {
-				return _Editable;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for editable.
-	 * @param v Value to Set.
-	 */
-	public void setEditable(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/editable",v);
-		_Editable=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Batchparam=null;
-
-	/**
-	 * @return Returns the batchParam.
-	 */
-	public Boolean getBatchparam() {
-		try{
-			if (_Batchparam==null){
-				_Batchparam=getBooleanProperty("batchParam");
-				return _Batchparam;
-			}else {
-				return _Batchparam;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for batchParam.
-	 * @param v Value to Set.
-	 */
-	public void setBatchparam(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/batchParam",v);
-		_Batchparam=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcPipelineparameterdataId=null;
-
-	/**
-	 * @return Returns the arc_pipelineParameterData_id.
-	 */
-	public Integer getArcPipelineparameterdataId() {
-		try{
-			if (_ArcPipelineparameterdataId==null){
-				_ArcPipelineparameterdataId=getIntegerProperty("arc_pipelineParameterData_id");
-				return _ArcPipelineparameterdataId;
-			}else {
-				return _ArcPipelineparameterdataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_pipelineParameterData_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcPipelineparameterdataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_pipelineParameterData_id",v);
-		_ArcPipelineparameterdataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata> getAllArcPipelineparameterdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata> al = new ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata> getArcPipelineparameterdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata> al = new ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata> getArcPipelineparameterdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata> al = new ArrayList<org.nrg.xdat.om.ArcPipelineparameterdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcPipelineparameterdata getArcPipelineparameterdatasByArcPipelineparameterdataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:pipelineParameterData/arc_pipelineParameterData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcPipelineparameterdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProject.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProject.java
deleted file mode 100644
index 0c349425..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProject.java
+++ /dev/null
@@ -1,627 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcProject extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcProjectI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcProject.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:project";
-
-	public AutoArcProject(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcProject(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcProject(UserI user)
-	 **/
-	public AutoArcProject(){}
-
-	public AutoArcProject(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:project";
-	}
-	 private org.nrg.xdat.om.ArcPathinfo _Paths =null;
-
-	/**
-	 * paths
-	 * @return org.nrg.xdat.om.ArcPathinfo
-	 */
-	public org.nrg.xdat.om.ArcPathinfo getPaths() {
-		try{
-			if (_Paths==null){
-				_Paths=((ArcPathinfo)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("paths")));
-				return _Paths;
-			}else {
-				return _Paths;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for paths.
-	 * @param v Value to Set.
-	 */
-	public void setPaths(ItemI v) throws Exception{
-		_Paths =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/paths",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/paths",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * paths
-	 * set org.nrg.xdat.model.ArcPathinfoI
-	 */
-	public <A extends org.nrg.xdat.model.ArcPathinfoI> void setPaths(A item) throws Exception{
-	setPaths((ItemI)item);
-	}
-
-	/**
-	 * Removes the paths.
-	 * */
-	public void removePaths() {
-		_Paths =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/paths",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _PathsFK=null;
-
-	/**
-	 * @return Returns the arc:project/paths_arc_pathinfo_id.
-	 */
-	public Integer getPathsFK(){
-		try{
-			if (_PathsFK==null){
-				_PathsFK=getIntegerProperty("arc:project/paths_arc_pathinfo_id");
-				return _PathsFK;
-			}else {
-				return _PathsFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc:project/paths_arc_pathinfo_id.
-	 * @param v Value to Set.
-	 */
-	public void setPathsFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/paths_arc_pathinfo_id",v);
-		_PathsFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcFieldspecification> _Fieldspecifications_fieldspecification =null;
-
-	/**
-	 * fieldSpecifications/fieldSpecification
-	 * @return Returns an List of org.nrg.xdat.om.ArcFieldspecification
-	 */
-	public <A extends org.nrg.xdat.model.ArcFieldspecificationI> List<A> getFieldspecifications_fieldspecification() {
-		try{
-			if (_Fieldspecifications_fieldspecification==null){
-				_Fieldspecifications_fieldspecification=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("fieldSpecifications/fieldSpecification"));
-			}
-			return (List<A>) _Fieldspecifications_fieldspecification;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcFieldspecification>();}
-	}
-
-	/**
-	 * Sets the value for fieldSpecifications/fieldSpecification.
-	 * @param v Value to Set.
-	 */
-	public void setFieldspecifications_fieldspecification(ItemI v) throws Exception{
-		_Fieldspecifications_fieldspecification =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fieldSpecifications/fieldSpecification",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fieldSpecifications/fieldSpecification",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * fieldSpecifications/fieldSpecification
-	 * Adds org.nrg.xdat.model.ArcFieldspecificationI
-	 */
-	public <A extends org.nrg.xdat.model.ArcFieldspecificationI> void addFieldspecifications_fieldspecification(A item) throws Exception{
-	setFieldspecifications_fieldspecification((ItemI)item);
-	}
-
-	/**
-	 * Removes the fieldSpecifications/fieldSpecification of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeFieldspecifications_fieldspecification(int index) throws java.lang.IndexOutOfBoundsException {
-		_Fieldspecifications_fieldspecification =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/fieldSpecifications/fieldSpecification",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcProperty> _Properties_property =null;
-
-	/**
-	 * properties/property
-	 * @return Returns an List of org.nrg.xdat.om.ArcProperty
-	 */
-	public <A extends org.nrg.xdat.model.ArcPropertyI> List<A> getProperties_property() {
-		try{
-			if (_Properties_property==null){
-				_Properties_property=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("properties/property"));
-			}
-			return (List<A>) _Properties_property;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcProperty>();}
-	}
-
-	/**
-	 * Sets the value for properties/property.
-	 * @param v Value to Set.
-	 */
-	public void setProperties_property(ItemI v) throws Exception{
-		_Properties_property =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/properties/property",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/properties/property",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * properties/property
-	 * Adds org.nrg.xdat.model.ArcPropertyI
-	 */
-	public <A extends org.nrg.xdat.model.ArcPropertyI> void addProperties_property(A item) throws Exception{
-	setProperties_property((ItemI)item);
-	}
-
-	/**
-	 * Removes the properties/property of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeProperties_property(int index) throws java.lang.IndexOutOfBoundsException {
-		_Properties_property =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/properties/property",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcProjectDescendant> _Pipelines_descendants_descendant =null;
-
-	/**
-	 * pipelines/descendants/descendant
-	 * @return Returns an List of org.nrg.xdat.om.ArcProjectDescendant
-	 */
-	public <A extends org.nrg.xdat.model.ArcProjectDescendantI> List<A> getPipelines_descendants_descendant() {
-		try{
-			if (_Pipelines_descendants_descendant==null){
-				_Pipelines_descendants_descendant=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("pipelines/descendants/descendant"));
-			}
-			return (List<A>) _Pipelines_descendants_descendant;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcProjectDescendant>();}
-	}
-
-	/**
-	 * Sets the value for pipelines/descendants/descendant.
-	 * @param v Value to Set.
-	 */
-	public void setPipelines_descendants_descendant(ItemI v) throws Exception{
-		_Pipelines_descendants_descendant =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipelines/descendants/descendant",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipelines/descendants/descendant",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * pipelines/descendants/descendant
-	 * Adds org.nrg.xdat.model.ArcProjectDescendantI
-	 */
-	public <A extends org.nrg.xdat.model.ArcProjectDescendantI> void addPipelines_descendants_descendant(A item) throws Exception{
-	setPipelines_descendants_descendant((ItemI)item);
-	}
-
-	/**
-	 * Removes the pipelines/descendants/descendant of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removePipelines_descendants_descendant(int index) throws java.lang.IndexOutOfBoundsException {
-		_Pipelines_descendants_descendant =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/pipelines/descendants/descendant",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcProjectPipeline> _Pipelines_pipeline =null;
-
-	/**
-	 * pipelines/pipeline
-	 * @return Returns an List of org.nrg.xdat.om.ArcProjectPipeline
-	 */
-	public <A extends org.nrg.xdat.model.ArcProjectPipelineI> List<A> getPipelines_pipeline() {
-		try{
-			if (_Pipelines_pipeline==null){
-				_Pipelines_pipeline=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("pipelines/pipeline"));
-			}
-			return (List<A>) _Pipelines_pipeline;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcProjectPipeline>();}
-	}
-
-	/**
-	 * Sets the value for pipelines/pipeline.
-	 * @param v Value to Set.
-	 */
-	public void setPipelines_pipeline(ItemI v) throws Exception{
-		_Pipelines_pipeline =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipelines/pipeline",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipelines/pipeline",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * pipelines/pipeline
-	 * Adds org.nrg.xdat.model.ArcProjectPipelineI
-	 */
-	public <A extends org.nrg.xdat.model.ArcProjectPipelineI> void addPipelines_pipeline(A item) throws Exception{
-	setPipelines_pipeline((ItemI)item);
-	}
-
-	/**
-	 * Removes the pipelines/pipeline of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removePipelines_pipeline(int index) throws java.lang.IndexOutOfBoundsException {
-		_Pipelines_pipeline =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/pipelines/pipeline",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the id.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("id");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for id.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/id",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _CurrentArc=null;
-
-	/**
-	 * @return Returns the current_arc.
-	 */
-	public String getCurrentArc(){
-		try{
-			if (_CurrentArc==null){
-				_CurrentArc=getStringProperty("current_arc");
-				return _CurrentArc;
-			}else {
-				return _CurrentArc;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for current_arc.
-	 * @param v Value to Set.
-	 */
-	public void setCurrentArc(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/current_arc",v);
-		_CurrentArc=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _QuarantineCode=null;
-
-	/**
-	 * @return Returns the quarantine_code.
-	 */
-	public Integer getQuarantineCode() {
-		try{
-			if (_QuarantineCode==null){
-				_QuarantineCode=getIntegerProperty("quarantine_code");
-				return _QuarantineCode;
-			}else {
-				return _QuarantineCode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for quarantine_code.
-	 * @param v Value to Set.
-	 */
-	public void setQuarantineCode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/quarantine_code",v);
-		_QuarantineCode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _PrearchiveCode=null;
-
-	/**
-	 * @return Returns the prearchive_code.
-	 */
-	public Integer getPrearchiveCode() {
-		try{
-			if (_PrearchiveCode==null){
-				_PrearchiveCode=getIntegerProperty("prearchive_code");
-				return _PrearchiveCode;
-			}else {
-				return _PrearchiveCode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for prearchive_code.
-	 * @param v Value to Set.
-	 */
-	public void setPrearchiveCode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/prearchive_code",v);
-		_PrearchiveCode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcProjectId=null;
-
-	/**
-	 * @return Returns the arc_project_id.
-	 */
-	public Integer getArcProjectId() {
-		try{
-			if (_ArcProjectId==null){
-				_ArcProjectId=getIntegerProperty("arc_project_id");
-				return _ArcProjectId;
-			}else {
-				return _ArcProjectId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_project_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcProjectId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_project_id",v);
-		_ArcProjectId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProject> getAllArcProjects(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProject> al = new ArrayList<org.nrg.xdat.om.ArcProject>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProject> getArcProjectsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProject> al = new ArrayList<org.nrg.xdat.om.ArcProject>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProject> getArcProjectsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProject> al = new ArrayList<org.nrg.xdat.om.ArcProject>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcProject getArcProjectsByArcProjectId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:project/arc_project_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcProject) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArcProject getArcProjectsById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:project/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcProject) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //paths
-	        ArcPathinfo childPaths = (ArcPathinfo)this.getPaths();
-	            if (childPaths!=null){
-	              for(ResourceFile rf: ((ArcPathinfo)childPaths).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("paths[" + ((ArcPathinfo)childPaths).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("paths/" + ((ArcPathinfo)childPaths).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //fieldSpecifications/fieldSpecification
-	        for(org.nrg.xdat.model.ArcFieldspecificationI childFieldspecifications_fieldspecification : this.getFieldspecifications_fieldspecification()){
-	            if (childFieldspecifications_fieldspecification!=null){
-	              for(ResourceFile rf: ((ArcFieldspecification)childFieldspecifications_fieldspecification).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("fieldSpecifications/fieldSpecification[" + ((ArcFieldspecification)childFieldspecifications_fieldspecification).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("fieldSpecifications/fieldSpecification/" + ((ArcFieldspecification)childFieldspecifications_fieldspecification).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //properties/property
-	        for(org.nrg.xdat.model.ArcPropertyI childProperties_property : this.getProperties_property()){
-	            if (childProperties_property!=null){
-	              for(ResourceFile rf: ((ArcProperty)childProperties_property).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("properties/property[" + ((ArcProperty)childProperties_property).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("properties/property/" + ((ArcProperty)childProperties_property).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //pipelines/descendants/descendant
-	        for(org.nrg.xdat.model.ArcProjectDescendantI childPipelines_descendants_descendant : this.getPipelines_descendants_descendant()){
-	            if (childPipelines_descendants_descendant!=null){
-	              for(ResourceFile rf: ((ArcProjectDescendant)childPipelines_descendants_descendant).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("pipelines/descendants/descendant[" + ((ArcProjectDescendant)childPipelines_descendants_descendant).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("pipelines/descendants/descendant/" + ((ArcProjectDescendant)childPipelines_descendants_descendant).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //pipelines/pipeline
-	        for(org.nrg.xdat.model.ArcProjectPipelineI childPipelines_pipeline : this.getPipelines_pipeline()){
-	            if (childPipelines_pipeline!=null){
-	              for(ResourceFile rf: ((ArcProjectPipeline)childPipelines_pipeline).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("pipelines/pipeline[" + ((ArcProjectPipeline)childPipelines_pipeline).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("pipelines/pipeline/" + ((ArcProjectPipeline)childPipelines_pipeline).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectDescendant.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectDescendant.java
deleted file mode 100644
index 686db313..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectDescendant.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcProjectDescendant extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcProjectDescendantI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcProjectDescendant.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:project_descendant";
-
-	public AutoArcProjectDescendant(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcProjectDescendant(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcProjectDescendant(UserI user)
-	 **/
-	public AutoArcProjectDescendant(){}
-
-	public AutoArcProjectDescendant(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:project_descendant";
-	}
-	 private ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline> _Pipeline =null;
-
-	/**
-	 * pipeline
-	 * @return Returns an List of org.nrg.xdat.om.ArcProjectDescendantPipeline
-	 */
-	public <A extends org.nrg.xdat.model.ArcProjectDescendantPipelineI> List<A> getPipeline() {
-		try{
-			if (_Pipeline==null){
-				_Pipeline=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("pipeline"));
-			}
-			return (List<A>) _Pipeline;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline>();}
-	}
-
-	/**
-	 * Sets the value for pipeline.
-	 * @param v Value to Set.
-	 */
-	public void setPipeline(ItemI v) throws Exception{
-		_Pipeline =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipeline",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipeline",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * pipeline
-	 * Adds org.nrg.xdat.model.ArcProjectDescendantPipelineI
-	 */
-	public <A extends org.nrg.xdat.model.ArcProjectDescendantPipelineI> void addPipeline(A item) throws Exception{
-	setPipeline((ItemI)item);
-	}
-
-	/**
-	 * Removes the pipeline of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removePipeline(int index) throws java.lang.IndexOutOfBoundsException {
-		_Pipeline =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/pipeline",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Xsitype=null;
-
-	/**
-	 * @return Returns the xsiType.
-	 */
-	public String getXsitype(){
-		try{
-			if (_Xsitype==null){
-				_Xsitype=getStringProperty("xsiType");
-				return _Xsitype;
-			}else {
-				return _Xsitype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xsiType.
-	 * @param v Value to Set.
-	 */
-	public void setXsitype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xsiType",v);
-		_Xsitype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcProjectDescendantId=null;
-
-	/**
-	 * @return Returns the arc_project_descendant_id.
-	 */
-	public Integer getArcProjectDescendantId() {
-		try{
-			if (_ArcProjectDescendantId==null){
-				_ArcProjectDescendantId=getIntegerProperty("arc_project_descendant_id");
-				return _ArcProjectDescendantId;
-			}else {
-				return _ArcProjectDescendantId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_project_descendant_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcProjectDescendantId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_project_descendant_id",v);
-		_ArcProjectDescendantId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectDescendant> getAllArcProjectDescendants(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectDescendant> al = new ArrayList<org.nrg.xdat.om.ArcProjectDescendant>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectDescendant> getArcProjectDescendantsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectDescendant> al = new ArrayList<org.nrg.xdat.om.ArcProjectDescendant>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectDescendant> getArcProjectDescendantsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectDescendant> al = new ArrayList<org.nrg.xdat.om.ArcProjectDescendant>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcProjectDescendant getArcProjectDescendantsByArcProjectDescendantId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:project_descendant/arc_project_descendant_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcProjectDescendant) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //pipeline
-	        for(org.nrg.xdat.model.ArcProjectDescendantPipelineI childPipeline : this.getPipeline()){
-	            if (childPipeline!=null){
-	              for(ResourceFile rf: ((ArcProjectDescendantPipeline)childPipeline).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("pipeline[" + ((ArcProjectDescendantPipeline)childPipeline).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("pipeline/" + ((ArcProjectDescendantPipeline)childPipeline).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectDescendantPipeline.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectDescendantPipeline.java
deleted file mode 100644
index 612ed2b9..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectDescendantPipeline.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcProjectDescendantPipeline extends ArcPipelinedata implements org.nrg.xdat.model.ArcProjectDescendantPipelineI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcProjectDescendantPipeline.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:project_descendant_pipeline";
-
-	public AutoArcProjectDescendantPipeline(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcProjectDescendantPipeline(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcProjectDescendantPipeline(UserI user)
-	 **/
-	public AutoArcProjectDescendantPipeline(){}
-
-	public AutoArcProjectDescendantPipeline(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:project_descendant_pipeline";
-	}
-	 private org.nrg.xdat.om.ArcPipelinedata _Pipelinedata =null;
-
-	/**
-	 * pipelineData
-	 * @return org.nrg.xdat.om.ArcPipelinedata
-	 */
-	public org.nrg.xdat.om.ArcPipelinedata getPipelinedata() {
-		try{
-			if (_Pipelinedata==null){
-				_Pipelinedata=((ArcPipelinedata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("pipelineData")));
-				return _Pipelinedata;
-			}else {
-				return _Pipelinedata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for pipelineData.
-	 * @param v Value to Set.
-	 */
-	public void setPipelinedata(ItemI v) throws Exception{
-		_Pipelinedata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipelineData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipelineData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * pipelineData
-	 * set org.nrg.xdat.model.ArcPipelinedataI
-	 */
-	public <A extends org.nrg.xdat.model.ArcPipelinedataI> void setPipelinedata(A item) throws Exception{
-	setPipelinedata((ItemI)item);
-	}
-
-	/**
-	 * Removes the pipelineData.
-	 * */
-	public void removePipelinedata() {
-		_Pipelinedata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/pipelineData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Stepid=null;
-
-	/**
-	 * @return Returns the stepId.
-	 */
-	public String getStepid(){
-		try{
-			if (_Stepid==null){
-				_Stepid=getStringProperty("stepId");
-				return _Stepid;
-			}else {
-				return _Stepid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stepId.
-	 * @param v Value to Set.
-	 */
-	public void setStepid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stepId",v);
-		_Stepid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Dependent=null;
-
-	/**
-	 * @return Returns the dependent.
-	 */
-	public Boolean getDependent() {
-		try{
-			if (_Dependent==null){
-				_Dependent=getBooleanProperty("dependent");
-				return _Dependent;
-			}else {
-				return _Dependent;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dependent.
-	 * @param v Value to Set.
-	 */
-	public void setDependent(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/dependent",v);
-		_Dependent=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline> getAllArcProjectDescendantPipelines(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline> al = new ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline> getArcProjectDescendantPipelinesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline> al = new ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline> getArcProjectDescendantPipelinesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline> al = new ArrayList<org.nrg.xdat.om.ArcProjectDescendantPipeline>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcProjectDescendantPipeline getArcProjectDescendantPipelinesByArcPipelinedataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:project_descendant_pipeline/arc_pipelinedata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcProjectDescendantPipeline) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //pipelineData
-	        ArcPipelinedata childPipelinedata = (ArcPipelinedata)this.getPipelinedata();
-	            if (childPipelinedata!=null){
-	              for(ResourceFile rf: ((ArcPipelinedata)childPipelinedata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("pipelineData[" + ((ArcPipelinedata)childPipelinedata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("pipelineData/" + ((ArcPipelinedata)childPipelinedata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectPipeline.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectPipeline.java
deleted file mode 100644
index 8bb459b4..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProjectPipeline.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcProjectPipeline extends ArcPipelinedata implements org.nrg.xdat.model.ArcProjectPipelineI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcProjectPipeline.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:project_pipeline";
-
-	public AutoArcProjectPipeline(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcProjectPipeline(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcProjectPipeline(UserI user)
-	 **/
-	public AutoArcProjectPipeline(){}
-
-	public AutoArcProjectPipeline(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:project_pipeline";
-	}
-	 private org.nrg.xdat.om.ArcPipelinedata _Pipelinedata =null;
-
-	/**
-	 * pipelineData
-	 * @return org.nrg.xdat.om.ArcPipelinedata
-	 */
-	public org.nrg.xdat.om.ArcPipelinedata getPipelinedata() {
-		try{
-			if (_Pipelinedata==null){
-				_Pipelinedata=((ArcPipelinedata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("pipelineData")));
-				return _Pipelinedata;
-			}else {
-				return _Pipelinedata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for pipelineData.
-	 * @param v Value to Set.
-	 */
-	public void setPipelinedata(ItemI v) throws Exception{
-		_Pipelinedata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipelineData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipelineData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * pipelineData
-	 * set org.nrg.xdat.model.ArcPipelinedataI
-	 */
-	public <A extends org.nrg.xdat.model.ArcPipelinedataI> void setPipelinedata(A item) throws Exception{
-	setPipelinedata((ItemI)item);
-	}
-
-	/**
-	 * Removes the pipelineData.
-	 * */
-	public void removePipelinedata() {
-		_Pipelinedata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/pipelineData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Stepid=null;
-
-	/**
-	 * @return Returns the stepId.
-	 */
-	public String getStepid(){
-		try{
-			if (_Stepid==null){
-				_Stepid=getStringProperty("stepId");
-				return _Stepid;
-			}else {
-				return _Stepid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stepId.
-	 * @param v Value to Set.
-	 */
-	public void setStepid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stepId",v);
-		_Stepid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Dependent=null;
-
-	/**
-	 * @return Returns the dependent.
-	 */
-	public Boolean getDependent() {
-		try{
-			if (_Dependent==null){
-				_Dependent=getBooleanProperty("dependent");
-				return _Dependent;
-			}else {
-				return _Dependent;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dependent.
-	 * @param v Value to Set.
-	 */
-	public void setDependent(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/dependent",v);
-		_Dependent=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectPipeline> getAllArcProjectPipelines(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectPipeline> al = new ArrayList<org.nrg.xdat.om.ArcProjectPipeline>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectPipeline> getArcProjectPipelinesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectPipeline> al = new ArrayList<org.nrg.xdat.om.ArcProjectPipeline>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProjectPipeline> getArcProjectPipelinesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProjectPipeline> al = new ArrayList<org.nrg.xdat.om.ArcProjectPipeline>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcProjectPipeline getArcProjectPipelinesByArcPipelinedataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:project_pipeline/arc_pipelinedata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcProjectPipeline) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //pipelineData
-	        ArcPipelinedata childPipelinedata = (ArcPipelinedata)this.getPipelinedata();
-	            if (childPipelinedata!=null){
-	              for(ResourceFile rf: ((ArcPipelinedata)childPipelinedata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("pipelineData[" + ((ArcPipelinedata)childPipelinedata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("pipelineData/" + ((ArcPipelinedata)childPipelinedata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProperty.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProperty.java
deleted file mode 100644
index 765b361a..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoArcProperty.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoArcProperty extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ArcPropertyI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoArcProperty.class);
-	public static String SCHEMA_ELEMENT_NAME="arc:property";
-
-	public AutoArcProperty(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoArcProperty(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoArcProperty(UserI user)
-	 **/
-	public AutoArcProperty(){}
-
-	public AutoArcProperty(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "arc:property";
-	}
-
-	//FIELD
-
-	private String _Property=null;
-
-	/**
-	 * @return Returns the property.
-	 */
-	public String getProperty(){
-		try{
-			if (_Property==null){
-				_Property=getStringProperty("property");
-				return _Property;
-			}else {
-				return _Property;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for property.
-	 * @param v Value to Set.
-	 */
-	public void setProperty(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/property",v);
-		_Property=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ArcPropertyId=null;
-
-	/**
-	 * @return Returns the arc_property_id.
-	 */
-	public Integer getArcPropertyId() {
-		try{
-			if (_ArcPropertyId==null){
-				_ArcPropertyId=getIntegerProperty("arc_property_id");
-				return _ArcPropertyId;
-			}else {
-				return _ArcPropertyId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for arc_property_id.
-	 * @param v Value to Set.
-	 */
-	public void setArcPropertyId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/arc_property_id",v);
-		_ArcPropertyId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProperty> getAllArcPropertys(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProperty> al = new ArrayList<org.nrg.xdat.om.ArcProperty>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProperty> getArcPropertysByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProperty> al = new ArrayList<org.nrg.xdat.om.ArcProperty>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ArcProperty> getArcPropertysByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ArcProperty> al = new ArrayList<org.nrg.xdat.om.ArcProperty>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArcProperty getArcPropertysByArcPropertyId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("arc:property/arc_property_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ArcProperty) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalog.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalog.java
deleted file mode 100644
index a757e834..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalog.java
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoCatCatalog extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.CatCatalogI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoCatCatalog.class);
-	public static String SCHEMA_ELEMENT_NAME="cat:catalog";
-
-	public AutoCatCatalog(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoCatCatalog(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoCatCatalog(UserI user)
-	 **/
-	public AutoCatCatalog(){}
-
-	public AutoCatCatalog(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "cat:catalog";
-	}
-	 private ArrayList<org.nrg.xdat.om.CatCatalogMetafield> _Metafields_metafield =null;
-
-	/**
-	 * metaFields/metaField
-	 * @return Returns an List of org.nrg.xdat.om.CatCatalogMetafield
-	 */
-	public <A extends org.nrg.xdat.model.CatCatalogMetafieldI> List<A> getMetafields_metafield() {
-		try{
-			if (_Metafields_metafield==null){
-				_Metafields_metafield=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("metaFields/metaField"));
-			}
-			return (List<A>) _Metafields_metafield;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.CatCatalogMetafield>();}
-	}
-
-	/**
-	 * Sets the value for metaFields/metaField.
-	 * @param v Value to Set.
-	 */
-	public void setMetafields_metafield(ItemI v) throws Exception{
-		_Metafields_metafield =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/metaFields/metaField",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/metaFields/metaField",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * metaFields/metaField
-	 * Adds org.nrg.xdat.model.CatCatalogMetafieldI
-	 */
-	public <A extends org.nrg.xdat.model.CatCatalogMetafieldI> void addMetafields_metafield(A item) throws Exception{
-	setMetafields_metafield((ItemI)item);
-	}
-
-	/**
-	 * Removes the metaFields/metaField of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeMetafields_metafield(int index) throws java.lang.IndexOutOfBoundsException {
-		_Metafields_metafield =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/metaFields/metaField",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.CatCatalogTag> _Tags_tag =null;
-
-	/**
-	 * tags/tag
-	 * @return Returns an List of org.nrg.xdat.om.CatCatalogTag
-	 */
-	public <A extends org.nrg.xdat.model.CatCatalogTagI> List<A> getTags_tag() {
-		try{
-			if (_Tags_tag==null){
-				_Tags_tag=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("tags/tag"));
-			}
-			return (List<A>) _Tags_tag;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.CatCatalogTag>();}
-	}
-
-	/**
-	 * Sets the value for tags/tag.
-	 * @param v Value to Set.
-	 */
-	public void setTags_tag(ItemI v) throws Exception{
-		_Tags_tag =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/tags/tag",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/tags/tag",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * tags/tag
-	 * Adds org.nrg.xdat.model.CatCatalogTagI
-	 */
-	public <A extends org.nrg.xdat.model.CatCatalogTagI> void addTags_tag(A item) throws Exception{
-	setTags_tag((ItemI)item);
-	}
-
-	/**
-	 * Removes the tags/tag of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeTags_tag(int index) throws java.lang.IndexOutOfBoundsException {
-		_Tags_tag =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/tags/tag",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.CatCatalog> _Sets_entryset =null;
-
-	/**
-	 * sets/entrySet
-	 * @return Returns an List of org.nrg.xdat.om.CatCatalog
-	 */
-	public <A extends org.nrg.xdat.model.CatCatalogI> List<A> getSets_entryset() {
-		try{
-			if (_Sets_entryset==null){
-				_Sets_entryset=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("sets/entrySet"));
-			}
-			return (List<A>) _Sets_entryset;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.CatCatalog>();}
-	}
-
-	/**
-	 * Sets the value for sets/entrySet.
-	 * @param v Value to Set.
-	 */
-	public void setSets_entryset(ItemI v) throws Exception{
-		_Sets_entryset =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sets/entrySet",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sets/entrySet",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * sets/entrySet
-	 * Adds org.nrg.xdat.model.CatCatalogI
-	 */
-	public <A extends org.nrg.xdat.model.CatCatalogI> void addSets_entryset(A item) throws Exception{
-	setSets_entryset((ItemI)item);
-	}
-
-	/**
-	 * Removes the sets/entrySet of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSets_entryset(int index) throws java.lang.IndexOutOfBoundsException {
-		_Sets_entryset =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/sets/entrySet",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.CatEntry> _Entries_entry =null;
-
-	/**
-	 * entries/entry
-	 * @return Returns an List of org.nrg.xdat.om.CatEntry
-	 */
-	public <A extends org.nrg.xdat.model.CatEntryI> List<A> getEntries_entry() {
-		try{
-			if (_Entries_entry==null){
-				_Entries_entry=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("entries/entry"));
-			}
-			return (List<A>) _Entries_entry;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.CatEntry>();}
-	}
-
-	/**
-	 * Sets the value for entries/entry.
-	 * @param v Value to Set.
-	 */
-	public void setEntries_entry(ItemI v) throws Exception{
-		_Entries_entry =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/entries/entry",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/entries/entry",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * entries/entry
-	 * Adds org.nrg.xdat.model.CatEntryI
-	 */
-	public <A extends org.nrg.xdat.model.CatEntryI> void addEntries_entry(A item) throws Exception{
-	setEntries_entry((ItemI)item);
-	}
-
-	/**
-	 * Removes the entries/entry of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeEntries_entry(int index) throws java.lang.IndexOutOfBoundsException {
-		_Entries_entry =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/entries/entry",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _CatCatalogId=null;
-
-	/**
-	 * @return Returns the cat_catalog_id.
-	 */
-	public Integer getCatCatalogId() {
-		try{
-			if (_CatCatalogId==null){
-				_CatCatalogId=getIntegerProperty("cat_catalog_id");
-				return _CatCatalogId;
-			}else {
-				return _CatCatalogId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cat_catalog_id.
-	 * @param v Value to Set.
-	 */
-	public void setCatCatalogId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cat_catalog_id",v);
-		_CatCatalogId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalog> getAllCatCatalogs(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalog> al = new ArrayList<org.nrg.xdat.om.CatCatalog>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalog> getCatCatalogsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalog> al = new ArrayList<org.nrg.xdat.om.CatCatalog>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalog> getCatCatalogsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalog> al = new ArrayList<org.nrg.xdat.om.CatCatalog>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static CatCatalog getCatCatalogsByCatCatalogId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("cat:catalog/cat_catalog_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (CatCatalog) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //metaFields/metaField
-	        for(org.nrg.xdat.model.CatCatalogMetafieldI childMetafields_metafield : this.getMetafields_metafield()){
-	            if (childMetafields_metafield!=null){
-	              for(ResourceFile rf: ((CatCatalogMetafield)childMetafields_metafield).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("metaFields/metaField[" + ((CatCatalogMetafield)childMetafields_metafield).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("metaFields/metaField/" + ((CatCatalogMetafield)childMetafields_metafield).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //tags/tag
-	        for(org.nrg.xdat.model.CatCatalogTagI childTags_tag : this.getTags_tag()){
-	            if (childTags_tag!=null){
-	              for(ResourceFile rf: ((CatCatalogTag)childTags_tag).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("tags/tag[" + ((CatCatalogTag)childTags_tag).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("tags/tag/" + ((CatCatalogTag)childTags_tag).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //sets/entrySet
-	        for(org.nrg.xdat.model.CatCatalogI childSets_entryset : this.getSets_entryset()){
-	            if (childSets_entryset!=null){
-	              for(ResourceFile rf: ((CatCatalog)childSets_entryset).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("sets/entrySet[" + ((CatCatalog)childSets_entryset).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("sets/entrySet/" + ((CatCatalog)childSets_entryset).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //entries/entry
-	        for(org.nrg.xdat.model.CatEntryI childEntries_entry : this.getEntries_entry()){
-	            if (childEntries_entry!=null){
-	              for(ResourceFile rf: ((CatEntry)childEntries_entry).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("entries/entry[" + ((CatEntry)childEntries_entry).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("entries/entry/" + ((CatEntry)childEntries_entry).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalogMetafield.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalogMetafield.java
deleted file mode 100644
index b8e88111..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalogMetafield.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoCatCatalogMetafield extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.CatCatalogMetafieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoCatCatalogMetafield.class);
-	public static String SCHEMA_ELEMENT_NAME="cat:catalog_metaField";
-
-	public AutoCatCatalogMetafield(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoCatCatalogMetafield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoCatCatalogMetafield(UserI user)
-	 **/
-	public AutoCatCatalogMetafield(){}
-
-	public AutoCatCatalogMetafield(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "cat:catalog_metaField";
-	}
-
-	//FIELD
-
-	private String _Metafield=null;
-
-	/**
-	 * @return Returns the metaField.
-	 */
-	public String getMetafield(){
-		try{
-			if (_Metafield==null){
-				_Metafield=getStringProperty("metaField");
-				return _Metafield;
-			}else {
-				return _Metafield;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for metaField.
-	 * @param v Value to Set.
-	 */
-	public void setMetafield(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/metaField",v);
-		_Metafield=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _CatCatalogMetafieldId=null;
-
-	/**
-	 * @return Returns the cat_catalog_metaField_id.
-	 */
-	public Integer getCatCatalogMetafieldId() {
-		try{
-			if (_CatCatalogMetafieldId==null){
-				_CatCatalogMetafieldId=getIntegerProperty("cat_catalog_metaField_id");
-				return _CatCatalogMetafieldId;
-			}else {
-				return _CatCatalogMetafieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cat_catalog_metaField_id.
-	 * @param v Value to Set.
-	 */
-	public void setCatCatalogMetafieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cat_catalog_metaField_id",v);
-		_CatCatalogMetafieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalogMetafield> getAllCatCatalogMetafields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalogMetafield> al = new ArrayList<org.nrg.xdat.om.CatCatalogMetafield>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalogMetafield> getCatCatalogMetafieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalogMetafield> al = new ArrayList<org.nrg.xdat.om.CatCatalogMetafield>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalogMetafield> getCatCatalogMetafieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalogMetafield> al = new ArrayList<org.nrg.xdat.om.CatCatalogMetafield>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static CatCatalogMetafield getCatCatalogMetafieldsByCatCatalogMetafieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("cat:catalog_metaField/cat_catalog_metaField_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (CatCatalogMetafield) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalogTag.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalogTag.java
deleted file mode 100644
index 4813bae4..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatCatalogTag.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoCatCatalogTag extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.CatCatalogTagI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoCatCatalogTag.class);
-	public static String SCHEMA_ELEMENT_NAME="cat:catalog_tag";
-
-	public AutoCatCatalogTag(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoCatCatalogTag(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoCatCatalogTag(UserI user)
-	 **/
-	public AutoCatCatalogTag(){}
-
-	public AutoCatCatalogTag(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "cat:catalog_tag";
-	}
-
-	//FIELD
-
-	private String _Tag=null;
-
-	/**
-	 * @return Returns the tag.
-	 */
-	public String getTag(){
-		try{
-			if (_Tag==null){
-				_Tag=getStringProperty("tag");
-				return _Tag;
-			}else {
-				return _Tag;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tag.
-	 * @param v Value to Set.
-	 */
-	public void setTag(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tag",v);
-		_Tag=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _CatCatalogTagId=null;
-
-	/**
-	 * @return Returns the cat_catalog_tag_id.
-	 */
-	public Integer getCatCatalogTagId() {
-		try{
-			if (_CatCatalogTagId==null){
-				_CatCatalogTagId=getIntegerProperty("cat_catalog_tag_id");
-				return _CatCatalogTagId;
-			}else {
-				return _CatCatalogTagId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cat_catalog_tag_id.
-	 * @param v Value to Set.
-	 */
-	public void setCatCatalogTagId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cat_catalog_tag_id",v);
-		_CatCatalogTagId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalogTag> getAllCatCatalogTags(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalogTag> al = new ArrayList<org.nrg.xdat.om.CatCatalogTag>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalogTag> getCatCatalogTagsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalogTag> al = new ArrayList<org.nrg.xdat.om.CatCatalogTag>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatCatalogTag> getCatCatalogTagsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatCatalogTag> al = new ArrayList<org.nrg.xdat.om.CatCatalogTag>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static CatCatalogTag getCatCatalogTagsByCatCatalogTagId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("cat:catalog_tag/cat_catalog_tag_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (CatCatalogTag) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatDcmcatalog.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoCatDcmcatalog.java
deleted file mode 100644
index d26c91b1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatDcmcatalog.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoCatDcmcatalog extends CatCatalog implements org.nrg.xdat.model.CatDcmcatalogI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoCatDcmcatalog.class);
-	public static String SCHEMA_ELEMENT_NAME="cat:dcmCatalog";
-
-	public AutoCatDcmcatalog(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoCatDcmcatalog(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoCatDcmcatalog(UserI user)
-	 **/
-	public AutoCatDcmcatalog(){}
-
-	public AutoCatDcmcatalog(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "cat:dcmCatalog";
-	}
-	 private org.nrg.xdat.om.CatCatalog _Catalog =null;
-
-	/**
-	 * catalog
-	 * @return org.nrg.xdat.om.CatCatalog
-	 */
-	public org.nrg.xdat.om.CatCatalog getCatalog() {
-		try{
-			if (_Catalog==null){
-				_Catalog=((CatCatalog)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("catalog")));
-				return _Catalog;
-			}else {
-				return _Catalog;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for catalog.
-	 * @param v Value to Set.
-	 */
-	public void setCatalog(ItemI v) throws Exception{
-		_Catalog =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/catalog",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/catalog",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * catalog
-	 * set org.nrg.xdat.model.CatCatalogI
-	 */
-	public <A extends org.nrg.xdat.model.CatCatalogI> void setCatalog(A item) throws Exception{
-	setCatalog((ItemI)item);
-	}
-
-	/**
-	 * Removes the catalog.
-	 * */
-	public void removeCatalog() {
-		_Catalog =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/catalog",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_x=null;
-
-	/**
-	 * @return Returns the dimensions/x.
-	 */
-	public Integer getDimensions_x() {
-		try{
-			if (_Dimensions_x==null){
-				_Dimensions_x=getIntegerProperty("dimensions/x");
-				return _Dimensions_x;
-			}else {
-				return _Dimensions_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/x.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/x",v);
-		_Dimensions_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_y=null;
-
-	/**
-	 * @return Returns the dimensions/y.
-	 */
-	public Integer getDimensions_y() {
-		try{
-			if (_Dimensions_y==null){
-				_Dimensions_y=getIntegerProperty("dimensions/y");
-				return _Dimensions_y;
-			}else {
-				return _Dimensions_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/y.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/y",v);
-		_Dimensions_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_z=null;
-
-	/**
-	 * @return Returns the dimensions/z.
-	 */
-	public Integer getDimensions_z() {
-		try{
-			if (_Dimensions_z==null){
-				_Dimensions_z=getIntegerProperty("dimensions/z");
-				return _Dimensions_z;
-			}else {
-				return _Dimensions_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/z.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_z(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/z",v);
-		_Dimensions_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_volumes=null;
-
-	/**
-	 * @return Returns the dimensions/volumes.
-	 */
-	public Integer getDimensions_volumes() {
-		try{
-			if (_Dimensions_volumes==null){
-				_Dimensions_volumes=getIntegerProperty("dimensions/volumes");
-				return _Dimensions_volumes;
-			}else {
-				return _Dimensions_volumes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/volumes.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_volumes(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/volumes",v);
-		_Dimensions_volumes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_x=null;
-
-	/**
-	 * @return Returns the voxelRes/x.
-	 */
-	public Double getVoxelres_x() {
-		try{
-			if (_Voxelres_x==null){
-				_Voxelres_x=getDoubleProperty("voxelRes/x");
-				return _Voxelres_x;
-			}else {
-				return _Voxelres_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/x.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/x",v);
-		_Voxelres_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_y=null;
-
-	/**
-	 * @return Returns the voxelRes/y.
-	 */
-	public Double getVoxelres_y() {
-		try{
-			if (_Voxelres_y==null){
-				_Voxelres_y=getDoubleProperty("voxelRes/y");
-				return _Voxelres_y;
-			}else {
-				return _Voxelres_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/y.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/y",v);
-		_Voxelres_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_z=null;
-
-	/**
-	 * @return Returns the voxelRes/z.
-	 */
-	public Double getVoxelres_z() {
-		try{
-			if (_Voxelres_z==null){
-				_Voxelres_z=getDoubleProperty("voxelRes/z");
-				return _Voxelres_z;
-			}else {
-				return _Voxelres_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/z.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/z",v);
-		_Voxelres_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Voxelres_units=null;
-
-	/**
-	 * @return Returns the voxelRes/units.
-	 */
-	public String getVoxelres_units(){
-		try{
-			if (_Voxelres_units==null){
-				_Voxelres_units=getStringProperty("voxelRes/units");
-				return _Voxelres_units;
-			}else {
-				return _Voxelres_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/units.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/units",v);
-		_Voxelres_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Orientation=null;
-
-	/**
-	 * @return Returns the orientation.
-	 */
-	public String getOrientation(){
-		try{
-			if (_Orientation==null){
-				_Orientation=getStringProperty("orientation");
-				return _Orientation;
-			}else {
-				return _Orientation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for orientation.
-	 * @param v Value to Set.
-	 */
-	public void setOrientation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/orientation",v);
-		_Orientation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Uid=null;
-
-	/**
-	 * @return Returns the UID.
-	 */
-	public String getUid(){
-		try{
-			if (_Uid==null){
-				_Uid=getStringProperty("UID");
-				return _Uid;
-			}else {
-				return _Uid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for UID.
-	 * @param v Value to Set.
-	 */
-	public void setUid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/UID",v);
-		_Uid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatDcmcatalog> getAllCatDcmcatalogs(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatDcmcatalog> al = new ArrayList<org.nrg.xdat.om.CatDcmcatalog>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatDcmcatalog> getCatDcmcatalogsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatDcmcatalog> al = new ArrayList<org.nrg.xdat.om.CatDcmcatalog>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatDcmcatalog> getCatDcmcatalogsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatDcmcatalog> al = new ArrayList<org.nrg.xdat.om.CatDcmcatalog>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static CatDcmcatalog getCatDcmcatalogsByCatCatalogId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("cat:dcmCatalog/cat_catalog_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (CatDcmcatalog) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //catalog
-	        CatCatalog childCatalog = (CatCatalog)this.getCatalog();
-	            if (childCatalog!=null){
-	              for(ResourceFile rf: ((CatCatalog)childCatalog).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("catalog[" + ((CatCatalog)childCatalog).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("catalog/" + ((CatCatalog)childCatalog).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatDcmentry.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoCatDcmentry.java
deleted file mode 100644
index 83337095..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatDcmentry.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoCatDcmentry extends CatEntry implements org.nrg.xdat.model.CatDcmentryI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoCatDcmentry.class);
-	public static String SCHEMA_ELEMENT_NAME="cat:dcmEntry";
-
-	public AutoCatDcmentry(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoCatDcmentry(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoCatDcmentry(UserI user)
-	 **/
-	public AutoCatDcmentry(){}
-
-	public AutoCatDcmentry(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "cat:dcmEntry";
-	}
-	 private org.nrg.xdat.om.CatEntry _Entry =null;
-
-	/**
-	 * entry
-	 * @return org.nrg.xdat.om.CatEntry
-	 */
-	public org.nrg.xdat.om.CatEntry getEntry() {
-		try{
-			if (_Entry==null){
-				_Entry=((CatEntry)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("entry")));
-				return _Entry;
-			}else {
-				return _Entry;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for entry.
-	 * @param v Value to Set.
-	 */
-	public void setEntry(ItemI v) throws Exception{
-		_Entry =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/entry",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/entry",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * entry
-	 * set org.nrg.xdat.model.CatEntryI
-	 */
-	public <A extends org.nrg.xdat.model.CatEntryI> void setEntry(A item) throws Exception{
-	setEntry((ItemI)item);
-	}
-
-	/**
-	 * Removes the entry.
-	 * */
-	public void removeEntry() {
-		_Entry =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/entry",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Uid=null;
-
-	/**
-	 * @return Returns the UID.
-	 */
-	public String getUid(){
-		try{
-			if (_Uid==null){
-				_Uid=getStringProperty("UID");
-				return _Uid;
-			}else {
-				return _Uid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for UID.
-	 * @param v Value to Set.
-	 */
-	public void setUid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/UID",v);
-		_Uid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Instancenumber=null;
-
-	/**
-	 * @return Returns the instanceNumber.
-	 */
-	public Integer getInstancenumber() {
-		try{
-			if (_Instancenumber==null){
-				_Instancenumber=getIntegerProperty("instanceNumber");
-				return _Instancenumber;
-			}else {
-				return _Instancenumber;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for instanceNumber.
-	 * @param v Value to Set.
-	 */
-	public void setInstancenumber(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/instanceNumber",v);
-		_Instancenumber=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatDcmentry> getAllCatDcmentrys(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatDcmentry> al = new ArrayList<org.nrg.xdat.om.CatDcmentry>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatDcmentry> getCatDcmentrysByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatDcmentry> al = new ArrayList<org.nrg.xdat.om.CatDcmentry>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatDcmentry> getCatDcmentrysByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatDcmentry> al = new ArrayList<org.nrg.xdat.om.CatDcmentry>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static CatDcmentry getCatDcmentrysByCatEntryId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("cat:dcmEntry/cat_entry_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (CatDcmentry) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //entry
-	        CatEntry childEntry = (CatEntry)this.getEntry();
-	            if (childEntry!=null){
-	              for(ResourceFile rf: ((CatEntry)childEntry).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("entry[" + ((CatEntry)childEntry).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("entry/" + ((CatEntry)childEntry).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntry.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntry.java
deleted file mode 100644
index 2752f641..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntry.java
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoCatEntry extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.CatEntryI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoCatEntry.class);
-	public static String SCHEMA_ELEMENT_NAME="cat:entry";
-
-	public AutoCatEntry(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoCatEntry(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoCatEntry(UserI user)
-	 **/
-	public AutoCatEntry(){}
-
-	public AutoCatEntry(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "cat:entry";
-	}
-	 private ArrayList<org.nrg.xdat.om.CatEntryMetafield> _Metafields_metafield =null;
-
-	/**
-	 * metaFields/metaField
-	 * @return Returns an List of org.nrg.xdat.om.CatEntryMetafield
-	 */
-	public <A extends org.nrg.xdat.model.CatEntryMetafieldI> List<A> getMetafields_metafield() {
-		try{
-			if (_Metafields_metafield==null){
-				_Metafields_metafield=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("metaFields/metaField"));
-			}
-			return (List<A>) _Metafields_metafield;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.CatEntryMetafield>();}
-	}
-
-	/**
-	 * Sets the value for metaFields/metaField.
-	 * @param v Value to Set.
-	 */
-	public void setMetafields_metafield(ItemI v) throws Exception{
-		_Metafields_metafield =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/metaFields/metaField",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/metaFields/metaField",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * metaFields/metaField
-	 * Adds org.nrg.xdat.model.CatEntryMetafieldI
-	 */
-	public <A extends org.nrg.xdat.model.CatEntryMetafieldI> void addMetafields_metafield(A item) throws Exception{
-	setMetafields_metafield((ItemI)item);
-	}
-
-	/**
-	 * Removes the metaFields/metaField of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeMetafields_metafield(int index) throws java.lang.IndexOutOfBoundsException {
-		_Metafields_metafield =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/metaFields/metaField",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.CatEntryTag> _Tags_tag =null;
-
-	/**
-	 * tags/tag
-	 * @return Returns an List of org.nrg.xdat.om.CatEntryTag
-	 */
-	public <A extends org.nrg.xdat.model.CatEntryTagI> List<A> getTags_tag() {
-		try{
-			if (_Tags_tag==null){
-				_Tags_tag=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("tags/tag"));
-			}
-			return (List<A>) _Tags_tag;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.CatEntryTag>();}
-	}
-
-	/**
-	 * Sets the value for tags/tag.
-	 * @param v Value to Set.
-	 */
-	public void setTags_tag(ItemI v) throws Exception{
-		_Tags_tag =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/tags/tag",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/tags/tag",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * tags/tag
-	 * Adds org.nrg.xdat.model.CatEntryTagI
-	 */
-	public <A extends org.nrg.xdat.model.CatEntryTagI> void addTags_tag(A item) throws Exception{
-	setTags_tag((ItemI)item);
-	}
-
-	/**
-	 * Removes the tags/tag of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeTags_tag(int index) throws java.lang.IndexOutOfBoundsException {
-		_Tags_tag =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/tags/tag",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Uri=null;
-
-	/**
-	 * @return Returns the URI.
-	 */
-	public String getUri(){
-		try{
-			if (_Uri==null){
-				_Uri=getStringProperty("URI");
-				return _Uri;
-			}else {
-				return _Uri;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for URI.
-	 * @param v Value to Set.
-	 */
-	public void setUri(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/URI",v);
-		_Uri=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Format=null;
-
-	/**
-	 * @return Returns the format.
-	 */
-	public String getFormat(){
-		try{
-			if (_Format==null){
-				_Format=getStringProperty("format");
-				return _Format;
-			}else {
-				return _Format;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for format.
-	 * @param v Value to Set.
-	 */
-	public void setFormat(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/format",v);
-		_Format=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Content=null;
-
-	/**
-	 * @return Returns the content.
-	 */
-	public String getContent(){
-		try{
-			if (_Content==null){
-				_Content=getStringProperty("content");
-				return _Content;
-			}else {
-				return _Content;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for content.
-	 * @param v Value to Set.
-	 */
-	public void setContent(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/content",v);
-		_Content=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Cachepath=null;
-
-	/**
-	 * @return Returns the cachePath.
-	 */
-	public String getCachepath(){
-		try{
-			if (_Cachepath==null){
-				_Cachepath=getStringProperty("cachePath");
-				return _Cachepath;
-			}else {
-				return _Cachepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cachePath.
-	 * @param v Value to Set.
-	 */
-	public void setCachepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cachePath",v);
-		_Cachepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Createdtime=null;
-
-	/**
-	 * @return Returns the createdTime.
-	 */
-	public Object getCreatedtime(){
-		try{
-			if (_Createdtime==null){
-				_Createdtime=getProperty("createdTime");
-				return _Createdtime;
-			}else {
-				return _Createdtime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for createdTime.
-	 * @param v Value to Set.
-	 */
-	public void setCreatedtime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/createdTime",v);
-		_Createdtime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Createdby=null;
-
-	/**
-	 * @return Returns the createdBy.
-	 */
-	public String getCreatedby(){
-		try{
-			if (_Createdby==null){
-				_Createdby=getStringProperty("createdBy");
-				return _Createdby;
-			}else {
-				return _Createdby;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for createdBy.
-	 * @param v Value to Set.
-	 */
-	public void setCreatedby(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/createdBy",v);
-		_Createdby=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Createdeventid=null;
-
-	/**
-	 * @return Returns the createdEventId.
-	 */
-	public Integer getCreatedeventid() {
-		try{
-			if (_Createdeventid==null){
-				_Createdeventid=getIntegerProperty("createdEventId");
-				return _Createdeventid;
-			}else {
-				return _Createdeventid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for createdEventId.
-	 * @param v Value to Set.
-	 */
-	public void setCreatedeventid(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/createdEventId",v);
-		_Createdeventid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Modifiedtime=null;
-
-	/**
-	 * @return Returns the modifiedTime.
-	 */
-	public Object getModifiedtime(){
-		try{
-			if (_Modifiedtime==null){
-				_Modifiedtime=getProperty("modifiedTime");
-				return _Modifiedtime;
-			}else {
-				return _Modifiedtime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for modifiedTime.
-	 * @param v Value to Set.
-	 */
-	public void setModifiedtime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/modifiedTime",v);
-		_Modifiedtime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Modifiedby=null;
-
-	/**
-	 * @return Returns the modifiedBy.
-	 */
-	public String getModifiedby(){
-		try{
-			if (_Modifiedby==null){
-				_Modifiedby=getStringProperty("modifiedBy");
-				return _Modifiedby;
-			}else {
-				return _Modifiedby;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for modifiedBy.
-	 * @param v Value to Set.
-	 */
-	public void setModifiedby(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/modifiedBy",v);
-		_Modifiedby=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Modifiedeventid=null;
-
-	/**
-	 * @return Returns the modifiedEventId.
-	 */
-	public Integer getModifiedeventid() {
-		try{
-			if (_Modifiedeventid==null){
-				_Modifiedeventid=getIntegerProperty("modifiedEventId");
-				return _Modifiedeventid;
-			}else {
-				return _Modifiedeventid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for modifiedEventId.
-	 * @param v Value to Set.
-	 */
-	public void setModifiedeventid(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/modifiedEventId",v);
-		_Modifiedeventid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Digest=null;
-
-	/**
-	 * @return Returns the digest.
-	 */
-	public String getDigest(){
-		try{
-			if (_Digest==null){
-				_Digest=getStringProperty("digest");
-				return _Digest;
-			}else {
-				return _Digest;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for digest.
-	 * @param v Value to Set.
-	 */
-	public void setDigest(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/digest",v);
-		_Digest=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _CatEntryId=null;
-
-	/**
-	 * @return Returns the cat_entry_id.
-	 */
-	public Integer getCatEntryId() {
-		try{
-			if (_CatEntryId==null){
-				_CatEntryId=getIntegerProperty("cat_entry_id");
-				return _CatEntryId;
-			}else {
-				return _CatEntryId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cat_entry_id.
-	 * @param v Value to Set.
-	 */
-	public void setCatEntryId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cat_entry_id",v);
-		_CatEntryId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntry> getAllCatEntrys(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntry> al = new ArrayList<org.nrg.xdat.om.CatEntry>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntry> getCatEntrysByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntry> al = new ArrayList<org.nrg.xdat.om.CatEntry>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntry> getCatEntrysByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntry> al = new ArrayList<org.nrg.xdat.om.CatEntry>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static CatEntry getCatEntrysByCatEntryId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("cat:entry/cat_entry_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (CatEntry) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //metaFields/metaField
-	        for(org.nrg.xdat.model.CatEntryMetafieldI childMetafields_metafield : this.getMetafields_metafield()){
-	            if (childMetafields_metafield!=null){
-	              for(ResourceFile rf: ((CatEntryMetafield)childMetafields_metafield).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("metaFields/metaField[" + ((CatEntryMetafield)childMetafields_metafield).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("metaFields/metaField/" + ((CatEntryMetafield)childMetafields_metafield).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //tags/tag
-	        for(org.nrg.xdat.model.CatEntryTagI childTags_tag : this.getTags_tag()){
-	            if (childTags_tag!=null){
-	              for(ResourceFile rf: ((CatEntryTag)childTags_tag).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("tags/tag[" + ((CatEntryTag)childTags_tag).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("tags/tag/" + ((CatEntryTag)childTags_tag).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntryMetafield.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntryMetafield.java
deleted file mode 100644
index 8c1c49c6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntryMetafield.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoCatEntryMetafield extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.CatEntryMetafieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoCatEntryMetafield.class);
-	public static String SCHEMA_ELEMENT_NAME="cat:entry_metaField";
-
-	public AutoCatEntryMetafield(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoCatEntryMetafield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoCatEntryMetafield(UserI user)
-	 **/
-	public AutoCatEntryMetafield(){}
-
-	public AutoCatEntryMetafield(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "cat:entry_metaField";
-	}
-
-	//FIELD
-
-	private String _Metafield=null;
-
-	/**
-	 * @return Returns the metaField.
-	 */
-	public String getMetafield(){
-		try{
-			if (_Metafield==null){
-				_Metafield=getStringProperty("metaField");
-				return _Metafield;
-			}else {
-				return _Metafield;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for metaField.
-	 * @param v Value to Set.
-	 */
-	public void setMetafield(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/metaField",v);
-		_Metafield=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _CatEntryMetafieldId=null;
-
-	/**
-	 * @return Returns the cat_entry_metaField_id.
-	 */
-	public Integer getCatEntryMetafieldId() {
-		try{
-			if (_CatEntryMetafieldId==null){
-				_CatEntryMetafieldId=getIntegerProperty("cat_entry_metaField_id");
-				return _CatEntryMetafieldId;
-			}else {
-				return _CatEntryMetafieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cat_entry_metaField_id.
-	 * @param v Value to Set.
-	 */
-	public void setCatEntryMetafieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cat_entry_metaField_id",v);
-		_CatEntryMetafieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntryMetafield> getAllCatEntryMetafields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntryMetafield> al = new ArrayList<org.nrg.xdat.om.CatEntryMetafield>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntryMetafield> getCatEntryMetafieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntryMetafield> al = new ArrayList<org.nrg.xdat.om.CatEntryMetafield>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntryMetafield> getCatEntryMetafieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntryMetafield> al = new ArrayList<org.nrg.xdat.om.CatEntryMetafield>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static CatEntryMetafield getCatEntryMetafieldsByCatEntryMetafieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("cat:entry_metaField/cat_entry_metaField_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (CatEntryMetafield) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntryTag.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntryTag.java
deleted file mode 100644
index 22388ce6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoCatEntryTag.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoCatEntryTag extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.CatEntryTagI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoCatEntryTag.class);
-	public static String SCHEMA_ELEMENT_NAME="cat:entry_tag";
-
-	public AutoCatEntryTag(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoCatEntryTag(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoCatEntryTag(UserI user)
-	 **/
-	public AutoCatEntryTag(){}
-
-	public AutoCatEntryTag(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "cat:entry_tag";
-	}
-
-	//FIELD
-
-	private String _Tag=null;
-
-	/**
-	 * @return Returns the tag.
-	 */
-	public String getTag(){
-		try{
-			if (_Tag==null){
-				_Tag=getStringProperty("tag");
-				return _Tag;
-			}else {
-				return _Tag;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tag.
-	 * @param v Value to Set.
-	 */
-	public void setTag(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tag",v);
-		_Tag=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _CatEntryTagId=null;
-
-	/**
-	 * @return Returns the cat_entry_tag_id.
-	 */
-	public Integer getCatEntryTagId() {
-		try{
-			if (_CatEntryTagId==null){
-				_CatEntryTagId=getIntegerProperty("cat_entry_tag_id");
-				return _CatEntryTagId;
-			}else {
-				return _CatEntryTagId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cat_entry_tag_id.
-	 * @param v Value to Set.
-	 */
-	public void setCatEntryTagId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cat_entry_tag_id",v);
-		_CatEntryTagId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntryTag> getAllCatEntryTags(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntryTag> al = new ArrayList<org.nrg.xdat.om.CatEntryTag>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntryTag> getCatEntryTagsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntryTag> al = new ArrayList<org.nrg.xdat.om.CatEntryTag>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.CatEntryTag> getCatEntryTagsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.CatEntryTag> al = new ArrayList<org.nrg.xdat.om.CatEntryTag>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static CatEntryTag getCatEntryTagsByCatEntryTagId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("cat:entry_tag/cat_entry_tag_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (CatEntryTag) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetails.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetails.java
deleted file mode 100644
index 675c2bf5..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetails.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoPipePipelinedetails extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.PipePipelinedetailsI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoPipePipelinedetails.class);
-	public static String SCHEMA_ELEMENT_NAME="pipe:pipelineDetails";
-
-	public AutoPipePipelinedetails(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoPipePipelinedetails(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoPipePipelinedetails(UserI user)
-	 **/
-	public AutoPipePipelinedetails(){}
-
-	public AutoPipePipelinedetails(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "pipe:pipelineDetails";
-	}
-
-	//FIELD
-
-	private String _Path=null;
-
-	/**
-	 * @return Returns the path.
-	 */
-	public String getPath(){
-		try{
-			if (_Path==null){
-				_Path=getStringProperty("path");
-				return _Path;
-			}else {
-				return _Path;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for path.
-	 * @param v Value to Set.
-	 */
-	public void setPath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/path",v);
-		_Path=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement> _Generateselements_element =null;
-
-	/**
-	 * generatesElements/element
-	 * @return Returns an List of org.nrg.xdat.om.PipePipelinedetailsElement
-	 */
-	public <A extends org.nrg.xdat.model.PipePipelinedetailsElementI> List<A> getGenerateselements_element() {
-		try{
-			if (_Generateselements_element==null){
-				_Generateselements_element=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("generatesElements/element"));
-			}
-			return (List<A>) _Generateselements_element;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement>();}
-	}
-
-	/**
-	 * Sets the value for generatesElements/element.
-	 * @param v Value to Set.
-	 */
-	public void setGenerateselements_element(ItemI v) throws Exception{
-		_Generateselements_element =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/generatesElements/element",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/generatesElements/element",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * generatesElements/element
-	 * Adds org.nrg.xdat.model.PipePipelinedetailsElementI
-	 */
-	public <A extends org.nrg.xdat.model.PipePipelinedetailsElementI> void addGenerateselements_element(A item) throws Exception{
-	setGenerateselements_element((ItemI)item);
-	}
-
-	/**
-	 * Removes the generatesElements/element of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeGenerateselements_element(int index) throws java.lang.IndexOutOfBoundsException {
-		_Generateselements_element =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/generatesElements/element",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Customwebpage=null;
-
-	/**
-	 * @return Returns the customwebpage.
-	 */
-	public String getCustomwebpage(){
-		try{
-			if (_Customwebpage==null){
-				_Customwebpage=getStringProperty("customwebpage");
-				return _Customwebpage;
-			}else {
-				return _Customwebpage;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for customwebpage.
-	 * @param v Value to Set.
-	 */
-	public void setCustomwebpage(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/customwebpage",v);
-		_Customwebpage=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter> _Parameters_parameter =null;
-
-	/**
-	 * parameters/parameter
-	 * @return Returns an List of org.nrg.xdat.om.PipePipelinedetailsParameter
-	 */
-	public <A extends org.nrg.xdat.model.PipePipelinedetailsParameterI> List<A> getParameters_parameter() {
-		try{
-			if (_Parameters_parameter==null){
-				_Parameters_parameter=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/parameter"));
-			}
-			return (List<A>) _Parameters_parameter;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter>();}
-	}
-
-	/**
-	 * Sets the value for parameters/parameter.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_parameter(ItemI v) throws Exception{
-		_Parameters_parameter =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/parameter
-	 * Adds org.nrg.xdat.model.PipePipelinedetailsParameterI
-	 */
-	public <A extends org.nrg.xdat.model.PipePipelinedetailsParameterI> void addParameters_parameter(A item) throws Exception{
-	setParameters_parameter((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/parameter of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_parameter(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_parameter =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Appliesto=null;
-
-	/**
-	 * @return Returns the appliesTo.
-	 */
-	public String getAppliesto(){
-		try{
-			if (_Appliesto==null){
-				_Appliesto=getStringProperty("appliesTo");
-				return _Appliesto;
-			}else {
-				return _Appliesto;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for appliesTo.
-	 * @param v Value to Set.
-	 */
-	public void setAppliesto(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/appliesTo",v);
-		_Appliesto=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetails> getAllPipePipelinedetailss(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetails> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetails>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetails> getPipePipelinedetailssByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetails> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetails>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetails> getPipePipelinedetailssByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetails> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetails>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static PipePipelinedetails getPipePipelinedetailssByPath(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("pipe:pipelineDetails/path",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (PipePipelinedetails) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //generatesElements/element
-	        for(org.nrg.xdat.model.PipePipelinedetailsElementI childGenerateselements_element : this.getGenerateselements_element()){
-	            if (childGenerateselements_element!=null){
-	              for(ResourceFile rf: ((PipePipelinedetailsElement)childGenerateselements_element).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("generatesElements/element[" + ((PipePipelinedetailsElement)childGenerateselements_element).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("generatesElements/element/" + ((PipePipelinedetailsElement)childGenerateselements_element).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/parameter
-	        for(org.nrg.xdat.model.PipePipelinedetailsParameterI childParameters_parameter : this.getParameters_parameter()){
-	            if (childParameters_parameter!=null){
-	              for(ResourceFile rf: ((PipePipelinedetailsParameter)childParameters_parameter).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/parameter[" + ((PipePipelinedetailsParameter)childParameters_parameter).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/parameter/" + ((PipePipelinedetailsParameter)childParameters_parameter).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetailsElement.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetailsElement.java
deleted file mode 100644
index fb8245d9..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetailsElement.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoPipePipelinedetailsElement extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.PipePipelinedetailsElementI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoPipePipelinedetailsElement.class);
-	public static String SCHEMA_ELEMENT_NAME="pipe:pipelineDetails_element";
-
-	public AutoPipePipelinedetailsElement(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoPipePipelinedetailsElement(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoPipePipelinedetailsElement(UserI user)
-	 **/
-	public AutoPipePipelinedetailsElement(){}
-
-	public AutoPipePipelinedetailsElement(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "pipe:pipelineDetails_element";
-	}
-
-	//FIELD
-
-	private String _Element=null;
-
-	/**
-	 * @return Returns the element.
-	 */
-	public String getElement(){
-		try{
-			if (_Element==null){
-				_Element=getStringProperty("element");
-				return _Element;
-			}else {
-				return _Element;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for element.
-	 * @param v Value to Set.
-	 */
-	public void setElement(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/element",v);
-		_Element=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _PipePipelinedetailsElementId=null;
-
-	/**
-	 * @return Returns the pipe_pipelineDetails_element_id.
-	 */
-	public Integer getPipePipelinedetailsElementId() {
-		try{
-			if (_PipePipelinedetailsElementId==null){
-				_PipePipelinedetailsElementId=getIntegerProperty("pipe_pipelineDetails_element_id");
-				return _PipePipelinedetailsElementId;
-			}else {
-				return _PipePipelinedetailsElementId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pipe_pipelineDetails_element_id.
-	 * @param v Value to Set.
-	 */
-	public void setPipePipelinedetailsElementId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pipe_pipelineDetails_element_id",v);
-		_PipePipelinedetailsElementId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement> getAllPipePipelinedetailsElements(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement> getPipePipelinedetailsElementsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement> getPipePipelinedetailsElementsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetailsElement>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static PipePipelinedetailsElement getPipePipelinedetailsElementsByPipePipelinedetailsElementId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("pipe:pipelineDetails_element/pipe_pipelineDetails_element_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (PipePipelinedetailsElement) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetailsParameter.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetailsParameter.java
deleted file mode 100644
index 03fdbcda..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinedetailsParameter.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoPipePipelinedetailsParameter extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.PipePipelinedetailsParameterI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoPipePipelinedetailsParameter.class);
-	public static String SCHEMA_ELEMENT_NAME="pipe:pipelineDetails_parameter";
-
-	public AutoPipePipelinedetailsParameter(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoPipePipelinedetailsParameter(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoPipePipelinedetailsParameter(UserI user)
-	 **/
-	public AutoPipePipelinedetailsParameter(){}
-
-	public AutoPipePipelinedetailsParameter(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "pipe:pipelineDetails_parameter";
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Values_schemalink=null;
-
-	/**
-	 * @return Returns the values/schemaLink.
-	 */
-	public String getValues_schemalink(){
-		try{
-			if (_Values_schemalink==null){
-				_Values_schemalink=getStringProperty("values/schemaLink");
-				return _Values_schemalink;
-			}else {
-				return _Values_schemalink;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for values/schemaLink.
-	 * @param v Value to Set.
-	 */
-	public void setValues_schemalink(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/values/schemaLink",v);
-		_Values_schemalink=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Values_csvvalues=null;
-
-	/**
-	 * @return Returns the values/csvValues.
-	 */
-	public String getValues_csvvalues(){
-		try{
-			if (_Values_csvvalues==null){
-				_Values_csvvalues=getStringProperty("values/csvValues");
-				return _Values_csvvalues;
-			}else {
-				return _Values_csvvalues;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for values/csvValues.
-	 * @param v Value to Set.
-	 */
-	public void setValues_csvvalues(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/values/csvValues",v);
-		_Values_csvvalues=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _PipePipelinedetailsParameterId=null;
-
-	/**
-	 * @return Returns the pipe_pipelineDetails_parameter_id.
-	 */
-	public Integer getPipePipelinedetailsParameterId() {
-		try{
-			if (_PipePipelinedetailsParameterId==null){
-				_PipePipelinedetailsParameterId=getIntegerProperty("pipe_pipelineDetails_parameter_id");
-				return _PipePipelinedetailsParameterId;
-			}else {
-				return _PipePipelinedetailsParameterId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pipe_pipelineDetails_parameter_id.
-	 * @param v Value to Set.
-	 */
-	public void setPipePipelinedetailsParameterId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pipe_pipelineDetails_parameter_id",v);
-		_PipePipelinedetailsParameterId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter> getAllPipePipelinedetailsParameters(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter> getPipePipelinedetailsParametersByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter> getPipePipelinedetailsParametersByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter> al = new ArrayList<org.nrg.xdat.om.PipePipelinedetailsParameter>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static PipePipelinedetailsParameter getPipePipelinedetailsParametersByPipePipelinedetailsParameterId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("pipe:pipelineDetails_parameter/pipe_pipelineDetails_parameter_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (PipePipelinedetailsParameter) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinerepository.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinerepository.java
deleted file mode 100644
index 5987acd6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoPipePipelinerepository.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoPipePipelinerepository extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.PipePipelinerepositoryI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoPipePipelinerepository.class);
-	public static String SCHEMA_ELEMENT_NAME="pipe:PipelineRepository";
-
-	public AutoPipePipelinerepository(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoPipePipelinerepository(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoPipePipelinerepository(UserI user)
-	 **/
-	public AutoPipePipelinerepository(){}
-
-	public AutoPipePipelinerepository(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "pipe:PipelineRepository";
-	}
-	 private ArrayList<org.nrg.xdat.om.PipePipelinedetails> _Pipeline =null;
-
-	/**
-	 * pipeline
-	 * @return Returns an List of org.nrg.xdat.om.PipePipelinedetails
-	 */
-	public <A extends org.nrg.xdat.model.PipePipelinedetailsI> List<A> getPipeline() {
-		try{
-			if (_Pipeline==null){
-				_Pipeline=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("pipeline"));
-			}
-			return (List<A>) _Pipeline;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.PipePipelinedetails>();}
-	}
-
-	/**
-	 * Sets the value for pipeline.
-	 * @param v Value to Set.
-	 */
-	public void setPipeline(ItemI v) throws Exception{
-		_Pipeline =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipeline",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/pipeline",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * pipeline
-	 * Adds org.nrg.xdat.model.PipePipelinedetailsI
-	 */
-	public <A extends org.nrg.xdat.model.PipePipelinedetailsI> void addPipeline(A item) throws Exception{
-	setPipeline((ItemI)item);
-	}
-
-	/**
-	 * Removes the pipeline of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removePipeline(int index) throws java.lang.IndexOutOfBoundsException {
-		_Pipeline =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/pipeline",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _PipePipelinerepositoryId=null;
-
-	/**
-	 * @return Returns the pipe_PipelineRepository_id.
-	 */
-	public Integer getPipePipelinerepositoryId() {
-		try{
-			if (_PipePipelinerepositoryId==null){
-				_PipePipelinerepositoryId=getIntegerProperty("pipe_PipelineRepository_id");
-				return _PipePipelinerepositoryId;
-			}else {
-				return _PipePipelinerepositoryId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pipe_PipelineRepository_id.
-	 * @param v Value to Set.
-	 */
-	public void setPipePipelinerepositoryId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pipe_PipelineRepository_id",v);
-		_PipePipelinerepositoryId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinerepository> getAllPipePipelinerepositorys(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinerepository> al = new ArrayList<org.nrg.xdat.om.PipePipelinerepository>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinerepository> getPipePipelinerepositorysByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinerepository> al = new ArrayList<org.nrg.xdat.om.PipePipelinerepository>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.PipePipelinerepository> getPipePipelinerepositorysByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.PipePipelinerepository> al = new ArrayList<org.nrg.xdat.om.PipePipelinerepository>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static PipePipelinerepository getPipePipelinerepositorysByPipePipelinerepositoryId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("pipe:PipelineRepository/pipe_PipelineRepository_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (PipePipelinerepository) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //pipeline
-	        for(org.nrg.xdat.model.PipePipelinedetailsI childPipeline : this.getPipeline()){
-	            if (childPipeline!=null){
-	              for(ResourceFile rf: ((PipePipelinedetails)childPipeline).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("pipeline[" + ((PipePipelinedetails)childPipeline).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("pipeline/" + ((PipePipelinedetails)childPipeline).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcess.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcess.java
deleted file mode 100644
index 76f497bc..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcess.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoProvProcess extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ProvProcessI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoProvProcess.class);
-	public static String SCHEMA_ELEMENT_NAME="prov:process";
-
-	public AutoProvProcess(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoProvProcess(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoProvProcess(UserI user)
-	 **/
-	public AutoProvProcess(){}
-
-	public AutoProvProcess(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "prov:process";
-	}
-	 private ArrayList<org.nrg.xdat.om.ProvProcessstep> _Processstep =null;
-
-	/**
-	 * processStep
-	 * @return Returns an List of org.nrg.xdat.om.ProvProcessstep
-	 */
-	public <A extends org.nrg.xdat.model.ProvProcessstepI> List<A> getProcessstep() {
-		try{
-			if (_Processstep==null){
-				_Processstep=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("processStep"));
-			}
-			return (List<A>) _Processstep;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ProvProcessstep>();}
-	}
-
-	/**
-	 * Sets the value for processStep.
-	 * @param v Value to Set.
-	 */
-	public void setProcessstep(ItemI v) throws Exception{
-		_Processstep =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/processStep",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/processStep",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * processStep
-	 * Adds org.nrg.xdat.model.ProvProcessstepI
-	 */
-	public <A extends org.nrg.xdat.model.ProvProcessstepI> void addProcessstep(A item) throws Exception{
-	setProcessstep((ItemI)item);
-	}
-
-	/**
-	 * Removes the processStep of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeProcessstep(int index) throws java.lang.IndexOutOfBoundsException {
-		_Processstep =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/processStep",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ProvProcessId=null;
-
-	/**
-	 * @return Returns the prov_process_id.
-	 */
-	public Integer getProvProcessId() {
-		try{
-			if (_ProvProcessId==null){
-				_ProvProcessId=getIntegerProperty("prov_process_id");
-				return _ProvProcessId;
-			}else {
-				return _ProvProcessId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for prov_process_id.
-	 * @param v Value to Set.
-	 */
-	public void setProvProcessId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/prov_process_id",v);
-		_ProvProcessId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcess> getAllProvProcesss(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcess> al = new ArrayList<org.nrg.xdat.om.ProvProcess>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcess> getProvProcesssByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcess> al = new ArrayList<org.nrg.xdat.om.ProvProcess>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcess> getProvProcesssByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcess> al = new ArrayList<org.nrg.xdat.om.ProvProcess>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ProvProcess getProvProcesssByProvProcessId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("prov:process/prov_process_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ProvProcess) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //processStep
-	        for(org.nrg.xdat.model.ProvProcessstepI childProcessstep : this.getProcessstep()){
-	            if (childProcessstep!=null){
-	              for(ResourceFile rf: ((ProvProcessstep)childProcessstep).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("processStep[" + ((ProvProcessstep)childProcessstep).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("processStep/" + ((ProvProcessstep)childProcessstep).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcessstep.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcessstep.java
deleted file mode 100644
index a94c22cc..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcessstep.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoProvProcessstep extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ProvProcessstepI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoProvProcessstep.class);
-	public static String SCHEMA_ELEMENT_NAME="prov:processStep";
-
-	public AutoProvProcessstep(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoProvProcessstep(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoProvProcessstep(UserI user)
-	 **/
-	public AutoProvProcessstep(){}
-
-	public AutoProvProcessstep(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "prov:processStep";
-	}
-
-	//FIELD
-
-	private String _Program=null;
-
-	/**
-	 * @return Returns the program.
-	 */
-	public String getProgram(){
-		try{
-			if (_Program==null){
-				_Program=getStringProperty("program");
-				return _Program;
-			}else {
-				return _Program;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for program.
-	 * @param v Value to Set.
-	 */
-	public void setProgram(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/program",v);
-		_Program=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Program_version=null;
-
-	/**
-	 * @return Returns the program/version.
-	 */
-	public String getProgram_version(){
-		try{
-			if (_Program_version==null){
-				_Program_version=getStringProperty("program/version");
-				return _Program_version;
-			}else {
-				return _Program_version;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for program/version.
-	 * @param v Value to Set.
-	 */
-	public void setProgram_version(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/program/version",v);
-		_Program_version=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Program_arguments=null;
-
-	/**
-	 * @return Returns the program/arguments.
-	 */
-	public String getProgram_arguments(){
-		try{
-			if (_Program_arguments==null){
-				_Program_arguments=getStringProperty("program/arguments");
-				return _Program_arguments;
-			}else {
-				return _Program_arguments;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for program/arguments.
-	 * @param v Value to Set.
-	 */
-	public void setProgram_arguments(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/program/arguments",v);
-		_Program_arguments=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Timestamp=null;
-
-	/**
-	 * @return Returns the timestamp.
-	 */
-	public Object getTimestamp(){
-		try{
-			if (_Timestamp==null){
-				_Timestamp=getProperty("timestamp");
-				return _Timestamp;
-			}else {
-				return _Timestamp;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for timestamp.
-	 * @param v Value to Set.
-	 */
-	public void setTimestamp(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/timestamp",v);
-		_Timestamp=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Cvs=null;
-
-	/**
-	 * @return Returns the cvs.
-	 */
-	public String getCvs(){
-		try{
-			if (_Cvs==null){
-				_Cvs=getStringProperty("cvs");
-				return _Cvs;
-			}else {
-				return _Cvs;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cvs.
-	 * @param v Value to Set.
-	 */
-	public void setCvs(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cvs",v);
-		_Cvs=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _userProperty=null;
-
-	/**
-	 * @return Returns the user.
-	 */
-	public String getuserProperty(){
-		try{
-			if (_userProperty==null){
-				_userProperty=getStringProperty("user");
-				return _userProperty;
-			}else {
-				return _userProperty;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for user.
-	 * @param v Value to Set.
-	 */
-	public void setuserProperty(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/user",v);
-		_userProperty=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Machine=null;
-
-	/**
-	 * @return Returns the machine.
-	 */
-	public String getMachine(){
-		try{
-			if (_Machine==null){
-				_Machine=getStringProperty("machine");
-				return _Machine;
-			}else {
-				return _Machine;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for machine.
-	 * @param v Value to Set.
-	 */
-	public void setMachine(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/machine",v);
-		_Machine=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Platform=null;
-
-	/**
-	 * @return Returns the platform.
-	 */
-	public String getPlatform(){
-		try{
-			if (_Platform==null){
-				_Platform=getStringProperty("platform");
-				return _Platform;
-			}else {
-				return _Platform;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for platform.
-	 * @param v Value to Set.
-	 */
-	public void setPlatform(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/platform",v);
-		_Platform=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Platform_version=null;
-
-	/**
-	 * @return Returns the platform/version.
-	 */
-	public String getPlatform_version(){
-		try{
-			if (_Platform_version==null){
-				_Platform_version=getStringProperty("platform/version");
-				return _Platform_version;
-			}else {
-				return _Platform_version;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for platform/version.
-	 * @param v Value to Set.
-	 */
-	public void setPlatform_version(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/platform/version",v);
-		_Platform_version=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Compiler=null;
-
-	/**
-	 * @return Returns the compiler.
-	 */
-	public String getCompiler(){
-		try{
-			if (_Compiler==null){
-				_Compiler=getStringProperty("compiler");
-				return _Compiler;
-			}else {
-				return _Compiler;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for compiler.
-	 * @param v Value to Set.
-	 */
-	public void setCompiler(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/compiler",v);
-		_Compiler=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Compiler_version=null;
-
-	/**
-	 * @return Returns the compiler/version.
-	 */
-	public String getCompiler_version(){
-		try{
-			if (_Compiler_version==null){
-				_Compiler_version=getStringProperty("compiler/version");
-				return _Compiler_version;
-			}else {
-				return _Compiler_version;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for compiler/version.
-	 * @param v Value to Set.
-	 */
-	public void setCompiler_version(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/compiler/version",v);
-		_Compiler_version=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary> _Library =null;
-
-	/**
-	 * library
-	 * @return Returns an List of org.nrg.xdat.om.ProvProcessstepLibrary
-	 */
-	public <A extends org.nrg.xdat.model.ProvProcessstepLibraryI> List<A> getLibrary() {
-		try{
-			if (_Library==null){
-				_Library=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("library"));
-			}
-			return (List<A>) _Library;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary>();}
-	}
-
-	/**
-	 * Sets the value for library.
-	 * @param v Value to Set.
-	 */
-	public void setLibrary(ItemI v) throws Exception{
-		_Library =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/library",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/library",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * library
-	 * Adds org.nrg.xdat.model.ProvProcessstepLibraryI
-	 */
-	public <A extends org.nrg.xdat.model.ProvProcessstepLibraryI> void addLibrary(A item) throws Exception{
-	setLibrary((ItemI)item);
-	}
-
-	/**
-	 * Removes the library of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeLibrary(int index) throws java.lang.IndexOutOfBoundsException {
-		_Library =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/library",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ProvProcessstepId=null;
-
-	/**
-	 * @return Returns the prov_processStep_id.
-	 */
-	public Integer getProvProcessstepId() {
-		try{
-			if (_ProvProcessstepId==null){
-				_ProvProcessstepId=getIntegerProperty("prov_processStep_id");
-				return _ProvProcessstepId;
-			}else {
-				return _ProvProcessstepId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for prov_processStep_id.
-	 * @param v Value to Set.
-	 */
-	public void setProvProcessstepId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/prov_processStep_id",v);
-		_ProvProcessstepId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcessstep> getAllProvProcesssteps(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcessstep> al = new ArrayList<org.nrg.xdat.om.ProvProcessstep>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcessstep> getProvProcessstepsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcessstep> al = new ArrayList<org.nrg.xdat.om.ProvProcessstep>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcessstep> getProvProcessstepsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcessstep> al = new ArrayList<org.nrg.xdat.om.ProvProcessstep>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ProvProcessstep getProvProcessstepsByProvProcessstepId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("prov:processStep/prov_processStep_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ProvProcessstep) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //library
-	        for(org.nrg.xdat.model.ProvProcessstepLibraryI childLibrary : this.getLibrary()){
-	            if (childLibrary!=null){
-	              for(ResourceFile rf: ((ProvProcessstepLibrary)childLibrary).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("library[" + ((ProvProcessstepLibrary)childLibrary).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("library/" + ((ProvProcessstepLibrary)childLibrary).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcessstepLibrary.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcessstepLibrary.java
deleted file mode 100644
index 763bc061..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoProvProcessstepLibrary.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoProvProcessstepLibrary extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ProvProcessstepLibraryI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoProvProcessstepLibrary.class);
-	public static String SCHEMA_ELEMENT_NAME="prov:processStep_library";
-
-	public AutoProvProcessstepLibrary(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoProvProcessstepLibrary(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoProvProcessstepLibrary(UserI user)
-	 **/
-	public AutoProvProcessstepLibrary(){}
-
-	public AutoProvProcessstepLibrary(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "prov:processStep_library";
-	}
-
-	//FIELD
-
-	private String _Library=null;
-
-	/**
-	 * @return Returns the library.
-	 */
-	public String getLibrary(){
-		try{
-			if (_Library==null){
-				_Library=getStringProperty("library");
-				return _Library;
-			}else {
-				return _Library;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for library.
-	 * @param v Value to Set.
-	 */
-	public void setLibrary(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/library",v);
-		_Library=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Version=null;
-
-	/**
-	 * @return Returns the version.
-	 */
-	public String getVersion(){
-		try{
-			if (_Version==null){
-				_Version=getStringProperty("version");
-				return _Version;
-			}else {
-				return _Version;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for version.
-	 * @param v Value to Set.
-	 */
-	public void setVersion(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/version",v);
-		_Version=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ProvProcessstepLibraryId=null;
-
-	/**
-	 * @return Returns the prov_processStep_library_id.
-	 */
-	public Integer getProvProcessstepLibraryId() {
-		try{
-			if (_ProvProcessstepLibraryId==null){
-				_ProvProcessstepLibraryId=getIntegerProperty("prov_processStep_library_id");
-				return _ProvProcessstepLibraryId;
-			}else {
-				return _ProvProcessstepLibraryId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for prov_processStep_library_id.
-	 * @param v Value to Set.
-	 */
-	public void setProvProcessstepLibraryId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/prov_processStep_library_id",v);
-		_ProvProcessstepLibraryId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary> getAllProvProcessstepLibrarys(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary> al = new ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary> getProvProcessstepLibrarysByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary> al = new ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary> getProvProcessstepLibrarysByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary> al = new ArrayList<org.nrg.xdat.om.ProvProcessstepLibrary>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ProvProcessstepLibrary getProvProcessstepLibrarysByProvProcessstepLibraryId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("prov:processStep_library/prov_processStep_library_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ProvProcessstepLibrary) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoScrScreeningassessment.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoScrScreeningassessment.java
deleted file mode 100644
index fc963dac..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoScrScreeningassessment.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoScrScreeningassessment extends XnatImageassessordata implements org.nrg.xdat.model.ScrScreeningassessmentI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoScrScreeningassessment.class);
-	public static String SCHEMA_ELEMENT_NAME="scr:screeningAssessment";
-
-	public AutoScrScreeningassessment(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoScrScreeningassessment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoScrScreeningassessment(UserI user)
-	 **/
-	public AutoScrScreeningassessment(){}
-
-	public AutoScrScreeningassessment(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "scr:screeningAssessment";
-	}
-	 private org.nrg.xdat.om.XnatImageassessordata _Imageassessordata =null;
-
-	/**
-	 * imageAssessorData
-	 * @return org.nrg.xdat.om.XnatImageassessordata
-	 */
-	public org.nrg.xdat.om.XnatImageassessordata getImageassessordata() {
-		try{
-			if (_Imageassessordata==null){
-				_Imageassessordata=((XnatImageassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageAssessorData")));
-				return _Imageassessordata;
-			}else {
-				return _Imageassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setImageassessordata(ItemI v) throws Exception{
-		_Imageassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageAssessorData
-	 * set org.nrg.xdat.model.XnatImageassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImageassessordataI> void setImageassessordata(A item) throws Exception{
-	setImageassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageAssessorData.
-	 * */
-	public void removeImageassessordata() {
-		_Imageassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rater=null;
-
-	/**
-	 * @return Returns the rater.
-	 */
-	public String getRater(){
-		try{
-			if (_Rater==null){
-				_Rater=getStringProperty("rater");
-				return _Rater;
-			}else {
-				return _Rater;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rater.
-	 * @param v Value to Set.
-	 */
-	public void setRater(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rater",v);
-		_Rater=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Comments=null;
-
-	/**
-	 * @return Returns the comments.
-	 */
-	public String getComments(){
-		try{
-			if (_Comments==null){
-				_Comments=getStringProperty("comments");
-				return _Comments;
-			}else {
-				return _Comments;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for comments.
-	 * @param v Value to Set.
-	 */
-	public void setComments(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/comments",v);
-		_Comments=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Pass=null;
-
-	/**
-	 * @return Returns the pass.
-	 */
-	public String getPass(){
-		try{
-			if (_Pass==null){
-				_Pass=getStringProperty("pass");
-				return _Pass;
-			}else {
-				return _Pass;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pass.
-	 * @param v Value to Set.
-	 */
-	public void setPass(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pass",v);
-		_Pass=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ScrScreeningscandata> _Scans_scan =null;
-
-	/**
-	 * scans/scan
-	 * @return Returns an List of org.nrg.xdat.om.ScrScreeningscandata
-	 */
-	public <A extends org.nrg.xdat.model.ScrScreeningscandataI> List<A> getScans_scan() {
-		try{
-			if (_Scans_scan==null){
-				_Scans_scan=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("scans/scan"));
-			}
-			return (List<A>) _Scans_scan;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ScrScreeningscandata>();}
-	}
-
-	/**
-	 * Sets the value for scans/scan.
-	 * @param v Value to Set.
-	 */
-	public void setScans_scan(ItemI v) throws Exception{
-		_Scans_scan =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * scans/scan
-	 * Adds org.nrg.xdat.model.ScrScreeningscandataI
-	 */
-	public <A extends org.nrg.xdat.model.ScrScreeningscandataI> void addScans_scan(A item) throws Exception{
-	setScans_scan((ItemI)item);
-	}
-
-	/**
-	 * Removes the scans/scan of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeScans_scan(int index) throws java.lang.IndexOutOfBoundsException {
-		_Scans_scan =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/scans/scan",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ScrScreeningassessment> getAllScrScreeningassessments(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ScrScreeningassessment> al = new ArrayList<org.nrg.xdat.om.ScrScreeningassessment>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ScrScreeningassessment> getScrScreeningassessmentsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ScrScreeningassessment> al = new ArrayList<org.nrg.xdat.om.ScrScreeningassessment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ScrScreeningassessment> getScrScreeningassessmentsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ScrScreeningassessment> al = new ArrayList<org.nrg.xdat.om.ScrScreeningassessment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ScrScreeningassessment getScrScreeningassessmentsById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("scr:screeningAssessment/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ScrScreeningassessment) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageAssessorData
-	        XnatImageassessordata childImageassessordata = (XnatImageassessordata)this.getImageassessordata();
-	            if (childImageassessordata!=null){
-	              for(ResourceFile rf: ((XnatImageassessordata)childImageassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageAssessorData[" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageAssessorData/" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //scans/scan
-	        for(org.nrg.xdat.model.ScrScreeningscandataI childScans_scan : this.getScans_scan()){
-	            if (childScans_scan!=null){
-	              for(ResourceFile rf: ((ScrScreeningscandata)childScans_scan).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("scans/scan[" + ((ScrScreeningscandata)childScans_scan).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("scans/scan/" + ((ScrScreeningscandata)childScans_scan).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoScrScreeningscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoScrScreeningscandata.java
deleted file mode 100644
index c0a12ebe..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoScrScreeningscandata.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoScrScreeningscandata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ScrScreeningscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoScrScreeningscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="scr:screeningScanData";
-
-	public AutoScrScreeningscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoScrScreeningscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoScrScreeningscandata(UserI user)
-	 **/
-	public AutoScrScreeningscandata(){}
-
-	public AutoScrScreeningscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "scr:screeningScanData";
-	}
-
-	//FIELD
-
-	private String _ImagescanId=null;
-
-	/**
-	 * @return Returns the imageScan_ID.
-	 */
-	public String getImagescanId(){
-		try{
-			if (_ImagescanId==null){
-				_ImagescanId=getStringProperty("imageScan_ID");
-				return _ImagescanId;
-			}else {
-				return _ImagescanId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for imageScan_ID.
-	 * @param v Value to Set.
-	 */
-	public void setImagescanId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/imageScan_ID",v);
-		_ImagescanId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Comments=null;
-
-	/**
-	 * @return Returns the comments.
-	 */
-	public String getComments(){
-		try{
-			if (_Comments==null){
-				_Comments=getStringProperty("comments");
-				return _Comments;
-			}else {
-				return _Comments;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for comments.
-	 * @param v Value to Set.
-	 */
-	public void setComments(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/comments",v);
-		_Comments=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Pass=null;
-
-	/**
-	 * @return Returns the pass.
-	 */
-	public String getPass(){
-		try{
-			if (_Pass==null){
-				_Pass=getStringProperty("pass");
-				return _Pass;
-			}else {
-				return _Pass;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pass.
-	 * @param v Value to Set.
-	 */
-	public void setPass(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pass",v);
-		_Pass=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ScrScreeningscandataId=null;
-
-	/**
-	 * @return Returns the scr_screeningScanData_id.
-	 */
-	public Integer getScrScreeningscandataId() {
-		try{
-			if (_ScrScreeningscandataId==null){
-				_ScrScreeningscandataId=getIntegerProperty("scr_screeningScanData_id");
-				return _ScrScreeningscandataId;
-			}else {
-				return _ScrScreeningscandataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for scr_screeningScanData_id.
-	 * @param v Value to Set.
-	 */
-	public void setScrScreeningscandataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scr_screeningScanData_id",v);
-		_ScrScreeningscandataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ScrScreeningscandata> getAllScrScreeningscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ScrScreeningscandata> al = new ArrayList<org.nrg.xdat.om.ScrScreeningscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ScrScreeningscandata> getScrScreeningscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ScrScreeningscandata> al = new ArrayList<org.nrg.xdat.om.ScrScreeningscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ScrScreeningscandata> getScrScreeningscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ScrScreeningscandata> al = new ArrayList<org.nrg.xdat.om.ScrScreeningscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ScrScreeningscandata getScrScreeningscandatasByScrScreeningscandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("scr:screeningScanData/scr_screeningScanData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ScrScreeningscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoValAdditionalval.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoValAdditionalval.java
deleted file mode 100644
index 8346211c..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoValAdditionalval.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoValAdditionalval extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ValAdditionalvalI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoValAdditionalval.class);
-	public static String SCHEMA_ELEMENT_NAME="val:additionalVal";
-
-	public AutoValAdditionalval(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoValAdditionalval(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoValAdditionalval(UserI user)
-	 **/
-	public AutoValAdditionalval(){}
-
-	public AutoValAdditionalval(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "val:additionalVal";
-	}
-
-	//FIELD
-
-	private Integer _ValAdditionalvalId=null;
-
-	/**
-	 * @return Returns the val_additionalVal_id.
-	 */
-	public Integer getValAdditionalvalId() {
-		try{
-			if (_ValAdditionalvalId==null){
-				_ValAdditionalvalId=getIntegerProperty("val_additionalVal_id");
-				return _ValAdditionalvalId;
-			}else {
-				return _ValAdditionalvalId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for val_additionalVal_id.
-	 * @param v Value to Set.
-	 */
-	public void setValAdditionalvalId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/val_additionalVal_id",v);
-		_ValAdditionalvalId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValAdditionalval> getAllValAdditionalvals(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValAdditionalval> al = new ArrayList<org.nrg.xdat.om.ValAdditionalval>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValAdditionalval> getValAdditionalvalsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValAdditionalval> al = new ArrayList<org.nrg.xdat.om.ValAdditionalval>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValAdditionalval> getValAdditionalvalsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValAdditionalval> al = new ArrayList<org.nrg.xdat.om.ValAdditionalval>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ValAdditionalval getValAdditionalvalsByValAdditionalvalId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("val:additionalVal/val_additionalVal_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ValAdditionalval) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldata.java
deleted file mode 100644
index ec862752..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldata.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoValProtocoldata extends XnatImageassessordata implements org.nrg.xdat.model.ValProtocoldataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoValProtocoldata.class);
-	public static String SCHEMA_ELEMENT_NAME="val:protocolData";
-
-	public AutoValProtocoldata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoValProtocoldata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoValProtocoldata(UserI user)
-	 **/
-	public AutoValProtocoldata(){}
-
-	public AutoValProtocoldata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "val:protocolData";
-	}
-	 private org.nrg.xdat.om.XnatImageassessordata _Imageassessordata =null;
-
-	/**
-	 * imageAssessorData
-	 * @return org.nrg.xdat.om.XnatImageassessordata
-	 */
-	public org.nrg.xdat.om.XnatImageassessordata getImageassessordata() {
-		try{
-			if (_Imageassessordata==null){
-				_Imageassessordata=((XnatImageassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageAssessorData")));
-				return _Imageassessordata;
-			}else {
-				return _Imageassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setImageassessordata(ItemI v) throws Exception{
-		_Imageassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageAssessorData
-	 * set org.nrg.xdat.model.XnatImageassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImageassessordataI> void setImageassessordata(A item) throws Exception{
-	setImageassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageAssessorData.
-	 * */
-	public void removeImageassessordata() {
-		_Imageassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ValProtocoldataCondition> _Check_conditions_condition =null;
-
-	/**
-	 * check/conditions/condition
-	 * @return Returns an List of org.nrg.xdat.om.ValProtocoldataCondition
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataConditionI> List<A> getCheck_conditions_condition() {
-		try{
-			if (_Check_conditions_condition==null){
-				_Check_conditions_condition=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("check/conditions/condition"));
-			}
-			return (List<A>) _Check_conditions_condition;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ValProtocoldataCondition>();}
-	}
-
-	/**
-	 * Sets the value for check/conditions/condition.
-	 * @param v Value to Set.
-	 */
-	public void setCheck_conditions_condition(ItemI v) throws Exception{
-		_Check_conditions_condition =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/check/conditions/condition",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/check/conditions/condition",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * check/conditions/condition
-	 * Adds org.nrg.xdat.model.ValProtocoldataConditionI
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataConditionI> void addCheck_conditions_condition(A item) throws Exception{
-	setCheck_conditions_condition((ItemI)item);
-	}
-
-	/**
-	 * Removes the check/conditions/condition of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeCheck_conditions_condition(int index) throws java.lang.IndexOutOfBoundsException {
-		_Check_conditions_condition =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/check/conditions/condition",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ValProtocoldataComment> _Check_comments_comment =null;
-
-	/**
-	 * check/comments/comment
-	 * @return Returns an List of org.nrg.xdat.om.ValProtocoldataComment
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataCommentI> List<A> getCheck_comments_comment() {
-		try{
-			if (_Check_comments_comment==null){
-				_Check_comments_comment=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("check/comments/comment"));
-			}
-			return (List<A>) _Check_comments_comment;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ValProtocoldataComment>();}
-	}
-
-	/**
-	 * Sets the value for check/comments/comment.
-	 * @param v Value to Set.
-	 */
-	public void setCheck_comments_comment(ItemI v) throws Exception{
-		_Check_comments_comment =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/check/comments/comment",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/check/comments/comment",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * check/comments/comment
-	 * Adds org.nrg.xdat.model.ValProtocoldataCommentI
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataCommentI> void addCheck_comments_comment(A item) throws Exception{
-	setCheck_comments_comment((ItemI)item);
-	}
-
-	/**
-	 * Removes the check/comments/comment of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeCheck_comments_comment(int index) throws java.lang.IndexOutOfBoundsException {
-		_Check_comments_comment =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/check/comments/comment",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.ValAdditionalval _Check_additionalval =null;
-
-	/**
-	 * check/additionalVal
-	 * @return org.nrg.xdat.om.ValAdditionalval
-	 */
-	public org.nrg.xdat.om.ValAdditionalval getCheck_additionalval() {
-		try{
-			if (_Check_additionalval==null){
-				_Check_additionalval=((ValAdditionalval)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("check/additionalVal")));
-				return _Check_additionalval;
-			}else {
-				return _Check_additionalval;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for check/additionalVal.
-	 * @param v Value to Set.
-	 */
-	public void setCheck_additionalval(ItemI v) throws Exception{
-		_Check_additionalval =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/check/additionalVal",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/check/additionalVal",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * check/additionalVal
-	 * set org.nrg.xdat.model.ValAdditionalvalI
-	 */
-	public <A extends org.nrg.xdat.model.ValAdditionalvalI> void setCheck_additionalval(A item) throws Exception{
-	setCheck_additionalval((ItemI)item);
-	}
-
-	/**
-	 * Removes the check/additionalVal.
-	 * */
-	public void removeCheck_additionalval() {
-		_Check_additionalval =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/check/additionalVal",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Check_additionalvalFK=null;
-
-	/**
-	 * @return Returns the val:protocolData/check_additionalval_val_additionalval_id.
-	 */
-	public Integer getCheck_additionalvalFK(){
-		try{
-			if (_Check_additionalvalFK==null){
-				_Check_additionalvalFK=getIntegerProperty("val:protocolData/check_additionalval_val_additionalval_id");
-				return _Check_additionalvalFK;
-			}else {
-				return _Check_additionalvalFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for val:protocolData/check_additionalval_val_additionalval_id.
-	 * @param v Value to Set.
-	 */
-	public void setCheck_additionalvalFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/check_additionalval_val_additionalval_id",v);
-		_Check_additionalvalFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Check_status=null;
-
-	/**
-	 * @return Returns the check/status.
-	 */
-	public String getCheck_status(){
-		try{
-			if (_Check_status==null){
-				_Check_status=getStringProperty("check/status");
-				return _Check_status;
-			}else {
-				return _Check_status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for check/status.
-	 * @param v Value to Set.
-	 */
-	public void setCheck_status(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/check/status",v);
-		_Check_status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck> _Scans_scanCheck =null;
-
-	/**
-	 * scans/scan_check
-	 * @return Returns an List of org.nrg.xdat.om.ValProtocoldataScanCheck
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataScanCheckI> List<A> getScans_scanCheck() {
-		try{
-			if (_Scans_scanCheck==null){
-				_Scans_scanCheck=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("scans/scan_check"));
-			}
-			return (List<A>) _Scans_scanCheck;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck>();}
-	}
-
-	/**
-	 * Sets the value for scans/scan_check.
-	 * @param v Value to Set.
-	 */
-	public void setScans_scanCheck(ItemI v) throws Exception{
-		_Scans_scanCheck =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan_check",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan_check",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * scans/scan_check
-	 * Adds org.nrg.xdat.model.ValProtocoldataScanCheckI
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataScanCheckI> void addScans_scanCheck(A item) throws Exception{
-	setScans_scanCheck((ItemI)item);
-	}
-
-	/**
-	 * Removes the scans/scan_check of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeScans_scanCheck(int index) throws java.lang.IndexOutOfBoundsException {
-		_Scans_scanCheck =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/scans/scan_check",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldata> getAllValProtocoldatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldata> al = new ArrayList<org.nrg.xdat.om.ValProtocoldata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldata> getValProtocoldatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldata> al = new ArrayList<org.nrg.xdat.om.ValProtocoldata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldata> getValProtocoldatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldata> al = new ArrayList<org.nrg.xdat.om.ValProtocoldata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ValProtocoldata getValProtocoldatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("val:protocolData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ValProtocoldata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageAssessorData
-	        XnatImageassessordata childImageassessordata = (XnatImageassessordata)this.getImageassessordata();
-	            if (childImageassessordata!=null){
-	              for(ResourceFile rf: ((XnatImageassessordata)childImageassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageAssessorData[" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageAssessorData/" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //check/conditions/condition
-	        for(org.nrg.xdat.model.ValProtocoldataConditionI childCheck_conditions_condition : this.getCheck_conditions_condition()){
-	            if (childCheck_conditions_condition!=null){
-	              for(ResourceFile rf: ((ValProtocoldataCondition)childCheck_conditions_condition).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("check/conditions/condition[" + ((ValProtocoldataCondition)childCheck_conditions_condition).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("check/conditions/condition/" + ((ValProtocoldataCondition)childCheck_conditions_condition).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //check/comments/comment
-	        for(org.nrg.xdat.model.ValProtocoldataCommentI childCheck_comments_comment : this.getCheck_comments_comment()){
-	            if (childCheck_comments_comment!=null){
-	              for(ResourceFile rf: ((ValProtocoldataComment)childCheck_comments_comment).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("check/comments/comment[" + ((ValProtocoldataComment)childCheck_comments_comment).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("check/comments/comment/" + ((ValProtocoldataComment)childCheck_comments_comment).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //check/additionalVal
-	        ValAdditionalval childCheck_additionalval = (ValAdditionalval)this.getCheck_additionalval();
-	            if (childCheck_additionalval!=null){
-	              for(ResourceFile rf: ((ValAdditionalval)childCheck_additionalval).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("check/additionalVal[" + ((ValAdditionalval)childCheck_additionalval).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("check/additionalVal/" + ((ValAdditionalval)childCheck_additionalval).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //scans/scan_check
-	        for(org.nrg.xdat.model.ValProtocoldataScanCheckI childScans_scanCheck : this.getScans_scanCheck()){
-	            if (childScans_scanCheck!=null){
-	              for(ResourceFile rf: ((ValProtocoldataScanCheck)childScans_scanCheck).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("scans/scan_check[" + ((ValProtocoldataScanCheck)childScans_scanCheck).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("scans/scan_check/" + ((ValProtocoldataScanCheck)childScans_scanCheck).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataComment.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataComment.java
deleted file mode 100644
index 14a89004..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataComment.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoValProtocoldataComment extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ValProtocoldataCommentI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoValProtocoldataComment.class);
-	public static String SCHEMA_ELEMENT_NAME="val:protocolData_comment";
-
-	public AutoValProtocoldataComment(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoValProtocoldataComment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoValProtocoldataComment(UserI user)
-	 **/
-	public AutoValProtocoldataComment(){}
-
-	public AutoValProtocoldataComment(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "val:protocolData_comment";
-	}
-
-	//FIELD
-
-	private String _Comment=null;
-
-	/**
-	 * @return Returns the comment.
-	 */
-	public String getComment(){
-		try{
-			if (_Comment==null){
-				_Comment=getStringProperty("comment");
-				return _Comment;
-			}else {
-				return _Comment;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for comment.
-	 * @param v Value to Set.
-	 */
-	public void setComment(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/comment",v);
-		_Comment=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Username=null;
-
-	/**
-	 * @return Returns the username.
-	 */
-	public String getUsername(){
-		try{
-			if (_Username==null){
-				_Username=getStringProperty("username");
-				return _Username;
-			}else {
-				return _Username;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for username.
-	 * @param v Value to Set.
-	 */
-	public void setUsername(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/username",v);
-		_Username=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Datetime=null;
-
-	/**
-	 * @return Returns the dateTime.
-	 */
-	public Object getDatetime(){
-		try{
-			if (_Datetime==null){
-				_Datetime=getProperty("dateTime");
-				return _Datetime;
-			}else {
-				return _Datetime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dateTime.
-	 * @param v Value to Set.
-	 */
-	public void setDatetime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dateTime",v);
-		_Datetime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ValProtocoldataCommentId=null;
-
-	/**
-	 * @return Returns the val_protocolData_comment_id.
-	 */
-	public Integer getValProtocoldataCommentId() {
-		try{
-			if (_ValProtocoldataCommentId==null){
-				_ValProtocoldataCommentId=getIntegerProperty("val_protocolData_comment_id");
-				return _ValProtocoldataCommentId;
-			}else {
-				return _ValProtocoldataCommentId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for val_protocolData_comment_id.
-	 * @param v Value to Set.
-	 */
-	public void setValProtocoldataCommentId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/val_protocolData_comment_id",v);
-		_ValProtocoldataCommentId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataComment> getAllValProtocoldataComments(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataComment> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataComment>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataComment> getValProtocoldataCommentsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataComment> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataComment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataComment> getValProtocoldataCommentsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataComment> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataComment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ValProtocoldataComment getValProtocoldataCommentsByValProtocoldataCommentId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("val:protocolData_comment/val_protocolData_comment_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ValProtocoldataComment) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataCondition.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataCondition.java
deleted file mode 100644
index c45f55d4..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataCondition.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoValProtocoldataCondition extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ValProtocoldataConditionI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoValProtocoldataCondition.class);
-	public static String SCHEMA_ELEMENT_NAME="val:protocolData_condition";
-
-	public AutoValProtocoldataCondition(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoValProtocoldataCondition(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoValProtocoldataCondition(UserI user)
-	 **/
-	public AutoValProtocoldataCondition(){}
-
-	public AutoValProtocoldataCondition(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "val:protocolData_condition";
-	}
-
-	//FIELD
-
-	private String _Verified=null;
-
-	/**
-	 * @return Returns the verified.
-	 */
-	public String getVerified(){
-		try{
-			if (_Verified==null){
-				_Verified=getStringProperty("verified");
-				return _Verified;
-			}else {
-				return _Verified;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for verified.
-	 * @param v Value to Set.
-	 */
-	public void setVerified(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/verified",v);
-		_Verified=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Diagnosis=null;
-
-	/**
-	 * @return Returns the diagnosis.
-	 */
-	public String getDiagnosis(){
-		try{
-			if (_Diagnosis==null){
-				_Diagnosis=getStringProperty("diagnosis");
-				return _Diagnosis;
-			}else {
-				return _Diagnosis;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for diagnosis.
-	 * @param v Value to Set.
-	 */
-	public void setDiagnosis(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/diagnosis",v);
-		_Diagnosis=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Status=null;
-
-	/**
-	 * @return Returns the status.
-	 */
-	public String getStatus(){
-		try{
-			if (_Status==null){
-				_Status=getStringProperty("status");
-				return _Status;
-			}else {
-				return _Status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for status.
-	 * @param v Value to Set.
-	 */
-	public void setStatus(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/status",v);
-		_Status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Xmlpath=null;
-
-	/**
-	 * @return Returns the xmlpath.
-	 */
-	public String getXmlpath(){
-		try{
-			if (_Xmlpath==null){
-				_Xmlpath=getStringProperty("xmlpath");
-				return _Xmlpath;
-			}else {
-				return _Xmlpath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xmlpath.
-	 * @param v Value to Set.
-	 */
-	public void setXmlpath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xmlpath",v);
-		_Xmlpath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ValProtocoldataConditionId=null;
-
-	/**
-	 * @return Returns the val_protocolData_condition_id.
-	 */
-	public Integer getValProtocoldataConditionId() {
-		try{
-			if (_ValProtocoldataConditionId==null){
-				_ValProtocoldataConditionId=getIntegerProperty("val_protocolData_condition_id");
-				return _ValProtocoldataConditionId;
-			}else {
-				return _ValProtocoldataConditionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for val_protocolData_condition_id.
-	 * @param v Value to Set.
-	 */
-	public void setValProtocoldataConditionId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/val_protocolData_condition_id",v);
-		_ValProtocoldataConditionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataCondition> getAllValProtocoldataConditions(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataCondition> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataCondition>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataCondition> getValProtocoldataConditionsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataCondition> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataCondition>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataCondition> getValProtocoldataConditionsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataCondition> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataCondition>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ValProtocoldataCondition getValProtocoldataConditionsByValProtocoldataConditionId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("val:protocolData_condition/val_protocolData_condition_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ValProtocoldataCondition) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheck.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheck.java
deleted file mode 100644
index 2abe445f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheck.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoValProtocoldataScanCheck extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ValProtocoldataScanCheckI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoValProtocoldataScanCheck.class);
-	public static String SCHEMA_ELEMENT_NAME="val:protocolData_scan_check";
-
-	public AutoValProtocoldataScanCheck(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoValProtocoldataScanCheck(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoValProtocoldataScanCheck(UserI user)
-	 **/
-	public AutoValProtocoldataScanCheck(){}
-
-	public AutoValProtocoldataScanCheck(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "val:protocolData_scan_check";
-	}
-	 private ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition> _Conditions_condition =null;
-
-	/**
-	 * conditions/condition
-	 * @return Returns an List of org.nrg.xdat.om.ValProtocoldataScanCheckCondition
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataScanCheckConditionI> List<A> getConditions_condition() {
-		try{
-			if (_Conditions_condition==null){
-				_Conditions_condition=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("conditions/condition"));
-			}
-			return (List<A>) _Conditions_condition;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition>();}
-	}
-
-	/**
-	 * Sets the value for conditions/condition.
-	 * @param v Value to Set.
-	 */
-	public void setConditions_condition(ItemI v) throws Exception{
-		_Conditions_condition =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/conditions/condition",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/conditions/condition",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * conditions/condition
-	 * Adds org.nrg.xdat.model.ValProtocoldataScanCheckConditionI
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataScanCheckConditionI> void addConditions_condition(A item) throws Exception{
-	setConditions_condition((ItemI)item);
-	}
-
-	/**
-	 * Removes the conditions/condition of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeConditions_condition(int index) throws java.lang.IndexOutOfBoundsException {
-		_Conditions_condition =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/conditions/condition",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment> _Comments_comment =null;
-
-	/**
-	 * comments/comment
-	 * @return Returns an List of org.nrg.xdat.om.ValProtocoldataScanCheckComment
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataScanCheckCommentI> List<A> getComments_comment() {
-		try{
-			if (_Comments_comment==null){
-				_Comments_comment=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("comments/comment"));
-			}
-			return (List<A>) _Comments_comment;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment>();}
-	}
-
-	/**
-	 * Sets the value for comments/comment.
-	 * @param v Value to Set.
-	 */
-	public void setComments_comment(ItemI v) throws Exception{
-		_Comments_comment =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/comments/comment",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/comments/comment",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * comments/comment
-	 * Adds org.nrg.xdat.model.ValProtocoldataScanCheckCommentI
-	 */
-	public <A extends org.nrg.xdat.model.ValProtocoldataScanCheckCommentI> void addComments_comment(A item) throws Exception{
-	setComments_comment((ItemI)item);
-	}
-
-	/**
-	 * Removes the comments/comment of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeComments_comment(int index) throws java.lang.IndexOutOfBoundsException {
-		_Comments_comment =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/comments/comment",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.ValAdditionalval _Additionalval =null;
-
-	/**
-	 * additionalVal
-	 * @return org.nrg.xdat.om.ValAdditionalval
-	 */
-	public org.nrg.xdat.om.ValAdditionalval getAdditionalval() {
-		try{
-			if (_Additionalval==null){
-				_Additionalval=((ValAdditionalval)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("additionalVal")));
-				return _Additionalval;
-			}else {
-				return _Additionalval;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for additionalVal.
-	 * @param v Value to Set.
-	 */
-	public void setAdditionalval(ItemI v) throws Exception{
-		_Additionalval =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/additionalVal",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/additionalVal",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * additionalVal
-	 * set org.nrg.xdat.model.ValAdditionalvalI
-	 */
-	public <A extends org.nrg.xdat.model.ValAdditionalvalI> void setAdditionalval(A item) throws Exception{
-	setAdditionalval((ItemI)item);
-	}
-
-	/**
-	 * Removes the additionalVal.
-	 * */
-	public void removeAdditionalval() {
-		_Additionalval =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/additionalVal",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _AdditionalvalFK=null;
-
-	/**
-	 * @return Returns the val:protocolData_scan_check/additionalval_val_additionalval_id.
-	 */
-	public Integer getAdditionalvalFK(){
-		try{
-			if (_AdditionalvalFK==null){
-				_AdditionalvalFK=getIntegerProperty("val:protocolData_scan_check/additionalval_val_additionalval_id");
-				return _AdditionalvalFK;
-			}else {
-				return _AdditionalvalFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for val:protocolData_scan_check/additionalval_val_additionalval_id.
-	 * @param v Value to Set.
-	 */
-	public void setAdditionalvalFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/additionalval_val_additionalval_id",v);
-		_AdditionalvalFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _ScanId=null;
-
-	/**
-	 * @return Returns the SCAN_ID.
-	 */
-	public String getScanId(){
-		try{
-			if (_ScanId==null){
-				_ScanId=getStringProperty("SCAN_ID");
-				return _ScanId;
-			}else {
-				return _ScanId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for SCAN_ID.
-	 * @param v Value to Set.
-	 */
-	public void setScanId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/SCAN_ID",v);
-		_ScanId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Status=null;
-
-	/**
-	 * @return Returns the status.
-	 */
-	public String getStatus(){
-		try{
-			if (_Status==null){
-				_Status=getStringProperty("status");
-				return _Status;
-			}else {
-				return _Status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for status.
-	 * @param v Value to Set.
-	 */
-	public void setStatus(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/status",v);
-		_Status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ValProtocoldataScanCheckId=null;
-
-	/**
-	 * @return Returns the val_protocolData_scan_check_id.
-	 */
-	public Integer getValProtocoldataScanCheckId() {
-		try{
-			if (_ValProtocoldataScanCheckId==null){
-				_ValProtocoldataScanCheckId=getIntegerProperty("val_protocolData_scan_check_id");
-				return _ValProtocoldataScanCheckId;
-			}else {
-				return _ValProtocoldataScanCheckId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for val_protocolData_scan_check_id.
-	 * @param v Value to Set.
-	 */
-	public void setValProtocoldataScanCheckId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/val_protocolData_scan_check_id",v);
-		_ValProtocoldataScanCheckId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck> getAllValProtocoldataScanChecks(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck> getValProtocoldataScanChecksByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck> getValProtocoldataScanChecksByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheck>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ValProtocoldataScanCheck getValProtocoldataScanChecksByValProtocoldataScanCheckId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("val:protocolData_scan_check/val_protocolData_scan_check_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ValProtocoldataScanCheck) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //conditions/condition
-	        for(org.nrg.xdat.model.ValProtocoldataScanCheckConditionI childConditions_condition : this.getConditions_condition()){
-	            if (childConditions_condition!=null){
-	              for(ResourceFile rf: ((ValProtocoldataScanCheckCondition)childConditions_condition).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("conditions/condition[" + ((ValProtocoldataScanCheckCondition)childConditions_condition).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("conditions/condition/" + ((ValProtocoldataScanCheckCondition)childConditions_condition).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //comments/comment
-	        for(org.nrg.xdat.model.ValProtocoldataScanCheckCommentI childComments_comment : this.getComments_comment()){
-	            if (childComments_comment!=null){
-	              for(ResourceFile rf: ((ValProtocoldataScanCheckComment)childComments_comment).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("comments/comment[" + ((ValProtocoldataScanCheckComment)childComments_comment).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("comments/comment/" + ((ValProtocoldataScanCheckComment)childComments_comment).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //additionalVal
-	        ValAdditionalval childAdditionalval = (ValAdditionalval)this.getAdditionalval();
-	            if (childAdditionalval!=null){
-	              for(ResourceFile rf: ((ValAdditionalval)childAdditionalval).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("additionalVal[" + ((ValAdditionalval)childAdditionalval).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("additionalVal/" + ((ValAdditionalval)childAdditionalval).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheckComment.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheckComment.java
deleted file mode 100644
index 428a97c3..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheckComment.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoValProtocoldataScanCheckComment extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ValProtocoldataScanCheckCommentI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoValProtocoldataScanCheckComment.class);
-	public static String SCHEMA_ELEMENT_NAME="val:protocolData_scan_check_comment";
-
-	public AutoValProtocoldataScanCheckComment(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoValProtocoldataScanCheckComment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoValProtocoldataScanCheckComment(UserI user)
-	 **/
-	public AutoValProtocoldataScanCheckComment(){}
-
-	public AutoValProtocoldataScanCheckComment(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "val:protocolData_scan_check_comment";
-	}
-
-	//FIELD
-
-	private String _Comment=null;
-
-	/**
-	 * @return Returns the comment.
-	 */
-	public String getComment(){
-		try{
-			if (_Comment==null){
-				_Comment=getStringProperty("comment");
-				return _Comment;
-			}else {
-				return _Comment;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for comment.
-	 * @param v Value to Set.
-	 */
-	public void setComment(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/comment",v);
-		_Comment=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Username=null;
-
-	/**
-	 * @return Returns the username.
-	 */
-	public String getUsername(){
-		try{
-			if (_Username==null){
-				_Username=getStringProperty("username");
-				return _Username;
-			}else {
-				return _Username;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for username.
-	 * @param v Value to Set.
-	 */
-	public void setUsername(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/username",v);
-		_Username=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Datetime=null;
-
-	/**
-	 * @return Returns the dateTime.
-	 */
-	public Object getDatetime(){
-		try{
-			if (_Datetime==null){
-				_Datetime=getProperty("dateTime");
-				return _Datetime;
-			}else {
-				return _Datetime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dateTime.
-	 * @param v Value to Set.
-	 */
-	public void setDatetime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dateTime",v);
-		_Datetime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ValProtocoldataScanCheckCommentId=null;
-
-	/**
-	 * @return Returns the val_protocolData_scan_check_comment_id.
-	 */
-	public Integer getValProtocoldataScanCheckCommentId() {
-		try{
-			if (_ValProtocoldataScanCheckCommentId==null){
-				_ValProtocoldataScanCheckCommentId=getIntegerProperty("val_protocolData_scan_check_comment_id");
-				return _ValProtocoldataScanCheckCommentId;
-			}else {
-				return _ValProtocoldataScanCheckCommentId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for val_protocolData_scan_check_comment_id.
-	 * @param v Value to Set.
-	 */
-	public void setValProtocoldataScanCheckCommentId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/val_protocolData_scan_check_comment_id",v);
-		_ValProtocoldataScanCheckCommentId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment> getAllValProtocoldataScanCheckComments(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment> getValProtocoldataScanCheckCommentsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment> getValProtocoldataScanCheckCommentsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckComment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ValProtocoldataScanCheckComment getValProtocoldataScanCheckCommentsByValProtocoldataScanCheckCommentId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("val:protocolData_scan_check_comment/val_protocolData_scan_check_comment_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ValProtocoldataScanCheckComment) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheckCondition.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheckCondition.java
deleted file mode 100644
index 9f383134..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoValProtocoldataScanCheckCondition.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoValProtocoldataScanCheckCondition extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.ValProtocoldataScanCheckConditionI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoValProtocoldataScanCheckCondition.class);
-	public static String SCHEMA_ELEMENT_NAME="val:protocolData_scan_check_condition";
-
-	public AutoValProtocoldataScanCheckCondition(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoValProtocoldataScanCheckCondition(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoValProtocoldataScanCheckCondition(UserI user)
-	 **/
-	public AutoValProtocoldataScanCheckCondition(){}
-
-	public AutoValProtocoldataScanCheckCondition(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "val:protocolData_scan_check_condition";
-	}
-
-	//FIELD
-
-	private String _Verified=null;
-
-	/**
-	 * @return Returns the verified.
-	 */
-	public String getVerified(){
-		try{
-			if (_Verified==null){
-				_Verified=getStringProperty("verified");
-				return _Verified;
-			}else {
-				return _Verified;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for verified.
-	 * @param v Value to Set.
-	 */
-	public void setVerified(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/verified",v);
-		_Verified=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Diagnosis=null;
-
-	/**
-	 * @return Returns the diagnosis.
-	 */
-	public String getDiagnosis(){
-		try{
-			if (_Diagnosis==null){
-				_Diagnosis=getStringProperty("diagnosis");
-				return _Diagnosis;
-			}else {
-				return _Diagnosis;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for diagnosis.
-	 * @param v Value to Set.
-	 */
-	public void setDiagnosis(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/diagnosis",v);
-		_Diagnosis=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Status=null;
-
-	/**
-	 * @return Returns the status.
-	 */
-	public String getStatus(){
-		try{
-			if (_Status==null){
-				_Status=getStringProperty("status");
-				return _Status;
-			}else {
-				return _Status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for status.
-	 * @param v Value to Set.
-	 */
-	public void setStatus(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/status",v);
-		_Status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Xmlpath=null;
-
-	/**
-	 * @return Returns the xmlpath.
-	 */
-	public String getXmlpath(){
-		try{
-			if (_Xmlpath==null){
-				_Xmlpath=getStringProperty("xmlpath");
-				return _Xmlpath;
-			}else {
-				return _Xmlpath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xmlpath.
-	 * @param v Value to Set.
-	 */
-	public void setXmlpath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xmlpath",v);
-		_Xmlpath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ValProtocoldataScanCheckConditionId=null;
-
-	/**
-	 * @return Returns the val_protocolData_scan_check_condition_id.
-	 */
-	public Integer getValProtocoldataScanCheckConditionId() {
-		try{
-			if (_ValProtocoldataScanCheckConditionId==null){
-				_ValProtocoldataScanCheckConditionId=getIntegerProperty("val_protocolData_scan_check_condition_id");
-				return _ValProtocoldataScanCheckConditionId;
-			}else {
-				return _ValProtocoldataScanCheckConditionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for val_protocolData_scan_check_condition_id.
-	 * @param v Value to Set.
-	 */
-	public void setValProtocoldataScanCheckConditionId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/val_protocolData_scan_check_condition_id",v);
-		_ValProtocoldataScanCheckConditionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition> getAllValProtocoldataScanCheckConditions(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition> getValProtocoldataScanCheckConditionsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition> getValProtocoldataScanCheckConditionsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition> al = new ArrayList<org.nrg.xdat.om.ValProtocoldataScanCheckCondition>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ValProtocoldataScanCheckCondition getValProtocoldataScanCheckConditionsByValProtocoldataScanCheckConditionId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("val:protocolData_scan_check_condition/val_protocolData_scan_check_condition_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (ValProtocoldataScanCheckCondition) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkAbstractexecutionenvironment.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkAbstractexecutionenvironment.java
deleted file mode 100644
index 59a740e1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkAbstractexecutionenvironment.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoWrkAbstractexecutionenvironment extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.WrkAbstractexecutionenvironmentI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoWrkAbstractexecutionenvironment.class);
-	public static String SCHEMA_ELEMENT_NAME="wrk:abstractExecutionEnvironment";
-
-	public AutoWrkAbstractexecutionenvironment(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoWrkAbstractexecutionenvironment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoWrkAbstractexecutionenvironment(UserI user)
-	 **/
-	public AutoWrkAbstractexecutionenvironment(){}
-
-	public AutoWrkAbstractexecutionenvironment(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "wrk:abstractExecutionEnvironment";
-	}
-
-	//FIELD
-
-	private Integer _WrkAbstractexecutionenvironmentId=null;
-
-	/**
-	 * @return Returns the wrk_abstractExecutionEnvironment_id.
-	 */
-	public Integer getWrkAbstractexecutionenvironmentId() {
-		try{
-			if (_WrkAbstractexecutionenvironmentId==null){
-				_WrkAbstractexecutionenvironmentId=getIntegerProperty("wrk_abstractExecutionEnvironment_id");
-				return _WrkAbstractexecutionenvironmentId;
-			}else {
-				return _WrkAbstractexecutionenvironmentId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for wrk_abstractExecutionEnvironment_id.
-	 * @param v Value to Set.
-	 */
-	public void setWrkAbstractexecutionenvironmentId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/wrk_abstractExecutionEnvironment_id",v);
-		_WrkAbstractexecutionenvironmentId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment> getAllWrkAbstractexecutionenvironments(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment> al = new ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment> getWrkAbstractexecutionenvironmentsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment> al = new ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment> getWrkAbstractexecutionenvironmentsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment> al = new ArrayList<org.nrg.xdat.om.WrkAbstractexecutionenvironment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static WrkAbstractexecutionenvironment getWrkAbstractexecutionenvironmentsByWrkAbstractexecutionenvironmentId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("wrk:abstractExecutionEnvironment/wrk_abstractExecutionEnvironment_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (WrkAbstractexecutionenvironment) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkWorkflowdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkWorkflowdata.java
deleted file mode 100644
index 87074f04..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkWorkflowdata.java
+++ /dev/null
@@ -1,827 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:03 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoWrkWorkflowdata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.WrkWorkflowdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoWrkWorkflowdata.class);
-	public static String SCHEMA_ELEMENT_NAME="wrk:workflowData";
-
-	public AutoWrkWorkflowdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoWrkWorkflowdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoWrkWorkflowdata(UserI user)
-	 **/
-	public AutoWrkWorkflowdata(){}
-
-	public AutoWrkWorkflowdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "wrk:workflowData";
-	}
-	 private org.nrg.xdat.om.WrkAbstractexecutionenvironment _Executionenvironment =null;
-
-	/**
-	 * executionEnvironment
-	 * @return org.nrg.xdat.om.WrkAbstractexecutionenvironment
-	 */
-	public org.nrg.xdat.om.WrkAbstractexecutionenvironment getExecutionenvironment() {
-		try{
-			if (_Executionenvironment==null){
-				_Executionenvironment=((WrkAbstractexecutionenvironment)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("executionEnvironment")));
-				return _Executionenvironment;
-			}else {
-				return _Executionenvironment;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for executionEnvironment.
-	 * @param v Value to Set.
-	 */
-	public void setExecutionenvironment(ItemI v) throws Exception{
-		_Executionenvironment =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/executionEnvironment",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/executionEnvironment",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * executionEnvironment
-	 * set org.nrg.xdat.model.WrkAbstractexecutionenvironmentI
-	 */
-	public <A extends org.nrg.xdat.model.WrkAbstractexecutionenvironmentI> void setExecutionenvironment(A item) throws Exception{
-	setExecutionenvironment((ItemI)item);
-	}
-
-	/**
-	 * Removes the executionEnvironment.
-	 * */
-	public void removeExecutionenvironment() {
-		_Executionenvironment =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/executionEnvironment",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ExecutionenvironmentFK=null;
-
-	/**
-	 * @return Returns the wrk:workflowData/executionenvironment_wrk_abstractexecutionenvironment_id.
-	 */
-	public Integer getExecutionenvironmentFK(){
-		try{
-			if (_ExecutionenvironmentFK==null){
-				_ExecutionenvironmentFK=getIntegerProperty("wrk:workflowData/executionenvironment_wrk_abstractexecutionenvironment_id");
-				return _ExecutionenvironmentFK;
-			}else {
-				return _ExecutionenvironmentFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for wrk:workflowData/executionenvironment_wrk_abstractexecutionenvironment_id.
-	 * @param v Value to Set.
-	 */
-	public void setExecutionenvironmentFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/executionenvironment_wrk_abstractexecutionenvironment_id",v);
-		_ExecutionenvironmentFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Comments=null;
-
-	/**
-	 * @return Returns the comments.
-	 */
-	public String getComments(){
-		try{
-			if (_Comments==null){
-				_Comments=getStringProperty("comments");
-				return _Comments;
-			}else {
-				return _Comments;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for comments.
-	 * @param v Value to Set.
-	 */
-	public void setComments(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/comments",v);
-		_Comments=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Details=null;
-
-	/**
-	 * @return Returns the details.
-	 */
-	public String getDetails(){
-		try{
-			if (_Details==null){
-				_Details=getStringProperty("details");
-				return _Details;
-			}else {
-				return _Details;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for details.
-	 * @param v Value to Set.
-	 */
-	public void setDetails(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/details",v);
-		_Details=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Justification=null;
-
-	/**
-	 * @return Returns the justification.
-	 */
-	public String getJustification(){
-		try{
-			if (_Justification==null){
-				_Justification=getStringProperty("justification");
-				return _Justification;
-			}else {
-				return _Justification;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for justification.
-	 * @param v Value to Set.
-	 */
-	public void setJustification(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/justification",v);
-		_Justification=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Src=null;
-
-	/**
-	 * @return Returns the src.
-	 */
-	public String getSrc(){
-		try{
-			if (_Src==null){
-				_Src=getStringProperty("src");
-				return _Src;
-			}else {
-				return _Src;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for src.
-	 * @param v Value to Set.
-	 */
-	public void setSrc(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/src",v);
-		_Src=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Type=null;
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType(){
-		try{
-			if (_Type==null){
-				_Type=getStringProperty("type");
-				return _Type;
-			}else {
-				return _Type;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for type.
-	 * @param v Value to Set.
-	 */
-	public void setType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/type",v);
-		_Type=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Category=null;
-
-	/**
-	 * @return Returns the category.
-	 */
-	public String getCategory(){
-		try{
-			if (_Category==null){
-				_Category=getStringProperty("category");
-				return _Category;
-			}else {
-				return _Category;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for category.
-	 * @param v Value to Set.
-	 */
-	public void setCategory(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/category",v);
-		_Category=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _DataType=null;
-
-	/**
-	 * @return Returns the data_type.
-	 */
-	public String getDataType(){
-		try{
-			if (_DataType==null){
-				_DataType=getStringProperty("data_type");
-				return _DataType;
-			}else {
-				return _DataType;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for data_type.
-	 * @param v Value to Set.
-	 */
-	public void setDataType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/data_type",v);
-		_DataType=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Externalid=null;
-
-	/**
-	 * @return Returns the ExternalID.
-	 */
-	public String getExternalid(){
-		try{
-			if (_Externalid==null){
-				_Externalid=getStringProperty("ExternalID");
-				return _Externalid;
-			}else {
-				return _Externalid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ExternalID.
-	 * @param v Value to Set.
-	 */
-	public void setExternalid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ExternalID",v);
-		_Externalid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _CurrentStepLaunchTime=null;
-
-	/**
-	 * @return Returns the current_step_launch_time.
-	 */
-	public Object getCurrentStepLaunchTime(){
-		try{
-			if (_CurrentStepLaunchTime==null){
-				_CurrentStepLaunchTime=getProperty("current_step_launch_time");
-				return _CurrentStepLaunchTime;
-			}else {
-				return _CurrentStepLaunchTime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for current_step_launch_time.
-	 * @param v Value to Set.
-	 */
-	public void setCurrentStepLaunchTime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/current_step_launch_time",v);
-		_CurrentStepLaunchTime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _CurrentStepId=null;
-
-	/**
-	 * @return Returns the current_step_id.
-	 */
-	public String getCurrentStepId(){
-		try{
-			if (_CurrentStepId==null){
-				_CurrentStepId=getStringProperty("current_step_id");
-				return _CurrentStepId;
-			}else {
-				return _CurrentStepId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for current_step_id.
-	 * @param v Value to Set.
-	 */
-	public void setCurrentStepId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/current_step_id",v);
-		_CurrentStepId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Status=null;
-
-	/**
-	 * @return Returns the status.
-	 */
-	public String getStatus(){
-		try{
-			if (_Status==null){
-				_Status=getStringProperty("status");
-				return _Status;
-			}else {
-				return _Status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for status.
-	 * @param v Value to Set.
-	 */
-	public void setStatus(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/status",v);
-		_Status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _CreateUser=null;
-
-	/**
-	 * @return Returns the create_user.
-	 */
-	public String getCreateUser(){
-		try{
-			if (_CreateUser==null){
-				_CreateUser=getStringProperty("create_user");
-				return _CreateUser;
-			}else {
-				return _CreateUser;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for create_user.
-	 * @param v Value to Set.
-	 */
-	public void setCreateUser(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/create_user",v);
-		_CreateUser=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _PipelineName=null;
-
-	/**
-	 * @return Returns the pipeline_name.
-	 */
-	public String getPipelineName(){
-		try{
-			if (_PipelineName==null){
-				_PipelineName=getStringProperty("pipeline_name");
-				return _PipelineName;
-			}else {
-				return _PipelineName;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pipeline_name.
-	 * @param v Value to Set.
-	 */
-	public void setPipelineName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pipeline_name",v);
-		_PipelineName=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _NextStepId=null;
-
-	/**
-	 * @return Returns the next_step_id.
-	 */
-	public String getNextStepId(){
-		try{
-			if (_NextStepId==null){
-				_NextStepId=getStringProperty("next_step_id");
-				return _NextStepId;
-			}else {
-				return _NextStepId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for next_step_id.
-	 * @param v Value to Set.
-	 */
-	public void setNextStepId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/next_step_id",v);
-		_NextStepId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _StepDescription=null;
-
-	/**
-	 * @return Returns the step_description.
-	 */
-	public String getStepDescription(){
-		try{
-			if (_StepDescription==null){
-				_StepDescription=getStringProperty("step_description");
-				return _StepDescription;
-			}else {
-				return _StepDescription;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for step_description.
-	 * @param v Value to Set.
-	 */
-	public void setStepDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/step_description",v);
-		_StepDescription=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _LaunchTime=null;
-
-	/**
-	 * @return Returns the launch_time.
-	 */
-	public Object getLaunchTime(){
-		try{
-			if (_LaunchTime==null){
-				_LaunchTime=getProperty("launch_time");
-				return _LaunchTime;
-			}else {
-				return _LaunchTime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for launch_time.
-	 * @param v Value to Set.
-	 */
-	public void setLaunchTime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/launch_time",v);
-		_LaunchTime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Percentagecomplete=null;
-
-	/**
-	 * @return Returns the percentageComplete.
-	 */
-	public String getPercentagecomplete(){
-		try{
-			if (_Percentagecomplete==null){
-				_Percentagecomplete=getStringProperty("percentageComplete");
-				return _Percentagecomplete;
-			}else {
-				return _Percentagecomplete;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for percentageComplete.
-	 * @param v Value to Set.
-	 */
-	public void setPercentagecomplete(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/percentageComplete",v);
-		_Percentagecomplete=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Jobid=null;
-
-	/**
-	 * @return Returns the jobID.
-	 */
-	public String getJobid(){
-		try{
-			if (_Jobid==null){
-				_Jobid=getStringProperty("jobID");
-				return _Jobid;
-			}else {
-				return _Jobid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for jobID.
-	 * @param v Value to Set.
-	 */
-	public void setJobid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/jobID",v);
-		_Jobid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _WrkWorkflowdataId=null;
-
-	/**
-	 * @return Returns the wrk_workflowData_id.
-	 */
-	public Integer getWrkWorkflowdataId() {
-		try{
-			if (_WrkWorkflowdataId==null){
-				_WrkWorkflowdataId=getIntegerProperty("wrk_workflowData_id");
-				return _WrkWorkflowdataId;
-			}else {
-				return _WrkWorkflowdataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for wrk_workflowData_id.
-	 * @param v Value to Set.
-	 */
-	public void setWrkWorkflowdataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/wrk_workflowData_id",v);
-		_WrkWorkflowdataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkWorkflowdata> getAllWrkWorkflowdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkWorkflowdata> al = new ArrayList<org.nrg.xdat.om.WrkWorkflowdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkWorkflowdata> getWrkWorkflowdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkWorkflowdata> al = new ArrayList<org.nrg.xdat.om.WrkWorkflowdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkWorkflowdata> getWrkWorkflowdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkWorkflowdata> al = new ArrayList<org.nrg.xdat.om.WrkWorkflowdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static WrkWorkflowdata getWrkWorkflowdatasByWrkWorkflowdataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("wrk:workflowData/wrk_workflowData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (WrkWorkflowdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //executionEnvironment
-	        WrkAbstractexecutionenvironment childExecutionenvironment = (WrkAbstractexecutionenvironment)this.getExecutionenvironment();
-	            if (childExecutionenvironment!=null){
-	              for(ResourceFile rf: ((WrkAbstractexecutionenvironment)childExecutionenvironment).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("executionEnvironment[" + ((WrkAbstractexecutionenvironment)childExecutionenvironment).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("executionEnvironment/" + ((WrkAbstractexecutionenvironment)childExecutionenvironment).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironment.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironment.java
deleted file mode 100644
index 34085533..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironment.java
+++ /dev/null
@@ -1,632 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoWrkXnatexecutionenvironment extends WrkAbstractexecutionenvironment implements org.nrg.xdat.model.WrkXnatexecutionenvironmentI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoWrkXnatexecutionenvironment.class);
-	public static String SCHEMA_ELEMENT_NAME="wrk:xnatExecutionEnvironment";
-
-	public AutoWrkXnatexecutionenvironment(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoWrkXnatexecutionenvironment(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoWrkXnatexecutionenvironment(UserI user)
-	 **/
-	public AutoWrkXnatexecutionenvironment(){}
-
-	public AutoWrkXnatexecutionenvironment(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "wrk:xnatExecutionEnvironment";
-	}
-	 private org.nrg.xdat.om.WrkAbstractexecutionenvironment _Abstractexecutionenvironment =null;
-
-	/**
-	 * abstractExecutionEnvironment
-	 * @return org.nrg.xdat.om.WrkAbstractexecutionenvironment
-	 */
-	public org.nrg.xdat.om.WrkAbstractexecutionenvironment getAbstractexecutionenvironment() {
-		try{
-			if (_Abstractexecutionenvironment==null){
-				_Abstractexecutionenvironment=((WrkAbstractexecutionenvironment)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractExecutionEnvironment")));
-				return _Abstractexecutionenvironment;
-			}else {
-				return _Abstractexecutionenvironment;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractExecutionEnvironment.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractexecutionenvironment(ItemI v) throws Exception{
-		_Abstractexecutionenvironment =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractExecutionEnvironment",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractExecutionEnvironment",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractExecutionEnvironment
-	 * set org.nrg.xdat.model.WrkAbstractexecutionenvironmentI
-	 */
-	public <A extends org.nrg.xdat.model.WrkAbstractexecutionenvironmentI> void setAbstractexecutionenvironment(A item) throws Exception{
-	setAbstractexecutionenvironment((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractExecutionEnvironment.
-	 * */
-	public void removeAbstractexecutionenvironment() {
-		_Abstractexecutionenvironment =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractExecutionEnvironment",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Pipeline=null;
-
-	/**
-	 * @return Returns the pipeline.
-	 */
-	public String getPipeline(){
-		try{
-			if (_Pipeline==null){
-				_Pipeline=getStringProperty("pipeline");
-				return _Pipeline;
-			}else {
-				return _Pipeline;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pipeline.
-	 * @param v Value to Set.
-	 */
-	public void setPipeline(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pipeline",v);
-		_Pipeline=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Xnatuser=null;
-
-	/**
-	 * @return Returns the xnatuser.
-	 */
-	public String getXnatuser(){
-		try{
-			if (_Xnatuser==null){
-				_Xnatuser=getStringProperty("xnatuser");
-				return _Xnatuser;
-			}else {
-				return _Xnatuser;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnatuser.
-	 * @param v Value to Set.
-	 */
-	public void setXnatuser(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnatuser",v);
-		_Xnatuser=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Host=null;
-
-	/**
-	 * @return Returns the host.
-	 */
-	public String getHost(){
-		try{
-			if (_Host==null){
-				_Host=getStringProperty("host");
-				return _Host;
-			}else {
-				return _Host;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for host.
-	 * @param v Value to Set.
-	 */
-	public void setHost(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/host",v);
-		_Host=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Startat=null;
-
-	/**
-	 * @return Returns the startAt.
-	 */
-	public String getStartat(){
-		try{
-			if (_Startat==null){
-				_Startat=getStringProperty("startAt");
-				return _Startat;
-			}else {
-				return _Startat;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for startAt.
-	 * @param v Value to Set.
-	 */
-	public void setStartat(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/startAt",v);
-		_Startat=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter> _Parameters_parameter =null;
-
-	/**
-	 * parameters/parameter
-	 * @return Returns an List of org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter
-	 */
-	public <A extends org.nrg.xdat.model.WrkXnatexecutionenvironmentParameterI> List<A> getParameters_parameter() {
-		try{
-			if (_Parameters_parameter==null){
-				_Parameters_parameter=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/parameter"));
-			}
-			return (List<A>) _Parameters_parameter;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter>();}
-	}
-
-	/**
-	 * Sets the value for parameters/parameter.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_parameter(ItemI v) throws Exception{
-		_Parameters_parameter =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/parameter
-	 * Adds org.nrg.xdat.model.WrkXnatexecutionenvironmentParameterI
-	 */
-	public <A extends org.nrg.xdat.model.WrkXnatexecutionenvironmentParameterI> void addParameters_parameter(A item) throws Exception{
-	setParameters_parameter((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/parameter of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_parameter(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_parameter =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/parameter",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify> _Notify =null;
-
-	/**
-	 * notify
-	 * @return Returns an List of org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify
-	 */
-	public <A extends org.nrg.xdat.model.WrkXnatexecutionenvironmentNotifyI> List<A> getNotify() {
-		try{
-			if (_Notify==null){
-				_Notify=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("notify"));
-			}
-			return (List<A>) _Notify;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify>();}
-	}
-
-	/**
-	 * Sets the value for notify.
-	 * @param v Value to Set.
-	 */
-	public void setNotify(ItemI v) throws Exception{
-		_Notify =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/notify",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/notify",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * notify
-	 * Adds org.nrg.xdat.model.WrkXnatexecutionenvironmentNotifyI
-	 */
-	public <A extends org.nrg.xdat.model.WrkXnatexecutionenvironmentNotifyI> void addNotify(A item) throws Exception{
-	setNotify((ItemI)item);
-	}
-
-	/**
-	 * Removes the notify of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeNotify(int index) throws java.lang.IndexOutOfBoundsException {
-		_Notify =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/notify",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Datatype=null;
-
-	/**
-	 * @return Returns the dataType.
-	 */
-	public String getDatatype(){
-		try{
-			if (_Datatype==null){
-				_Datatype=getStringProperty("dataType");
-				return _Datatype;
-			}else {
-				return _Datatype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dataType.
-	 * @param v Value to Set.
-	 */
-	public void setDatatype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dataType",v);
-		_Datatype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the id.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("id");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for id.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/id",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Supressnotification=null;
-
-	/**
-	 * @return Returns the supressNotification.
-	 */
-	public Boolean getSupressnotification() {
-		try{
-			if (_Supressnotification==null){
-				_Supressnotification=getBooleanProperty("supressNotification");
-				return _Supressnotification;
-			}else {
-				return _Supressnotification;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for supressNotification.
-	 * @param v Value to Set.
-	 */
-	public void setSupressnotification(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/supressNotification",v);
-		_Supressnotification=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Log=null;
-
-	/**
-	 * @return Returns the log.
-	 */
-	public String getLog(){
-		try{
-			if (_Log==null){
-				_Log=getStringProperty("log");
-				return _Log;
-			}else {
-				return _Log;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for log.
-	 * @param v Value to Set.
-	 */
-	public void setLog(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/log",v);
-		_Log=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Catalogpath=null;
-
-	/**
-	 * @return Returns the catalogPath.
-	 */
-	public String getCatalogpath(){
-		try{
-			if (_Catalogpath==null){
-				_Catalogpath=getStringProperty("catalogPath");
-				return _Catalogpath;
-			}else {
-				return _Catalogpath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for catalogPath.
-	 * @param v Value to Set.
-	 */
-	public void setCatalogpath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/catalogPath",v);
-		_Catalogpath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameterfile_xml=null;
-
-	/**
-	 * @return Returns the parameterFile/xml.
-	 */
-	public String getParameterfile_xml(){
-		try{
-			if (_Parameterfile_xml==null){
-				_Parameterfile_xml=getStringProperty("parameterFile/xml");
-				return _Parameterfile_xml;
-			}else {
-				return _Parameterfile_xml;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameterFile/xml.
-	 * @param v Value to Set.
-	 */
-	public void setParameterfile_xml(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameterFile/xml",v);
-		_Parameterfile_xml=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameterfile_path=null;
-
-	/**
-	 * @return Returns the parameterFile/path.
-	 */
-	public String getParameterfile_path(){
-		try{
-			if (_Parameterfile_path==null){
-				_Parameterfile_path=getStringProperty("parameterFile/path");
-				return _Parameterfile_path;
-			}else {
-				return _Parameterfile_path;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameterFile/path.
-	 * @param v Value to Set.
-	 */
-	public void setParameterfile_path(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameterFile/path",v);
-		_Parameterfile_path=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment> getAllWrkXnatexecutionenvironments(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment> getWrkXnatexecutionenvironmentsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment> getWrkXnatexecutionenvironmentsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironment>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static WrkXnatexecutionenvironment getWrkXnatexecutionenvironmentsByWrkAbstractexecutionenvironmentId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("wrk:xnatExecutionEnvironment/wrk_abstractexecutionenvironment_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (WrkXnatexecutionenvironment) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //abstractExecutionEnvironment
-	        WrkAbstractexecutionenvironment childAbstractexecutionenvironment = (WrkAbstractexecutionenvironment)this.getAbstractexecutionenvironment();
-	            if (childAbstractexecutionenvironment!=null){
-	              for(ResourceFile rf: ((WrkAbstractexecutionenvironment)childAbstractexecutionenvironment).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("abstractExecutionEnvironment[" + ((WrkAbstractexecutionenvironment)childAbstractexecutionenvironment).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("abstractExecutionEnvironment/" + ((WrkAbstractexecutionenvironment)childAbstractexecutionenvironment).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/parameter
-	        for(org.nrg.xdat.model.WrkXnatexecutionenvironmentParameterI childParameters_parameter : this.getParameters_parameter()){
-	            if (childParameters_parameter!=null){
-	              for(ResourceFile rf: ((WrkXnatexecutionenvironmentParameter)childParameters_parameter).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/parameter[" + ((WrkXnatexecutionenvironmentParameter)childParameters_parameter).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/parameter/" + ((WrkXnatexecutionenvironmentParameter)childParameters_parameter).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //notify
-	        for(org.nrg.xdat.model.WrkXnatexecutionenvironmentNotifyI childNotify : this.getNotify()){
-	            if (childNotify!=null){
-	              for(ResourceFile rf: ((WrkXnatexecutionenvironmentNotify)childNotify).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("notify[" + ((WrkXnatexecutionenvironmentNotify)childNotify).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("notify/" + ((WrkXnatexecutionenvironmentNotify)childNotify).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironmentNotify.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironmentNotify.java
deleted file mode 100644
index b0d3e8a0..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironmentNotify.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoWrkXnatexecutionenvironmentNotify extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.WrkXnatexecutionenvironmentNotifyI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoWrkXnatexecutionenvironmentNotify.class);
-	public static String SCHEMA_ELEMENT_NAME="wrk:xnatExecutionEnvironment_notify";
-
-	public AutoWrkXnatexecutionenvironmentNotify(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoWrkXnatexecutionenvironmentNotify(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoWrkXnatexecutionenvironmentNotify(UserI user)
-	 **/
-	public AutoWrkXnatexecutionenvironmentNotify(){}
-
-	public AutoWrkXnatexecutionenvironmentNotify(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "wrk:xnatExecutionEnvironment_notify";
-	}
-
-	//FIELD
-
-	private String _Notify=null;
-
-	/**
-	 * @return Returns the notify.
-	 */
-	public String getNotify(){
-		try{
-			if (_Notify==null){
-				_Notify=getStringProperty("notify");
-				return _Notify;
-			}else {
-				return _Notify;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for notify.
-	 * @param v Value to Set.
-	 */
-	public void setNotify(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/notify",v);
-		_Notify=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _WrkXnatexecutionenvironmentNotifyId=null;
-
-	/**
-	 * @return Returns the wrk_xnatExecutionEnvironment_notify_id.
-	 */
-	public Integer getWrkXnatexecutionenvironmentNotifyId() {
-		try{
-			if (_WrkXnatexecutionenvironmentNotifyId==null){
-				_WrkXnatexecutionenvironmentNotifyId=getIntegerProperty("wrk_xnatExecutionEnvironment_notify_id");
-				return _WrkXnatexecutionenvironmentNotifyId;
-			}else {
-				return _WrkXnatexecutionenvironmentNotifyId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for wrk_xnatExecutionEnvironment_notify_id.
-	 * @param v Value to Set.
-	 */
-	public void setWrkXnatexecutionenvironmentNotifyId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/wrk_xnatExecutionEnvironment_notify_id",v);
-		_WrkXnatexecutionenvironmentNotifyId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify> getAllWrkXnatexecutionenvironmentNotifys(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify> getWrkXnatexecutionenvironmentNotifysByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify> getWrkXnatexecutionenvironmentNotifysByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentNotify>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static WrkXnatexecutionenvironmentNotify getWrkXnatexecutionenvironmentNotifysByWrkXnatexecutionenvironmentNotifyId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("wrk:xnatExecutionEnvironment_notify/wrk_xnatExecutionEnvironment_notify_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (WrkXnatexecutionenvironmentNotify) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironmentParameter.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironmentParameter.java
deleted file mode 100644
index 08269994..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoWrkXnatexecutionenvironmentParameter.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:04 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoWrkXnatexecutionenvironmentParameter extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.WrkXnatexecutionenvironmentParameterI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoWrkXnatexecutionenvironmentParameter.class);
-	public static String SCHEMA_ELEMENT_NAME="wrk:xnatExecutionEnvironment_parameter";
-
-	public AutoWrkXnatexecutionenvironmentParameter(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoWrkXnatexecutionenvironmentParameter(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoWrkXnatexecutionenvironmentParameter(UserI user)
-	 **/
-	public AutoWrkXnatexecutionenvironmentParameter(){}
-
-	public AutoWrkXnatexecutionenvironmentParameter(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "wrk:xnatExecutionEnvironment_parameter";
-	}
-
-	//FIELD
-
-	private String _Parameter=null;
-
-	/**
-	 * @return Returns the parameter.
-	 */
-	public String getParameter(){
-		try{
-			if (_Parameter==null){
-				_Parameter=getStringProperty("parameter");
-				return _Parameter;
-			}else {
-				return _Parameter;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameter.
-	 * @param v Value to Set.
-	 */
-	public void setParameter(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameter",v);
-		_Parameter=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _WrkXnatexecutionenvironmentParameterId=null;
-
-	/**
-	 * @return Returns the wrk_xnatExecutionEnvironment_parameter_id.
-	 */
-	public Integer getWrkXnatexecutionenvironmentParameterId() {
-		try{
-			if (_WrkXnatexecutionenvironmentParameterId==null){
-				_WrkXnatexecutionenvironmentParameterId=getIntegerProperty("wrk_xnatExecutionEnvironment_parameter_id");
-				return _WrkXnatexecutionenvironmentParameterId;
-			}else {
-				return _WrkXnatexecutionenvironmentParameterId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for wrk_xnatExecutionEnvironment_parameter_id.
-	 * @param v Value to Set.
-	 */
-	public void setWrkXnatexecutionenvironmentParameterId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/wrk_xnatExecutionEnvironment_parameter_id",v);
-		_WrkXnatexecutionenvironmentParameterId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter> getAllWrkXnatexecutionenvironmentParameters(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter> getWrkXnatexecutionenvironmentParametersByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter> getWrkXnatexecutionenvironmentParametersByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter> al = new ArrayList<org.nrg.xdat.om.WrkXnatexecutionenvironmentParameter>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static WrkXnatexecutionenvironmentParameter getWrkXnatexecutionenvironmentParametersByWrkXnatexecutionenvironmentParameterId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("wrk:xnatExecutionEnvironment_parameter/wrk_xnatExecutionEnvironment_parameter_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (WrkXnatexecutionenvironmentParameter) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractdemographicdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractdemographicdata.java
deleted file mode 100644
index b26c8f2f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractdemographicdata.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAbstractdemographicdata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatAbstractdemographicdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAbstractdemographicdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:abstractDemographicData";
-
-	public AutoXnatAbstractdemographicdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAbstractdemographicdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAbstractdemographicdata(UserI user)
-	 **/
-	public AutoXnatAbstractdemographicdata(){}
-
-	public AutoXnatAbstractdemographicdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:abstractDemographicData";
-	}
-
-	//FIELD
-
-	private Integer _XnatAbstractdemographicdataId=null;
-
-	/**
-	 * @return Returns the xnat_abstractDemographicData_id.
-	 */
-	public Integer getXnatAbstractdemographicdataId() {
-		try{
-			if (_XnatAbstractdemographicdataId==null){
-				_XnatAbstractdemographicdataId=getIntegerProperty("xnat_abstractDemographicData_id");
-				return _XnatAbstractdemographicdataId;
-			}else {
-				return _XnatAbstractdemographicdataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_abstractDemographicData_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatAbstractdemographicdataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_abstractDemographicData_id",v);
-		_XnatAbstractdemographicdataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata> getAllXnatAbstractdemographicdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata> al = new ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata> getXnatAbstractdemographicdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata> al = new ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata> getXnatAbstractdemographicdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata> al = new ArrayList<org.nrg.xdat.om.XnatAbstractdemographicdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAbstractdemographicdata getXnatAbstractdemographicdatasByXnatAbstractdemographicdataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:abstractDemographicData/xnat_abstractDemographicData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAbstractdemographicdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractprotocol.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractprotocol.java
deleted file mode 100644
index c2510b38..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractprotocol.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAbstractprotocol extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatAbstractprotocolI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAbstractprotocol.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:abstractProtocol";
-
-	public AutoXnatAbstractprotocol(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAbstractprotocol(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAbstractprotocol(UserI user)
-	 **/
-	public AutoXnatAbstractprotocol(){}
-
-	public AutoXnatAbstractprotocol(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:abstractProtocol";
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _DataType=null;
-
-	/**
-	 * @return Returns the data-type.
-	 */
-	public String getDataType(){
-		try{
-			if (_DataType==null){
-				_DataType=getStringProperty("data-type");
-				return _DataType;
-			}else {
-				return _DataType;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for data-type.
-	 * @param v Value to Set.
-	 */
-	public void setDataType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/data-type",v);
-		_DataType=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatAbstractprotocolId=null;
-
-	/**
-	 * @return Returns the xnat_abstractProtocol_id.
-	 */
-	public Integer getXnatAbstractprotocolId() {
-		try{
-			if (_XnatAbstractprotocolId==null){
-				_XnatAbstractprotocolId=getIntegerProperty("xnat_abstractProtocol_id");
-				return _XnatAbstractprotocolId;
-			}else {
-				return _XnatAbstractprotocolId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_abstractProtocol_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatAbstractprotocolId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_abstractProtocol_id",v);
-		_XnatAbstractprotocolId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractprotocol> getAllXnatAbstractprotocols(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractprotocol> al = new ArrayList<org.nrg.xdat.om.XnatAbstractprotocol>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractprotocol> getXnatAbstractprotocolsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractprotocol> al = new ArrayList<org.nrg.xdat.om.XnatAbstractprotocol>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractprotocol> getXnatAbstractprotocolsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractprotocol> al = new ArrayList<org.nrg.xdat.om.XnatAbstractprotocol>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAbstractprotocol getXnatAbstractprotocolsByXnatAbstractprotocolId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:abstractProtocol/xnat_abstractProtocol_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAbstractprotocol) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatAbstractprotocol getXnatAbstractprotocolsById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:abstractProtocol/ID",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAbstractprotocol) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractresource.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractresource.java
deleted file mode 100644
index 57707a10..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractresource.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAbstractresource extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatAbstractresourceI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAbstractresource.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:abstractResource";
-
-	public AutoXnatAbstractresource(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAbstractresource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAbstractresource(UserI user)
-	 **/
-	public AutoXnatAbstractresource(){}
-
-	public AutoXnatAbstractresource(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:abstractResource";
-	}
-
-	//FIELD
-
-	private String _Note=null;
-
-	/**
-	 * @return Returns the note.
-	 */
-	public String getNote(){
-		try{
-			if (_Note==null){
-				_Note=getStringProperty("note");
-				return _Note;
-			}else {
-				return _Note;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for note.
-	 * @param v Value to Set.
-	 */
-	public void setNote(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/note",v);
-		_Note=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag> _Tags_tag =null;
-
-	/**
-	 * tags/tag
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresourceTag
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceTagI> List<A> getTags_tag() {
-		try{
-			if (_Tags_tag==null){
-				_Tags_tag=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("tags/tag"));
-			}
-			return (List<A>) _Tags_tag;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag>();}
-	}
-
-	/**
-	 * Sets the value for tags/tag.
-	 * @param v Value to Set.
-	 */
-	public void setTags_tag(ItemI v) throws Exception{
-		_Tags_tag =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/tags/tag",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/tags/tag",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * tags/tag
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceTagI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceTagI> void addTags_tag(A item) throws Exception{
-	setTags_tag((ItemI)item);
-	}
-
-	/**
-	 * Removes the tags/tag of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeTags_tag(int index) throws java.lang.IndexOutOfBoundsException {
-		_Tags_tag =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/tags/tag",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Label=null;
-
-	/**
-	 * @return Returns the label.
-	 */
-	public String getLabel(){
-		try{
-			if (_Label==null){
-				_Label=getStringProperty("label");
-				return _Label;
-			}else {
-				return _Label;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for label.
-	 * @param v Value to Set.
-	 */
-	public void setLabel(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/label",v);
-		_Label=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _FileCount=null;
-
-	/**
-	 * @return Returns the file_count.
-	 */
-	public Integer getFileCount() {
-		try{
-			if (_FileCount==null){
-				_FileCount=getIntegerProperty("file_count");
-				return _FileCount;
-			}else {
-				return _FileCount;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for file_count.
-	 * @param v Value to Set.
-	 */
-	public void setFileCount(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/file_count",v);
-		_FileCount=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _FileSize=null;
-
-	/**
-	 * @return Returns the file_size.
-	 */
-	public Object getFileSize(){
-		try{
-			if (_FileSize==null){
-				_FileSize=getProperty("file_size");
-				return _FileSize;
-			}else {
-				return _FileSize;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for file_size.
-	 * @param v Value to Set.
-	 */
-	public void setFileSize(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/file_size",v);
-		_FileSize=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatAbstractresourceId=null;
-
-	/**
-	 * @return Returns the xnat_abstractResource_id.
-	 */
-	public Integer getXnatAbstractresourceId() {
-		try{
-			if (_XnatAbstractresourceId==null){
-				_XnatAbstractresourceId=getIntegerProperty("xnat_abstractResource_id");
-				return _XnatAbstractresourceId;
-			}else {
-				return _XnatAbstractresourceId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_abstractResource_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatAbstractresourceId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_abstractResource_id",v);
-		_XnatAbstractresourceId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractresource> getAllXnatAbstractresources(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractresource> al = new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractresource> getXnatAbstractresourcesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractresource> al = new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractresource> getXnatAbstractresourcesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractresource> al = new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAbstractresource getXnatAbstractresourcesByXnatAbstractresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:abstractResource/xnat_abstractResource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAbstractresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	//ABSTRACT
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractresourceTag.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractresourceTag.java
deleted file mode 100644
index c36a17eb..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractresourceTag.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAbstractresourceTag extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatAbstractresourceTagI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAbstractresourceTag.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:abstractResource_tag";
-
-	public AutoXnatAbstractresourceTag(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAbstractresourceTag(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAbstractresourceTag(UserI user)
-	 **/
-	public AutoXnatAbstractresourceTag(){}
-
-	public AutoXnatAbstractresourceTag(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:abstractResource_tag";
-	}
-
-	//FIELD
-
-	private String _Tag=null;
-
-	/**
-	 * @return Returns the tag.
-	 */
-	public String getTag(){
-		try{
-			if (_Tag==null){
-				_Tag=getStringProperty("tag");
-				return _Tag;
-			}else {
-				return _Tag;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tag.
-	 * @param v Value to Set.
-	 */
-	public void setTag(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tag",v);
-		_Tag=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatAbstractresourceTagId=null;
-
-	/**
-	 * @return Returns the xnat_abstractResource_tag_id.
-	 */
-	public Integer getXnatAbstractresourceTagId() {
-		try{
-			if (_XnatAbstractresourceTagId==null){
-				_XnatAbstractresourceTagId=getIntegerProperty("xnat_abstractResource_tag_id");
-				return _XnatAbstractresourceTagId;
-			}else {
-				return _XnatAbstractresourceTagId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_abstractResource_tag_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatAbstractresourceTagId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_abstractResource_tag_id",v);
-		_XnatAbstractresourceTagId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag> getAllXnatAbstractresourceTags(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag> al = new ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag> getXnatAbstractresourceTagsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag> al = new ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag> getXnatAbstractresourceTagsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag> al = new ArrayList<org.nrg.xdat.om.XnatAbstractresourceTag>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAbstractresourceTag getXnatAbstractresourceTagsByXnatAbstractresourceTagId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:abstractResource_tag/xnat_abstractResource_tag_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAbstractresourceTag) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractstatistics.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractstatistics.java
deleted file mode 100644
index b4fc26b7..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractstatistics.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAbstractstatistics extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatAbstractstatisticsI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAbstractstatistics.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:abstractStatistics";
-
-	public AutoXnatAbstractstatistics(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAbstractstatistics(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAbstractstatistics(UserI user)
-	 **/
-	public AutoXnatAbstractstatistics(){}
-
-	public AutoXnatAbstractstatistics(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:abstractStatistics";
-	}
-
-	//FIELD
-
-	private Integer _XnatAbstractstatisticsId=null;
-
-	/**
-	 * @return Returns the xnat_abstractStatistics_id.
-	 */
-	public Integer getXnatAbstractstatisticsId() {
-		try{
-			if (_XnatAbstractstatisticsId==null){
-				_XnatAbstractstatisticsId=getIntegerProperty("xnat_abstractStatistics_id");
-				return _XnatAbstractstatisticsId;
-			}else {
-				return _XnatAbstractstatisticsId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_abstractStatistics_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatAbstractstatisticsId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_abstractStatistics_id",v);
-		_XnatAbstractstatisticsId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractstatistics> getAllXnatAbstractstatisticss(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractstatistics> al = new ArrayList<org.nrg.xdat.om.XnatAbstractstatistics>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractstatistics> getXnatAbstractstatisticssByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractstatistics> al = new ArrayList<org.nrg.xdat.om.XnatAbstractstatistics>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractstatistics> getXnatAbstractstatisticssByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractstatistics> al = new ArrayList<org.nrg.xdat.om.XnatAbstractstatistics>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAbstractstatistics getXnatAbstractstatisticssByXnatAbstractstatisticsId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:abstractStatistics/xnat_abstractStatistics_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAbstractstatistics) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractsubjectmetadata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractsubjectmetadata.java
deleted file mode 100644
index 36ce37ce..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAbstractsubjectmetadata.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAbstractsubjectmetadata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatAbstractsubjectmetadataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAbstractsubjectmetadata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:abstractSubjectMetadata";
-
-	public AutoXnatAbstractsubjectmetadata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAbstractsubjectmetadata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAbstractsubjectmetadata(UserI user)
-	 **/
-	public AutoXnatAbstractsubjectmetadata(){}
-
-	public AutoXnatAbstractsubjectmetadata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:abstractSubjectMetadata";
-	}
-
-	//FIELD
-
-	private Integer _XnatAbstractsubjectmetadataId=null;
-
-	/**
-	 * @return Returns the xnat_abstractSubjectMetadata_id.
-	 */
-	public Integer getXnatAbstractsubjectmetadataId() {
-		try{
-			if (_XnatAbstractsubjectmetadataId==null){
-				_XnatAbstractsubjectmetadataId=getIntegerProperty("xnat_abstractSubjectMetadata_id");
-				return _XnatAbstractsubjectmetadataId;
-			}else {
-				return _XnatAbstractsubjectmetadataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_abstractSubjectMetadata_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatAbstractsubjectmetadataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_abstractSubjectMetadata_id",v);
-		_XnatAbstractsubjectmetadataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata> getAllXnatAbstractsubjectmetadatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata> al = new ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata> getXnatAbstractsubjectmetadatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata> al = new ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata> getXnatAbstractsubjectmetadatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata> al = new ArrayList<org.nrg.xdat.om.XnatAbstractsubjectmetadata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAbstractsubjectmetadata getXnatAbstractsubjectmetadatasByXnatAbstractsubjectmetadataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:abstractSubjectMetadata/xnat_abstractSubjectMetadata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAbstractsubjectmetadata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAddfield.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAddfield.java
deleted file mode 100644
index ceb2f5b7..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAddfield.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAddfield extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatAddfieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAddfield.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:addField";
-
-	public AutoXnatAddfield(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAddfield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAddfield(UserI user)
-	 **/
-	public AutoXnatAddfield(){}
-
-	public AutoXnatAddfield(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:addField";
-	}
-
-	//FIELD
-
-	private String _Addfield=null;
-
-	/**
-	 * @return Returns the addField.
-	 */
-	public String getAddfield(){
-		try{
-			if (_Addfield==null){
-				_Addfield=getStringProperty("addField");
-				return _Addfield;
-			}else {
-				return _Addfield;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for addField.
-	 * @param v Value to Set.
-	 */
-	public void setAddfield(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/addField",v);
-		_Addfield=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatAddfieldId=null;
-
-	/**
-	 * @return Returns the xnat_addField_id.
-	 */
-	public Integer getXnatAddfieldId() {
-		try{
-			if (_XnatAddfieldId==null){
-				_XnatAddfieldId=getIntegerProperty("xnat_addField_id");
-				return _XnatAddfieldId;
-			}else {
-				return _XnatAddfieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_addField_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatAddfieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_addField_id",v);
-		_XnatAddfieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAddfield> getAllXnatAddfields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAddfield> al = new ArrayList<org.nrg.xdat.om.XnatAddfield>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAddfield> getXnatAddfieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAddfield> al = new ArrayList<org.nrg.xdat.om.XnatAddfield>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAddfield> getXnatAddfieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAddfield> al = new ArrayList<org.nrg.xdat.om.XnatAddfield>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAddfield getXnatAddfieldsByXnatAddfieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:addField/xnat_addField_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAddfield) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAscidresearchdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAscidresearchdata.java
deleted file mode 100644
index 2e347303..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAscidresearchdata.java
+++ /dev/null
@@ -1,4142 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:10 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAscidresearchdata extends XnatSubjectassessordata implements org.nrg.xdat.model.XnatAscidresearchdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAscidresearchdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat_a:scidResearchData";
-
-	public AutoXnatAscidresearchdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAscidresearchdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAscidresearchdata(UserI user)
-	 **/
-	public AutoXnatAscidresearchdata(){}
-
-	public AutoXnatAscidresearchdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat_a:scidResearchData";
-	}
-	 private org.nrg.xdat.om.XnatSubjectassessordata _Subjectassessordata =null;
-
-	/**
-	 * subjectAssessorData
-	 * @return org.nrg.xdat.om.XnatSubjectassessordata
-	 */
-	public org.nrg.xdat.om.XnatSubjectassessordata getSubjectassessordata() {
-		try{
-			if (_Subjectassessordata==null){
-				_Subjectassessordata=((XnatSubjectassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("subjectAssessorData")));
-				return _Subjectassessordata;
-			}else {
-				return _Subjectassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for subjectAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectassessordata(ItemI v) throws Exception{
-		_Subjectassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectAssessorData
-	 * set org.nrg.xdat.model.XnatSubjectassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> void setSubjectassessordata(A item) throws Exception{
-	setSubjectassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectAssessorData.
-	 * */
-	public void removeSubjectassessordata() {
-		_Subjectassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Administrator=null;
-
-	/**
-	 * @return Returns the administrator.
-	 */
-	public String getAdministrator(){
-		try{
-			if (_Administrator==null){
-				_Administrator=getStringProperty("administrator");
-				return _Administrator;
-			}else {
-				return _Administrator;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for administrator.
-	 * @param v Value to Set.
-	 */
-	public void setAdministrator(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/administrator",v);
-		_Administrator=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_currentmajordepressiveepisode=null;
-
-	/**
-	 * @return Returns the moodEpisodes/currentMajorDepressiveEpisode.
-	 */
-	public Integer getMoodepisodes_currentmajordepressiveepisode() {
-		try{
-			if (_Moodepisodes_currentmajordepressiveepisode==null){
-				_Moodepisodes_currentmajordepressiveepisode=getIntegerProperty("moodEpisodes/currentMajorDepressiveEpisode");
-				return _Moodepisodes_currentmajordepressiveepisode;
-			}else {
-				return _Moodepisodes_currentmajordepressiveepisode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/currentMajorDepressiveEpisode.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_currentmajordepressiveepisode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/currentMajorDepressiveEpisode",v);
-		_Moodepisodes_currentmajordepressiveepisode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_pastmajordepressiveepisode=null;
-
-	/**
-	 * @return Returns the moodEpisodes/pastMajorDepressiveEpisode.
-	 */
-	public Integer getMoodepisodes_pastmajordepressiveepisode() {
-		try{
-			if (_Moodepisodes_pastmajordepressiveepisode==null){
-				_Moodepisodes_pastmajordepressiveepisode=getIntegerProperty("moodEpisodes/pastMajorDepressiveEpisode");
-				return _Moodepisodes_pastmajordepressiveepisode;
-			}else {
-				return _Moodepisodes_pastmajordepressiveepisode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/pastMajorDepressiveEpisode.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_pastmajordepressiveepisode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/pastMajorDepressiveEpisode",v);
-		_Moodepisodes_pastmajordepressiveepisode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_currentmanicepisode=null;
-
-	/**
-	 * @return Returns the moodEpisodes/currentManicEpisode.
-	 */
-	public Integer getMoodepisodes_currentmanicepisode() {
-		try{
-			if (_Moodepisodes_currentmanicepisode==null){
-				_Moodepisodes_currentmanicepisode=getIntegerProperty("moodEpisodes/currentManicEpisode");
-				return _Moodepisodes_currentmanicepisode;
-			}else {
-				return _Moodepisodes_currentmanicepisode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/currentManicEpisode.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_currentmanicepisode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/currentManicEpisode",v);
-		_Moodepisodes_currentmanicepisode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_pastmanicepisode=null;
-
-	/**
-	 * @return Returns the moodEpisodes/pastManicEpisode.
-	 */
-	public Integer getMoodepisodes_pastmanicepisode() {
-		try{
-			if (_Moodepisodes_pastmanicepisode==null){
-				_Moodepisodes_pastmanicepisode=getIntegerProperty("moodEpisodes/pastManicEpisode");
-				return _Moodepisodes_pastmanicepisode;
-			}else {
-				return _Moodepisodes_pastmanicepisode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/pastManicEpisode.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_pastmanicepisode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/pastManicEpisode",v);
-		_Moodepisodes_pastmanicepisode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_currenthypomanicepisode=null;
-
-	/**
-	 * @return Returns the moodEpisodes/currentHypomanicEpisode.
-	 */
-	public Integer getMoodepisodes_currenthypomanicepisode() {
-		try{
-			if (_Moodepisodes_currenthypomanicepisode==null){
-				_Moodepisodes_currenthypomanicepisode=getIntegerProperty("moodEpisodes/currentHypomanicEpisode");
-				return _Moodepisodes_currenthypomanicepisode;
-			}else {
-				return _Moodepisodes_currenthypomanicepisode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/currentHypomanicEpisode.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_currenthypomanicepisode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/currentHypomanicEpisode",v);
-		_Moodepisodes_currenthypomanicepisode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_pasthypomanicepisode=null;
-
-	/**
-	 * @return Returns the moodEpisodes/pastHypomanicEpisode.
-	 */
-	public Integer getMoodepisodes_pasthypomanicepisode() {
-		try{
-			if (_Moodepisodes_pasthypomanicepisode==null){
-				_Moodepisodes_pasthypomanicepisode=getIntegerProperty("moodEpisodes/pastHypomanicEpisode");
-				return _Moodepisodes_pasthypomanicepisode;
-			}else {
-				return _Moodepisodes_pasthypomanicepisode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/pastHypomanicEpisode.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_pasthypomanicepisode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/pastHypomanicEpisode",v);
-		_Moodepisodes_pasthypomanicepisode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_currentdysthmicepisode=null;
-
-	/**
-	 * @return Returns the moodEpisodes/currentDysthmicEpisode.
-	 */
-	public Integer getMoodepisodes_currentdysthmicepisode() {
-		try{
-			if (_Moodepisodes_currentdysthmicepisode==null){
-				_Moodepisodes_currentdysthmicepisode=getIntegerProperty("moodEpisodes/currentDysthmicEpisode");
-				return _Moodepisodes_currentdysthmicepisode;
-			}else {
-				return _Moodepisodes_currentdysthmicepisode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/currentDysthmicEpisode.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_currentdysthmicepisode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/currentDysthmicEpisode",v);
-		_Moodepisodes_currentdysthmicepisode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_currentmooddisorderduetomedicalcondition=null;
-
-	/**
-	 * @return Returns the moodEpisodes/currentMoodDisorderDueToMedicalCondition.
-	 */
-	public Integer getMoodepisodes_currentmooddisorderduetomedicalcondition() {
-		try{
-			if (_Moodepisodes_currentmooddisorderduetomedicalcondition==null){
-				_Moodepisodes_currentmooddisorderduetomedicalcondition=getIntegerProperty("moodEpisodes/currentMoodDisorderDueToMedicalCondition");
-				return _Moodepisodes_currentmooddisorderduetomedicalcondition;
-			}else {
-				return _Moodepisodes_currentmooddisorderduetomedicalcondition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/currentMoodDisorderDueToMedicalCondition.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_currentmooddisorderduetomedicalcondition(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/currentMoodDisorderDueToMedicalCondition",v);
-		_Moodepisodes_currentmooddisorderduetomedicalcondition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_pastmooddisorderduetomedicalcondition=null;
-
-	/**
-	 * @return Returns the moodEpisodes/pastMoodDisorderDueToMedicalCondition.
-	 */
-	public Integer getMoodepisodes_pastmooddisorderduetomedicalcondition() {
-		try{
-			if (_Moodepisodes_pastmooddisorderduetomedicalcondition==null){
-				_Moodepisodes_pastmooddisorderduetomedicalcondition=getIntegerProperty("moodEpisodes/pastMoodDisorderDueToMedicalCondition");
-				return _Moodepisodes_pastmooddisorderduetomedicalcondition;
-			}else {
-				return _Moodepisodes_pastmooddisorderduetomedicalcondition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/pastMoodDisorderDueToMedicalCondition.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_pastmooddisorderduetomedicalcondition(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/pastMoodDisorderDueToMedicalCondition",v);
-		_Moodepisodes_pastmooddisorderduetomedicalcondition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_currentsubstanceinducedmooddisorder=null;
-
-	/**
-	 * @return Returns the moodEpisodes/currentSubstanceInducedMoodDisorder.
-	 */
-	public Integer getMoodepisodes_currentsubstanceinducedmooddisorder() {
-		try{
-			if (_Moodepisodes_currentsubstanceinducedmooddisorder==null){
-				_Moodepisodes_currentsubstanceinducedmooddisorder=getIntegerProperty("moodEpisodes/currentSubstanceInducedMoodDisorder");
-				return _Moodepisodes_currentsubstanceinducedmooddisorder;
-			}else {
-				return _Moodepisodes_currentsubstanceinducedmooddisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/currentSubstanceInducedMoodDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_currentsubstanceinducedmooddisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/currentSubstanceInducedMoodDisorder",v);
-		_Moodepisodes_currentsubstanceinducedmooddisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Moodepisodes_pastsubstanceinducedmooddisorder=null;
-
-	/**
-	 * @return Returns the moodEpisodes/pastSubstanceInducedMoodDisorder.
-	 */
-	public Integer getMoodepisodes_pastsubstanceinducedmooddisorder() {
-		try{
-			if (_Moodepisodes_pastsubstanceinducedmooddisorder==null){
-				_Moodepisodes_pastsubstanceinducedmooddisorder=getIntegerProperty("moodEpisodes/pastSubstanceInducedMoodDisorder");
-				return _Moodepisodes_pastsubstanceinducedmooddisorder;
-			}else {
-				return _Moodepisodes_pastsubstanceinducedmooddisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodEpisodes/pastSubstanceInducedMoodDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setMoodepisodes_pastsubstanceinducedmooddisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodEpisodes/pastSubstanceInducedMoodDisorder",v);
-		_Moodepisodes_pastsubstanceinducedmooddisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_currentdelusions=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/currentDelusions.
-	 */
-	public Integer getPsychoticsymptoms_currentdelusions() {
-		try{
-			if (_Psychoticsymptoms_currentdelusions==null){
-				_Psychoticsymptoms_currentdelusions=getIntegerProperty("psychoticSymptoms/currentDelusions");
-				return _Psychoticsymptoms_currentdelusions;
-			}else {
-				return _Psychoticsymptoms_currentdelusions;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/currentDelusions.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_currentdelusions(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/currentDelusions",v);
-		_Psychoticsymptoms_currentdelusions=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_pastdelusions=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/pastDelusions.
-	 */
-	public Integer getPsychoticsymptoms_pastdelusions() {
-		try{
-			if (_Psychoticsymptoms_pastdelusions==null){
-				_Psychoticsymptoms_pastdelusions=getIntegerProperty("psychoticSymptoms/pastDelusions");
-				return _Psychoticsymptoms_pastdelusions;
-			}else {
-				return _Psychoticsymptoms_pastdelusions;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/pastDelusions.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_pastdelusions(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/pastDelusions",v);
-		_Psychoticsymptoms_pastdelusions=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_currenthallucinations=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/currentHallucinations.
-	 */
-	public Integer getPsychoticsymptoms_currenthallucinations() {
-		try{
-			if (_Psychoticsymptoms_currenthallucinations==null){
-				_Psychoticsymptoms_currenthallucinations=getIntegerProperty("psychoticSymptoms/currentHallucinations");
-				return _Psychoticsymptoms_currenthallucinations;
-			}else {
-				return _Psychoticsymptoms_currenthallucinations;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/currentHallucinations.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_currenthallucinations(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/currentHallucinations",v);
-		_Psychoticsymptoms_currenthallucinations=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_pasthallucinations=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/pastHallucinations.
-	 */
-	public Integer getPsychoticsymptoms_pasthallucinations() {
-		try{
-			if (_Psychoticsymptoms_pasthallucinations==null){
-				_Psychoticsymptoms_pasthallucinations=getIntegerProperty("psychoticSymptoms/pastHallucinations");
-				return _Psychoticsymptoms_pasthallucinations;
-			}else {
-				return _Psychoticsymptoms_pasthallucinations;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/pastHallucinations.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_pasthallucinations(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/pastHallucinations",v);
-		_Psychoticsymptoms_pasthallucinations=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_currentdisorganizedspeechbehavior=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/currentDisorganizedSpeechBehavior.
-	 */
-	public Integer getPsychoticsymptoms_currentdisorganizedspeechbehavior() {
-		try{
-			if (_Psychoticsymptoms_currentdisorganizedspeechbehavior==null){
-				_Psychoticsymptoms_currentdisorganizedspeechbehavior=getIntegerProperty("psychoticSymptoms/currentDisorganizedSpeechBehavior");
-				return _Psychoticsymptoms_currentdisorganizedspeechbehavior;
-			}else {
-				return _Psychoticsymptoms_currentdisorganizedspeechbehavior;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/currentDisorganizedSpeechBehavior.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_currentdisorganizedspeechbehavior(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/currentDisorganizedSpeechBehavior",v);
-		_Psychoticsymptoms_currentdisorganizedspeechbehavior=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_pastdisorganizedspeechbehavior=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/pastDisorganizedSpeechBehavior.
-	 */
-	public Integer getPsychoticsymptoms_pastdisorganizedspeechbehavior() {
-		try{
-			if (_Psychoticsymptoms_pastdisorganizedspeechbehavior==null){
-				_Psychoticsymptoms_pastdisorganizedspeechbehavior=getIntegerProperty("psychoticSymptoms/pastDisorganizedSpeechBehavior");
-				return _Psychoticsymptoms_pastdisorganizedspeechbehavior;
-			}else {
-				return _Psychoticsymptoms_pastdisorganizedspeechbehavior;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/pastDisorganizedSpeechBehavior.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_pastdisorganizedspeechbehavior(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/pastDisorganizedSpeechBehavior",v);
-		_Psychoticsymptoms_pastdisorganizedspeechbehavior=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_currentcatatonicbehavior=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/currentCatatonicBehavior.
-	 */
-	public Integer getPsychoticsymptoms_currentcatatonicbehavior() {
-		try{
-			if (_Psychoticsymptoms_currentcatatonicbehavior==null){
-				_Psychoticsymptoms_currentcatatonicbehavior=getIntegerProperty("psychoticSymptoms/currentCatatonicBehavior");
-				return _Psychoticsymptoms_currentcatatonicbehavior;
-			}else {
-				return _Psychoticsymptoms_currentcatatonicbehavior;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/currentCatatonicBehavior.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_currentcatatonicbehavior(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/currentCatatonicBehavior",v);
-		_Psychoticsymptoms_currentcatatonicbehavior=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_pastcatatonicbehavior=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/pastCatatonicBehavior.
-	 */
-	public Integer getPsychoticsymptoms_pastcatatonicbehavior() {
-		try{
-			if (_Psychoticsymptoms_pastcatatonicbehavior==null){
-				_Psychoticsymptoms_pastcatatonicbehavior=getIntegerProperty("psychoticSymptoms/pastCatatonicBehavior");
-				return _Psychoticsymptoms_pastcatatonicbehavior;
-			}else {
-				return _Psychoticsymptoms_pastcatatonicbehavior;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/pastCatatonicBehavior.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_pastcatatonicbehavior(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/pastCatatonicBehavior",v);
-		_Psychoticsymptoms_pastcatatonicbehavior=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_currentnegativesymptoms=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/currentNegativeSymptoms.
-	 */
-	public Integer getPsychoticsymptoms_currentnegativesymptoms() {
-		try{
-			if (_Psychoticsymptoms_currentnegativesymptoms==null){
-				_Psychoticsymptoms_currentnegativesymptoms=getIntegerProperty("psychoticSymptoms/currentNegativeSymptoms");
-				return _Psychoticsymptoms_currentnegativesymptoms;
-			}else {
-				return _Psychoticsymptoms_currentnegativesymptoms;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/currentNegativeSymptoms.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_currentnegativesymptoms(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/currentNegativeSymptoms",v);
-		_Psychoticsymptoms_currentnegativesymptoms=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticsymptoms_pastnegativesymptoms=null;
-
-	/**
-	 * @return Returns the psychoticSymptoms/pastNegativeSymptoms.
-	 */
-	public Integer getPsychoticsymptoms_pastnegativesymptoms() {
-		try{
-			if (_Psychoticsymptoms_pastnegativesymptoms==null){
-				_Psychoticsymptoms_pastnegativesymptoms=getIntegerProperty("psychoticSymptoms/pastNegativeSymptoms");
-				return _Psychoticsymptoms_pastnegativesymptoms;
-			}else {
-				return _Psychoticsymptoms_pastnegativesymptoms;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticSymptoms/pastNegativeSymptoms.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticsymptoms_pastnegativesymptoms(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticSymptoms/pastNegativeSymptoms",v);
-		_Psychoticsymptoms_pastnegativesymptoms=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentschizophrenia=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentSchizophrenia.
-	 */
-	public Integer getPsychoticdisorders_currentschizophrenia() {
-		try{
-			if (_Psychoticdisorders_currentschizophrenia==null){
-				_Psychoticdisorders_currentschizophrenia=getIntegerProperty("psychoticDisorders/currentSchizophrenia");
-				return _Psychoticdisorders_currentschizophrenia;
-			}else {
-				return _Psychoticdisorders_currentschizophrenia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentSchizophrenia.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentschizophrenia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentSchizophrenia",v);
-		_Psychoticdisorders_currentschizophrenia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastschizophrenia=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastSchizophrenia.
-	 */
-	public Integer getPsychoticdisorders_pastschizophrenia() {
-		try{
-			if (_Psychoticdisorders_pastschizophrenia==null){
-				_Psychoticdisorders_pastschizophrenia=getIntegerProperty("psychoticDisorders/pastSchizophrenia");
-				return _Psychoticdisorders_pastschizophrenia;
-			}else {
-				return _Psychoticdisorders_pastschizophrenia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastSchizophrenia.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastschizophrenia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastSchizophrenia",v);
-		_Psychoticdisorders_pastschizophrenia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentparanoidtype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentParanoidType.
-	 */
-	public Integer getPsychoticdisorders_currentparanoidtype() {
-		try{
-			if (_Psychoticdisorders_currentparanoidtype==null){
-				_Psychoticdisorders_currentparanoidtype=getIntegerProperty("psychoticDisorders/currentParanoidType");
-				return _Psychoticdisorders_currentparanoidtype;
-			}else {
-				return _Psychoticdisorders_currentparanoidtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentParanoidType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentparanoidtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentParanoidType",v);
-		_Psychoticdisorders_currentparanoidtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastparanoidtype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastParanoidType.
-	 */
-	public Integer getPsychoticdisorders_pastparanoidtype() {
-		try{
-			if (_Psychoticdisorders_pastparanoidtype==null){
-				_Psychoticdisorders_pastparanoidtype=getIntegerProperty("psychoticDisorders/pastParanoidType");
-				return _Psychoticdisorders_pastparanoidtype;
-			}else {
-				return _Psychoticdisorders_pastparanoidtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastParanoidType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastparanoidtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastParanoidType",v);
-		_Psychoticdisorders_pastparanoidtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentcatatonictype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentCatatonicType.
-	 */
-	public Integer getPsychoticdisorders_currentcatatonictype() {
-		try{
-			if (_Psychoticdisorders_currentcatatonictype==null){
-				_Psychoticdisorders_currentcatatonictype=getIntegerProperty("psychoticDisorders/currentCatatonicType");
-				return _Psychoticdisorders_currentcatatonictype;
-			}else {
-				return _Psychoticdisorders_currentcatatonictype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentCatatonicType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentcatatonictype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentCatatonicType",v);
-		_Psychoticdisorders_currentcatatonictype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastcatatonictype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastCatatonicType.
-	 */
-	public Integer getPsychoticdisorders_pastcatatonictype() {
-		try{
-			if (_Psychoticdisorders_pastcatatonictype==null){
-				_Psychoticdisorders_pastcatatonictype=getIntegerProperty("psychoticDisorders/pastCatatonicType");
-				return _Psychoticdisorders_pastcatatonictype;
-			}else {
-				return _Psychoticdisorders_pastcatatonictype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastCatatonicType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastcatatonictype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastCatatonicType",v);
-		_Psychoticdisorders_pastcatatonictype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentdisorganizedtype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentDisorganizedType.
-	 */
-	public Integer getPsychoticdisorders_currentdisorganizedtype() {
-		try{
-			if (_Psychoticdisorders_currentdisorganizedtype==null){
-				_Psychoticdisorders_currentdisorganizedtype=getIntegerProperty("psychoticDisorders/currentDisorganizedType");
-				return _Psychoticdisorders_currentdisorganizedtype;
-			}else {
-				return _Psychoticdisorders_currentdisorganizedtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentDisorganizedType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentdisorganizedtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentDisorganizedType",v);
-		_Psychoticdisorders_currentdisorganizedtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastdisorganizedtype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastDisorganizedType.
-	 */
-	public Integer getPsychoticdisorders_pastdisorganizedtype() {
-		try{
-			if (_Psychoticdisorders_pastdisorganizedtype==null){
-				_Psychoticdisorders_pastdisorganizedtype=getIntegerProperty("psychoticDisorders/pastDisorganizedType");
-				return _Psychoticdisorders_pastdisorganizedtype;
-			}else {
-				return _Psychoticdisorders_pastdisorganizedtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastDisorganizedType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastdisorganizedtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastDisorganizedType",v);
-		_Psychoticdisorders_pastdisorganizedtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentundifferentiatedtype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentUndifferentiatedType.
-	 */
-	public Integer getPsychoticdisorders_currentundifferentiatedtype() {
-		try{
-			if (_Psychoticdisorders_currentundifferentiatedtype==null){
-				_Psychoticdisorders_currentundifferentiatedtype=getIntegerProperty("psychoticDisorders/currentUndifferentiatedType");
-				return _Psychoticdisorders_currentundifferentiatedtype;
-			}else {
-				return _Psychoticdisorders_currentundifferentiatedtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentUndifferentiatedType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentundifferentiatedtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentUndifferentiatedType",v);
-		_Psychoticdisorders_currentundifferentiatedtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastundifferentiatedtype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastUndifferentiatedType.
-	 */
-	public Integer getPsychoticdisorders_pastundifferentiatedtype() {
-		try{
-			if (_Psychoticdisorders_pastundifferentiatedtype==null){
-				_Psychoticdisorders_pastundifferentiatedtype=getIntegerProperty("psychoticDisorders/pastUndifferentiatedType");
-				return _Psychoticdisorders_pastundifferentiatedtype;
-			}else {
-				return _Psychoticdisorders_pastundifferentiatedtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastUndifferentiatedType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastundifferentiatedtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastUndifferentiatedType",v);
-		_Psychoticdisorders_pastundifferentiatedtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentresidualtype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentResidualType.
-	 */
-	public Integer getPsychoticdisorders_currentresidualtype() {
-		try{
-			if (_Psychoticdisorders_currentresidualtype==null){
-				_Psychoticdisorders_currentresidualtype=getIntegerProperty("psychoticDisorders/currentResidualType");
-				return _Psychoticdisorders_currentresidualtype;
-			}else {
-				return _Psychoticdisorders_currentresidualtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentResidualType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentresidualtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentResidualType",v);
-		_Psychoticdisorders_currentresidualtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastresidualtype=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastResidualType.
-	 */
-	public Integer getPsychoticdisorders_pastresidualtype() {
-		try{
-			if (_Psychoticdisorders_pastresidualtype==null){
-				_Psychoticdisorders_pastresidualtype=getIntegerProperty("psychoticDisorders/pastResidualType");
-				return _Psychoticdisorders_pastresidualtype;
-			}else {
-				return _Psychoticdisorders_pastresidualtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastResidualType.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastresidualtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastResidualType",v);
-		_Psychoticdisorders_pastresidualtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentschizophreniformdisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentSchizophreniformDisorder.
-	 */
-	public Integer getPsychoticdisorders_currentschizophreniformdisorder() {
-		try{
-			if (_Psychoticdisorders_currentschizophreniformdisorder==null){
-				_Psychoticdisorders_currentschizophreniformdisorder=getIntegerProperty("psychoticDisorders/currentSchizophreniformDisorder");
-				return _Psychoticdisorders_currentschizophreniformdisorder;
-			}else {
-				return _Psychoticdisorders_currentschizophreniformdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentSchizophreniformDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentschizophreniformdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentSchizophreniformDisorder",v);
-		_Psychoticdisorders_currentschizophreniformdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastschizophreniformdisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastSchizophreniformDisorder.
-	 */
-	public Integer getPsychoticdisorders_pastschizophreniformdisorder() {
-		try{
-			if (_Psychoticdisorders_pastschizophreniformdisorder==null){
-				_Psychoticdisorders_pastschizophreniformdisorder=getIntegerProperty("psychoticDisorders/pastSchizophreniformDisorder");
-				return _Psychoticdisorders_pastschizophreniformdisorder;
-			}else {
-				return _Psychoticdisorders_pastschizophreniformdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastSchizophreniformDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastschizophreniformdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastSchizophreniformDisorder",v);
-		_Psychoticdisorders_pastschizophreniformdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentschizoaffectivedisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentSchizoaffectiveDisorder.
-	 */
-	public Integer getPsychoticdisorders_currentschizoaffectivedisorder() {
-		try{
-			if (_Psychoticdisorders_currentschizoaffectivedisorder==null){
-				_Psychoticdisorders_currentschizoaffectivedisorder=getIntegerProperty("psychoticDisorders/currentSchizoaffectiveDisorder");
-				return _Psychoticdisorders_currentschizoaffectivedisorder;
-			}else {
-				return _Psychoticdisorders_currentschizoaffectivedisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentSchizoaffectiveDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentschizoaffectivedisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentSchizoaffectiveDisorder",v);
-		_Psychoticdisorders_currentschizoaffectivedisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastschizoaffectivedisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastSchizoaffectiveDisorder.
-	 */
-	public Integer getPsychoticdisorders_pastschizoaffectivedisorder() {
-		try{
-			if (_Psychoticdisorders_pastschizoaffectivedisorder==null){
-				_Psychoticdisorders_pastschizoaffectivedisorder=getIntegerProperty("psychoticDisorders/pastSchizoaffectiveDisorder");
-				return _Psychoticdisorders_pastschizoaffectivedisorder;
-			}else {
-				return _Psychoticdisorders_pastschizoaffectivedisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastSchizoaffectiveDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastschizoaffectivedisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastSchizoaffectiveDisorder",v);
-		_Psychoticdisorders_pastschizoaffectivedisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentdelusionaldisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentDelusionalDisorder.
-	 */
-	public Integer getPsychoticdisorders_currentdelusionaldisorder() {
-		try{
-			if (_Psychoticdisorders_currentdelusionaldisorder==null){
-				_Psychoticdisorders_currentdelusionaldisorder=getIntegerProperty("psychoticDisorders/currentDelusionalDisorder");
-				return _Psychoticdisorders_currentdelusionaldisorder;
-			}else {
-				return _Psychoticdisorders_currentdelusionaldisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentDelusionalDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentdelusionaldisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentDelusionalDisorder",v);
-		_Psychoticdisorders_currentdelusionaldisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastdelusionaldisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastDelusionalDisorder.
-	 */
-	public Integer getPsychoticdisorders_pastdelusionaldisorder() {
-		try{
-			if (_Psychoticdisorders_pastdelusionaldisorder==null){
-				_Psychoticdisorders_pastdelusionaldisorder=getIntegerProperty("psychoticDisorders/pastDelusionalDisorder");
-				return _Psychoticdisorders_pastdelusionaldisorder;
-			}else {
-				return _Psychoticdisorders_pastdelusionaldisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastDelusionalDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastdelusionaldisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastDelusionalDisorder",v);
-		_Psychoticdisorders_pastdelusionaldisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentbriefpsychoticdisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentBriefPsychoticDisorder.
-	 */
-	public Integer getPsychoticdisorders_currentbriefpsychoticdisorder() {
-		try{
-			if (_Psychoticdisorders_currentbriefpsychoticdisorder==null){
-				_Psychoticdisorders_currentbriefpsychoticdisorder=getIntegerProperty("psychoticDisorders/currentBriefPsychoticDisorder");
-				return _Psychoticdisorders_currentbriefpsychoticdisorder;
-			}else {
-				return _Psychoticdisorders_currentbriefpsychoticdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentBriefPsychoticDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentbriefpsychoticdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentBriefPsychoticDisorder",v);
-		_Psychoticdisorders_currentbriefpsychoticdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastbriefpsychoticdisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastBriefPsychoticDisorder.
-	 */
-	public Integer getPsychoticdisorders_pastbriefpsychoticdisorder() {
-		try{
-			if (_Psychoticdisorders_pastbriefpsychoticdisorder==null){
-				_Psychoticdisorders_pastbriefpsychoticdisorder=getIntegerProperty("psychoticDisorders/pastBriefPsychoticDisorder");
-				return _Psychoticdisorders_pastbriefpsychoticdisorder;
-			}else {
-				return _Psychoticdisorders_pastbriefpsychoticdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastBriefPsychoticDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastbriefpsychoticdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastBriefPsychoticDisorder",v);
-		_Psychoticdisorders_pastbriefpsychoticdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentpsychoticdisorderduetomedicalcondition=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentPsychoticDisorderDueToMedicalCondition.
-	 */
-	public Integer getPsychoticdisorders_currentpsychoticdisorderduetomedicalcondition() {
-		try{
-			if (_Psychoticdisorders_currentpsychoticdisorderduetomedicalcondition==null){
-				_Psychoticdisorders_currentpsychoticdisorderduetomedicalcondition=getIntegerProperty("psychoticDisorders/currentPsychoticDisorderDueToMedicalCondition");
-				return _Psychoticdisorders_currentpsychoticdisorderduetomedicalcondition;
-			}else {
-				return _Psychoticdisorders_currentpsychoticdisorderduetomedicalcondition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentPsychoticDisorderDueToMedicalCondition.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentpsychoticdisorderduetomedicalcondition(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentPsychoticDisorderDueToMedicalCondition",v);
-		_Psychoticdisorders_currentpsychoticdisorderduetomedicalcondition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastpsychoticdisorderduetomedicalcondition=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastPsychoticDisorderDueToMedicalCondition.
-	 */
-	public Integer getPsychoticdisorders_pastpsychoticdisorderduetomedicalcondition() {
-		try{
-			if (_Psychoticdisorders_pastpsychoticdisorderduetomedicalcondition==null){
-				_Psychoticdisorders_pastpsychoticdisorderduetomedicalcondition=getIntegerProperty("psychoticDisorders/pastPsychoticDisorderDueToMedicalCondition");
-				return _Psychoticdisorders_pastpsychoticdisorderduetomedicalcondition;
-			}else {
-				return _Psychoticdisorders_pastpsychoticdisorderduetomedicalcondition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastPsychoticDisorderDueToMedicalCondition.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastpsychoticdisorderduetomedicalcondition(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastPsychoticDisorderDueToMedicalCondition",v);
-		_Psychoticdisorders_pastpsychoticdisorderduetomedicalcondition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentsubstanceinducedpsychoticdisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentSubstanceInducedPsychoticDisorder.
-	 */
-	public Integer getPsychoticdisorders_currentsubstanceinducedpsychoticdisorder() {
-		try{
-			if (_Psychoticdisorders_currentsubstanceinducedpsychoticdisorder==null){
-				_Psychoticdisorders_currentsubstanceinducedpsychoticdisorder=getIntegerProperty("psychoticDisorders/currentSubstanceInducedPsychoticDisorder");
-				return _Psychoticdisorders_currentsubstanceinducedpsychoticdisorder;
-			}else {
-				return _Psychoticdisorders_currentsubstanceinducedpsychoticdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentSubstanceInducedPsychoticDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentsubstanceinducedpsychoticdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentSubstanceInducedPsychoticDisorder",v);
-		_Psychoticdisorders_currentsubstanceinducedpsychoticdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastsubstanceinducedpsychoticdisorder=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastSubstanceInducedPsychoticDisorder.
-	 */
-	public Integer getPsychoticdisorders_pastsubstanceinducedpsychoticdisorder() {
-		try{
-			if (_Psychoticdisorders_pastsubstanceinducedpsychoticdisorder==null){
-				_Psychoticdisorders_pastsubstanceinducedpsychoticdisorder=getIntegerProperty("psychoticDisorders/pastSubstanceInducedPsychoticDisorder");
-				return _Psychoticdisorders_pastsubstanceinducedpsychoticdisorder;
-			}else {
-				return _Psychoticdisorders_pastsubstanceinducedpsychoticdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastSubstanceInducedPsychoticDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastsubstanceinducedpsychoticdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastSubstanceInducedPsychoticDisorder",v);
-		_Psychoticdisorders_pastsubstanceinducedpsychoticdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_currentpsychoticdisordernos=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/currentPsychoticDisorderNOS.
-	 */
-	public Integer getPsychoticdisorders_currentpsychoticdisordernos() {
-		try{
-			if (_Psychoticdisorders_currentpsychoticdisordernos==null){
-				_Psychoticdisorders_currentpsychoticdisordernos=getIntegerProperty("psychoticDisorders/currentPsychoticDisorderNOS");
-				return _Psychoticdisorders_currentpsychoticdisordernos;
-			}else {
-				return _Psychoticdisorders_currentpsychoticdisordernos;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/currentPsychoticDisorderNOS.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_currentpsychoticdisordernos(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/currentPsychoticDisorderNOS",v);
-		_Psychoticdisorders_currentpsychoticdisordernos=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Psychoticdisorders_pastpsychoticdisordernos=null;
-
-	/**
-	 * @return Returns the psychoticDisorders/pastPsychoticDisorderNOS.
-	 */
-	public Integer getPsychoticdisorders_pastpsychoticdisordernos() {
-		try{
-			if (_Psychoticdisorders_pastpsychoticdisordernos==null){
-				_Psychoticdisorders_pastpsychoticdisordernos=getIntegerProperty("psychoticDisorders/pastPsychoticDisorderNOS");
-				return _Psychoticdisorders_pastpsychoticdisordernos;
-			}else {
-				return _Psychoticdisorders_pastpsychoticdisordernos;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for psychoticDisorders/pastPsychoticDisorderNOS.
-	 * @param v Value to Set.
-	 */
-	public void setPsychoticdisorders_pastpsychoticdisordernos(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/psychoticDisorders/pastPsychoticDisorderNOS",v);
-		_Psychoticdisorders_pastpsychoticdisordernos=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_currentbipolar1disorder=null;
-
-	/**
-	 * @return Returns the moodDisorders/currentBipolar1Disorder.
-	 */
-	public Integer getMooddisorders_currentbipolar1disorder() {
-		try{
-			if (_Mooddisorders_currentbipolar1disorder==null){
-				_Mooddisorders_currentbipolar1disorder=getIntegerProperty("moodDisorders/currentBipolar1Disorder");
-				return _Mooddisorders_currentbipolar1disorder;
-			}else {
-				return _Mooddisorders_currentbipolar1disorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/currentBipolar1Disorder.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_currentbipolar1disorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/currentBipolar1Disorder",v);
-		_Mooddisorders_currentbipolar1disorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_pastbipolar1disorder=null;
-
-	/**
-	 * @return Returns the moodDisorders/pastBipolar1Disorder.
-	 */
-	public Integer getMooddisorders_pastbipolar1disorder() {
-		try{
-			if (_Mooddisorders_pastbipolar1disorder==null){
-				_Mooddisorders_pastbipolar1disorder=getIntegerProperty("moodDisorders/pastBipolar1Disorder");
-				return _Mooddisorders_pastbipolar1disorder;
-			}else {
-				return _Mooddisorders_pastbipolar1disorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/pastBipolar1Disorder.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_pastbipolar1disorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/pastBipolar1Disorder",v);
-		_Mooddisorders_pastbipolar1disorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_currentbipolar2disorder=null;
-
-	/**
-	 * @return Returns the moodDisorders/currentBipolar2Disorder.
-	 */
-	public Integer getMooddisorders_currentbipolar2disorder() {
-		try{
-			if (_Mooddisorders_currentbipolar2disorder==null){
-				_Mooddisorders_currentbipolar2disorder=getIntegerProperty("moodDisorders/currentBipolar2Disorder");
-				return _Mooddisorders_currentbipolar2disorder;
-			}else {
-				return _Mooddisorders_currentbipolar2disorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/currentBipolar2Disorder.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_currentbipolar2disorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/currentBipolar2Disorder",v);
-		_Mooddisorders_currentbipolar2disorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_pastbipolar2disorder=null;
-
-	/**
-	 * @return Returns the moodDisorders/pastBipolar2Disorder.
-	 */
-	public Integer getMooddisorders_pastbipolar2disorder() {
-		try{
-			if (_Mooddisorders_pastbipolar2disorder==null){
-				_Mooddisorders_pastbipolar2disorder=getIntegerProperty("moodDisorders/pastBipolar2Disorder");
-				return _Mooddisorders_pastbipolar2disorder;
-			}else {
-				return _Mooddisorders_pastbipolar2disorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/pastBipolar2Disorder.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_pastbipolar2disorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/pastBipolar2Disorder",v);
-		_Mooddisorders_pastbipolar2disorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_currentotherbipolardisorder=null;
-
-	/**
-	 * @return Returns the moodDisorders/currentOtherBipolarDisorder.
-	 */
-	public Integer getMooddisorders_currentotherbipolardisorder() {
-		try{
-			if (_Mooddisorders_currentotherbipolardisorder==null){
-				_Mooddisorders_currentotherbipolardisorder=getIntegerProperty("moodDisorders/currentOtherBipolarDisorder");
-				return _Mooddisorders_currentotherbipolardisorder;
-			}else {
-				return _Mooddisorders_currentotherbipolardisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/currentOtherBipolarDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_currentotherbipolardisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/currentOtherBipolarDisorder",v);
-		_Mooddisorders_currentotherbipolardisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_pastotherbipolardisorder=null;
-
-	/**
-	 * @return Returns the moodDisorders/pastOtherBipolarDisorder.
-	 */
-	public Integer getMooddisorders_pastotherbipolardisorder() {
-		try{
-			if (_Mooddisorders_pastotherbipolardisorder==null){
-				_Mooddisorders_pastotherbipolardisorder=getIntegerProperty("moodDisorders/pastOtherBipolarDisorder");
-				return _Mooddisorders_pastotherbipolardisorder;
-			}else {
-				return _Mooddisorders_pastotherbipolardisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/pastOtherBipolarDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_pastotherbipolardisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/pastOtherBipolarDisorder",v);
-		_Mooddisorders_pastotherbipolardisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_currentmajordepressivedisorder=null;
-
-	/**
-	 * @return Returns the moodDisorders/currentMajorDepressiveDisorder.
-	 */
-	public Integer getMooddisorders_currentmajordepressivedisorder() {
-		try{
-			if (_Mooddisorders_currentmajordepressivedisorder==null){
-				_Mooddisorders_currentmajordepressivedisorder=getIntegerProperty("moodDisorders/currentMajorDepressiveDisorder");
-				return _Mooddisorders_currentmajordepressivedisorder;
-			}else {
-				return _Mooddisorders_currentmajordepressivedisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/currentMajorDepressiveDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_currentmajordepressivedisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/currentMajorDepressiveDisorder",v);
-		_Mooddisorders_currentmajordepressivedisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_pastmajordepressivedisorder=null;
-
-	/**
-	 * @return Returns the moodDisorders/pastMajorDepressiveDisorder.
-	 */
-	public Integer getMooddisorders_pastmajordepressivedisorder() {
-		try{
-			if (_Mooddisorders_pastmajordepressivedisorder==null){
-				_Mooddisorders_pastmajordepressivedisorder=getIntegerProperty("moodDisorders/pastMajorDepressiveDisorder");
-				return _Mooddisorders_pastmajordepressivedisorder;
-			}else {
-				return _Mooddisorders_pastmajordepressivedisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/pastMajorDepressiveDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_pastmajordepressivedisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/pastMajorDepressiveDisorder",v);
-		_Mooddisorders_pastmajordepressivedisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_currentdepressivedisordernos=null;
-
-	/**
-	 * @return Returns the moodDisorders/currentDepressiveDisorderNOS.
-	 */
-	public Integer getMooddisorders_currentdepressivedisordernos() {
-		try{
-			if (_Mooddisorders_currentdepressivedisordernos==null){
-				_Mooddisorders_currentdepressivedisordernos=getIntegerProperty("moodDisorders/currentDepressiveDisorderNOS");
-				return _Mooddisorders_currentdepressivedisordernos;
-			}else {
-				return _Mooddisorders_currentdepressivedisordernos;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/currentDepressiveDisorderNOS.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_currentdepressivedisordernos(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/currentDepressiveDisorderNOS",v);
-		_Mooddisorders_currentdepressivedisordernos=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Mooddisorders_pastdepressivedisordernos=null;
-
-	/**
-	 * @return Returns the moodDisorders/pastDepressiveDisorderNOS.
-	 */
-	public Integer getMooddisorders_pastdepressivedisordernos() {
-		try{
-			if (_Mooddisorders_pastdepressivedisordernos==null){
-				_Mooddisorders_pastdepressivedisordernos=getIntegerProperty("moodDisorders/pastDepressiveDisorderNOS");
-				return _Mooddisorders_pastdepressivedisordernos;
-			}else {
-				return _Mooddisorders_pastdepressivedisordernos;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for moodDisorders/pastDepressiveDisorderNOS.
-	 * @param v Value to Set.
-	 */
-	public void setMooddisorders_pastdepressivedisordernos(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/moodDisorders/pastDepressiveDisorderNOS",v);
-		_Mooddisorders_pastdepressivedisordernos=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentalcoholdependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentAlcoholDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentalcoholdependence() {
-		try{
-			if (_Substanceusedisorders_currentalcoholdependence==null){
-				_Substanceusedisorders_currentalcoholdependence=getIntegerProperty("substanceUseDisorders/currentAlcoholDependence");
-				return _Substanceusedisorders_currentalcoholdependence;
-			}else {
-				return _Substanceusedisorders_currentalcoholdependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentAlcoholDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentalcoholdependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentAlcoholDependence",v);
-		_Substanceusedisorders_currentalcoholdependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastalcoholdependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastAlcoholDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastalcoholdependence() {
-		try{
-			if (_Substanceusedisorders_pastalcoholdependence==null){
-				_Substanceusedisorders_pastalcoholdependence=getIntegerProperty("substanceUseDisorders/pastAlcoholDependence");
-				return _Substanceusedisorders_pastalcoholdependence;
-			}else {
-				return _Substanceusedisorders_pastalcoholdependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastAlcoholDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastalcoholdependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastAlcoholDependence",v);
-		_Substanceusedisorders_pastalcoholdependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentalcoholabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentAlcoholAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currentalcoholabuse() {
-		try{
-			if (_Substanceusedisorders_currentalcoholabuse==null){
-				_Substanceusedisorders_currentalcoholabuse=getIntegerProperty("substanceUseDisorders/currentAlcoholAbuse");
-				return _Substanceusedisorders_currentalcoholabuse;
-			}else {
-				return _Substanceusedisorders_currentalcoholabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentAlcoholAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentalcoholabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentAlcoholAbuse",v);
-		_Substanceusedisorders_currentalcoholabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastalcoholabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastAlcoholAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pastalcoholabuse() {
-		try{
-			if (_Substanceusedisorders_pastalcoholabuse==null){
-				_Substanceusedisorders_pastalcoholabuse=getIntegerProperty("substanceUseDisorders/pastAlcoholAbuse");
-				return _Substanceusedisorders_pastalcoholabuse;
-			}else {
-				return _Substanceusedisorders_pastalcoholabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastAlcoholAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastalcoholabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastAlcoholAbuse",v);
-		_Substanceusedisorders_pastalcoholabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentamphetaminedependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentAmphetamineDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentamphetaminedependence() {
-		try{
-			if (_Substanceusedisorders_currentamphetaminedependence==null){
-				_Substanceusedisorders_currentamphetaminedependence=getIntegerProperty("substanceUseDisorders/currentAmphetamineDependence");
-				return _Substanceusedisorders_currentamphetaminedependence;
-			}else {
-				return _Substanceusedisorders_currentamphetaminedependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentAmphetamineDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentamphetaminedependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentAmphetamineDependence",v);
-		_Substanceusedisorders_currentamphetaminedependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastamphetaminedependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastAmphetamineDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastamphetaminedependence() {
-		try{
-			if (_Substanceusedisorders_pastamphetaminedependence==null){
-				_Substanceusedisorders_pastamphetaminedependence=getIntegerProperty("substanceUseDisorders/pastAmphetamineDependence");
-				return _Substanceusedisorders_pastamphetaminedependence;
-			}else {
-				return _Substanceusedisorders_pastamphetaminedependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastAmphetamineDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastamphetaminedependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastAmphetamineDependence",v);
-		_Substanceusedisorders_pastamphetaminedependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentamphetamineabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentAmphetamineAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currentamphetamineabuse() {
-		try{
-			if (_Substanceusedisorders_currentamphetamineabuse==null){
-				_Substanceusedisorders_currentamphetamineabuse=getIntegerProperty("substanceUseDisorders/currentAmphetamineAbuse");
-				return _Substanceusedisorders_currentamphetamineabuse;
-			}else {
-				return _Substanceusedisorders_currentamphetamineabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentAmphetamineAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentamphetamineabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentAmphetamineAbuse",v);
-		_Substanceusedisorders_currentamphetamineabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastamphetamineabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastAmphetamineAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pastamphetamineabuse() {
-		try{
-			if (_Substanceusedisorders_pastamphetamineabuse==null){
-				_Substanceusedisorders_pastamphetamineabuse=getIntegerProperty("substanceUseDisorders/pastAmphetamineAbuse");
-				return _Substanceusedisorders_pastamphetamineabuse;
-			}else {
-				return _Substanceusedisorders_pastamphetamineabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastAmphetamineAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastamphetamineabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastAmphetamineAbuse",v);
-		_Substanceusedisorders_pastamphetamineabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentcannabisdependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentCannabisDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentcannabisdependence() {
-		try{
-			if (_Substanceusedisorders_currentcannabisdependence==null){
-				_Substanceusedisorders_currentcannabisdependence=getIntegerProperty("substanceUseDisorders/currentCannabisDependence");
-				return _Substanceusedisorders_currentcannabisdependence;
-			}else {
-				return _Substanceusedisorders_currentcannabisdependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentCannabisDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentcannabisdependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentCannabisDependence",v);
-		_Substanceusedisorders_currentcannabisdependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastcannabisdependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastCannabisDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastcannabisdependence() {
-		try{
-			if (_Substanceusedisorders_pastcannabisdependence==null){
-				_Substanceusedisorders_pastcannabisdependence=getIntegerProperty("substanceUseDisorders/pastCannabisDependence");
-				return _Substanceusedisorders_pastcannabisdependence;
-			}else {
-				return _Substanceusedisorders_pastcannabisdependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastCannabisDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastcannabisdependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastCannabisDependence",v);
-		_Substanceusedisorders_pastcannabisdependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentcannabisabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentCannabisAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currentcannabisabuse() {
-		try{
-			if (_Substanceusedisorders_currentcannabisabuse==null){
-				_Substanceusedisorders_currentcannabisabuse=getIntegerProperty("substanceUseDisorders/currentCannabisAbuse");
-				return _Substanceusedisorders_currentcannabisabuse;
-			}else {
-				return _Substanceusedisorders_currentcannabisabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentCannabisAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentcannabisabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentCannabisAbuse",v);
-		_Substanceusedisorders_currentcannabisabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastcannabisabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastCannabisAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pastcannabisabuse() {
-		try{
-			if (_Substanceusedisorders_pastcannabisabuse==null){
-				_Substanceusedisorders_pastcannabisabuse=getIntegerProperty("substanceUseDisorders/pastCannabisAbuse");
-				return _Substanceusedisorders_pastcannabisabuse;
-			}else {
-				return _Substanceusedisorders_pastcannabisabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastCannabisAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastcannabisabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastCannabisAbuse",v);
-		_Substanceusedisorders_pastcannabisabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentcocainedependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentCocaineDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentcocainedependence() {
-		try{
-			if (_Substanceusedisorders_currentcocainedependence==null){
-				_Substanceusedisorders_currentcocainedependence=getIntegerProperty("substanceUseDisorders/currentCocaineDependence");
-				return _Substanceusedisorders_currentcocainedependence;
-			}else {
-				return _Substanceusedisorders_currentcocainedependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentCocaineDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentcocainedependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentCocaineDependence",v);
-		_Substanceusedisorders_currentcocainedependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastcocainedependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastCocaineDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastcocainedependence() {
-		try{
-			if (_Substanceusedisorders_pastcocainedependence==null){
-				_Substanceusedisorders_pastcocainedependence=getIntegerProperty("substanceUseDisorders/pastCocaineDependence");
-				return _Substanceusedisorders_pastcocainedependence;
-			}else {
-				return _Substanceusedisorders_pastcocainedependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastCocaineDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastcocainedependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastCocaineDependence",v);
-		_Substanceusedisorders_pastcocainedependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentcocaineabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentCocaineAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currentcocaineabuse() {
-		try{
-			if (_Substanceusedisorders_currentcocaineabuse==null){
-				_Substanceusedisorders_currentcocaineabuse=getIntegerProperty("substanceUseDisorders/currentCocaineAbuse");
-				return _Substanceusedisorders_currentcocaineabuse;
-			}else {
-				return _Substanceusedisorders_currentcocaineabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentCocaineAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentcocaineabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentCocaineAbuse",v);
-		_Substanceusedisorders_currentcocaineabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastcocaineabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastCocaineAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pastcocaineabuse() {
-		try{
-			if (_Substanceusedisorders_pastcocaineabuse==null){
-				_Substanceusedisorders_pastcocaineabuse=getIntegerProperty("substanceUseDisorders/pastCocaineAbuse");
-				return _Substanceusedisorders_pastcocaineabuse;
-			}else {
-				return _Substanceusedisorders_pastcocaineabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastCocaineAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastcocaineabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastCocaineAbuse",v);
-		_Substanceusedisorders_pastcocaineabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currenthallucinogendependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentHallucinogenDependence.
-	 */
-	public Integer getSubstanceusedisorders_currenthallucinogendependence() {
-		try{
-			if (_Substanceusedisorders_currenthallucinogendependence==null){
-				_Substanceusedisorders_currenthallucinogendependence=getIntegerProperty("substanceUseDisorders/currentHallucinogenDependence");
-				return _Substanceusedisorders_currenthallucinogendependence;
-			}else {
-				return _Substanceusedisorders_currenthallucinogendependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentHallucinogenDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currenthallucinogendependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentHallucinogenDependence",v);
-		_Substanceusedisorders_currenthallucinogendependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pasthallucinogendependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastHallucinogenDependence.
-	 */
-	public Integer getSubstanceusedisorders_pasthallucinogendependence() {
-		try{
-			if (_Substanceusedisorders_pasthallucinogendependence==null){
-				_Substanceusedisorders_pasthallucinogendependence=getIntegerProperty("substanceUseDisorders/pastHallucinogenDependence");
-				return _Substanceusedisorders_pasthallucinogendependence;
-			}else {
-				return _Substanceusedisorders_pasthallucinogendependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastHallucinogenDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pasthallucinogendependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastHallucinogenDependence",v);
-		_Substanceusedisorders_pasthallucinogendependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currenthallucinogenabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentHallucinogenAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currenthallucinogenabuse() {
-		try{
-			if (_Substanceusedisorders_currenthallucinogenabuse==null){
-				_Substanceusedisorders_currenthallucinogenabuse=getIntegerProperty("substanceUseDisorders/currentHallucinogenAbuse");
-				return _Substanceusedisorders_currenthallucinogenabuse;
-			}else {
-				return _Substanceusedisorders_currenthallucinogenabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentHallucinogenAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currenthallucinogenabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentHallucinogenAbuse",v);
-		_Substanceusedisorders_currenthallucinogenabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pasthallucinogenabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastHallucinogenAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pasthallucinogenabuse() {
-		try{
-			if (_Substanceusedisorders_pasthallucinogenabuse==null){
-				_Substanceusedisorders_pasthallucinogenabuse=getIntegerProperty("substanceUseDisorders/pastHallucinogenAbuse");
-				return _Substanceusedisorders_pasthallucinogenabuse;
-			}else {
-				return _Substanceusedisorders_pasthallucinogenabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastHallucinogenAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pasthallucinogenabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastHallucinogenAbuse",v);
-		_Substanceusedisorders_pasthallucinogenabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentopioiddependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentOpioidDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentopioiddependence() {
-		try{
-			if (_Substanceusedisorders_currentopioiddependence==null){
-				_Substanceusedisorders_currentopioiddependence=getIntegerProperty("substanceUseDisorders/currentOpioidDependence");
-				return _Substanceusedisorders_currentopioiddependence;
-			}else {
-				return _Substanceusedisorders_currentopioiddependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentOpioidDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentopioiddependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentOpioidDependence",v);
-		_Substanceusedisorders_currentopioiddependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastopioiddependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastOpioidDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastopioiddependence() {
-		try{
-			if (_Substanceusedisorders_pastopioiddependence==null){
-				_Substanceusedisorders_pastopioiddependence=getIntegerProperty("substanceUseDisorders/pastOpioidDependence");
-				return _Substanceusedisorders_pastopioiddependence;
-			}else {
-				return _Substanceusedisorders_pastopioiddependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastOpioidDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastopioiddependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastOpioidDependence",v);
-		_Substanceusedisorders_pastopioiddependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentopioidabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentOpioidAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currentopioidabuse() {
-		try{
-			if (_Substanceusedisorders_currentopioidabuse==null){
-				_Substanceusedisorders_currentopioidabuse=getIntegerProperty("substanceUseDisorders/currentOpioidAbuse");
-				return _Substanceusedisorders_currentopioidabuse;
-			}else {
-				return _Substanceusedisorders_currentopioidabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentOpioidAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentopioidabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentOpioidAbuse",v);
-		_Substanceusedisorders_currentopioidabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastopioidabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastOpioidAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pastopioidabuse() {
-		try{
-			if (_Substanceusedisorders_pastopioidabuse==null){
-				_Substanceusedisorders_pastopioidabuse=getIntegerProperty("substanceUseDisorders/pastOpioidAbuse");
-				return _Substanceusedisorders_pastopioidabuse;
-			}else {
-				return _Substanceusedisorders_pastopioidabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastOpioidAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastopioidabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastOpioidAbuse",v);
-		_Substanceusedisorders_pastopioidabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentphencyclidinedependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentPhencyclidineDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentphencyclidinedependence() {
-		try{
-			if (_Substanceusedisorders_currentphencyclidinedependence==null){
-				_Substanceusedisorders_currentphencyclidinedependence=getIntegerProperty("substanceUseDisorders/currentPhencyclidineDependence");
-				return _Substanceusedisorders_currentphencyclidinedependence;
-			}else {
-				return _Substanceusedisorders_currentphencyclidinedependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentPhencyclidineDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentphencyclidinedependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentPhencyclidineDependence",v);
-		_Substanceusedisorders_currentphencyclidinedependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastphencyclidinedependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastPhencyclidineDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastphencyclidinedependence() {
-		try{
-			if (_Substanceusedisorders_pastphencyclidinedependence==null){
-				_Substanceusedisorders_pastphencyclidinedependence=getIntegerProperty("substanceUseDisorders/pastPhencyclidineDependence");
-				return _Substanceusedisorders_pastphencyclidinedependence;
-			}else {
-				return _Substanceusedisorders_pastphencyclidinedependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastPhencyclidineDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastphencyclidinedependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastPhencyclidineDependence",v);
-		_Substanceusedisorders_pastphencyclidinedependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentphencyclidineabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentPhencyclidineAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currentphencyclidineabuse() {
-		try{
-			if (_Substanceusedisorders_currentphencyclidineabuse==null){
-				_Substanceusedisorders_currentphencyclidineabuse=getIntegerProperty("substanceUseDisorders/currentPhencyclidineAbuse");
-				return _Substanceusedisorders_currentphencyclidineabuse;
-			}else {
-				return _Substanceusedisorders_currentphencyclidineabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentPhencyclidineAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentphencyclidineabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentPhencyclidineAbuse",v);
-		_Substanceusedisorders_currentphencyclidineabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastphencyclidineabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastPhencyclidineAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pastphencyclidineabuse() {
-		try{
-			if (_Substanceusedisorders_pastphencyclidineabuse==null){
-				_Substanceusedisorders_pastphencyclidineabuse=getIntegerProperty("substanceUseDisorders/pastPhencyclidineAbuse");
-				return _Substanceusedisorders_pastphencyclidineabuse;
-			}else {
-				return _Substanceusedisorders_pastphencyclidineabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastPhencyclidineAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastphencyclidineabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastPhencyclidineAbuse",v);
-		_Substanceusedisorders_pastphencyclidineabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentsedativehypnoticanxiolyticdependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentSedativeHypnoticAnxiolyticDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentsedativehypnoticanxiolyticdependence() {
-		try{
-			if (_Substanceusedisorders_currentsedativehypnoticanxiolyticdependence==null){
-				_Substanceusedisorders_currentsedativehypnoticanxiolyticdependence=getIntegerProperty("substanceUseDisorders/currentSedativeHypnoticAnxiolyticDependence");
-				return _Substanceusedisorders_currentsedativehypnoticanxiolyticdependence;
-			}else {
-				return _Substanceusedisorders_currentsedativehypnoticanxiolyticdependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentSedativeHypnoticAnxiolyticDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentsedativehypnoticanxiolyticdependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentSedativeHypnoticAnxiolyticDependence",v);
-		_Substanceusedisorders_currentsedativehypnoticanxiolyticdependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastsedativehypnoticanxiolyticdependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastSedativeHypnoticAnxiolyticDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastsedativehypnoticanxiolyticdependence() {
-		try{
-			if (_Substanceusedisorders_pastsedativehypnoticanxiolyticdependence==null){
-				_Substanceusedisorders_pastsedativehypnoticanxiolyticdependence=getIntegerProperty("substanceUseDisorders/pastSedativeHypnoticAnxiolyticDependence");
-				return _Substanceusedisorders_pastsedativehypnoticanxiolyticdependence;
-			}else {
-				return _Substanceusedisorders_pastsedativehypnoticanxiolyticdependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastSedativeHypnoticAnxiolyticDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastsedativehypnoticanxiolyticdependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastSedativeHypnoticAnxiolyticDependence",v);
-		_Substanceusedisorders_pastsedativehypnoticanxiolyticdependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentsedativehypnoticanxiolyticabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentSedativeHypnoticAnxiolyticAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currentsedativehypnoticanxiolyticabuse() {
-		try{
-			if (_Substanceusedisorders_currentsedativehypnoticanxiolyticabuse==null){
-				_Substanceusedisorders_currentsedativehypnoticanxiolyticabuse=getIntegerProperty("substanceUseDisorders/currentSedativeHypnoticAnxiolyticAbuse");
-				return _Substanceusedisorders_currentsedativehypnoticanxiolyticabuse;
-			}else {
-				return _Substanceusedisorders_currentsedativehypnoticanxiolyticabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentSedativeHypnoticAnxiolyticAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentsedativehypnoticanxiolyticabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentSedativeHypnoticAnxiolyticAbuse",v);
-		_Substanceusedisorders_currentsedativehypnoticanxiolyticabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastsedativehypnoticanxiolyticabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastSedativeHypnoticAnxiolyticAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pastsedativehypnoticanxiolyticabuse() {
-		try{
-			if (_Substanceusedisorders_pastsedativehypnoticanxiolyticabuse==null){
-				_Substanceusedisorders_pastsedativehypnoticanxiolyticabuse=getIntegerProperty("substanceUseDisorders/pastSedativeHypnoticAnxiolyticAbuse");
-				return _Substanceusedisorders_pastsedativehypnoticanxiolyticabuse;
-			}else {
-				return _Substanceusedisorders_pastsedativehypnoticanxiolyticabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastSedativeHypnoticAnxiolyticAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastsedativehypnoticanxiolyticabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastSedativeHypnoticAnxiolyticAbuse",v);
-		_Substanceusedisorders_pastsedativehypnoticanxiolyticabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentpolysubstancedependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentPolysubstanceDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentpolysubstancedependence() {
-		try{
-			if (_Substanceusedisorders_currentpolysubstancedependence==null){
-				_Substanceusedisorders_currentpolysubstancedependence=getIntegerProperty("substanceUseDisorders/currentPolysubstanceDependence");
-				return _Substanceusedisorders_currentpolysubstancedependence;
-			}else {
-				return _Substanceusedisorders_currentpolysubstancedependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentPolysubstanceDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentpolysubstancedependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentPolysubstanceDependence",v);
-		_Substanceusedisorders_currentpolysubstancedependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastpolysubstancedependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastPolysubstanceDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastpolysubstancedependence() {
-		try{
-			if (_Substanceusedisorders_pastpolysubstancedependence==null){
-				_Substanceusedisorders_pastpolysubstancedependence=getIntegerProperty("substanceUseDisorders/pastPolysubstanceDependence");
-				return _Substanceusedisorders_pastpolysubstancedependence;
-			}else {
-				return _Substanceusedisorders_pastpolysubstancedependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastPolysubstanceDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastpolysubstancedependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastPolysubstanceDependence",v);
-		_Substanceusedisorders_pastpolysubstancedependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentotherorunknowndependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentOtherOrUnknownDependence.
-	 */
-	public Integer getSubstanceusedisorders_currentotherorunknowndependence() {
-		try{
-			if (_Substanceusedisorders_currentotherorunknowndependence==null){
-				_Substanceusedisorders_currentotherorunknowndependence=getIntegerProperty("substanceUseDisorders/currentOtherOrUnknownDependence");
-				return _Substanceusedisorders_currentotherorunknowndependence;
-			}else {
-				return _Substanceusedisorders_currentotherorunknowndependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentOtherOrUnknownDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentotherorunknowndependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentOtherOrUnknownDependence",v);
-		_Substanceusedisorders_currentotherorunknowndependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastotherorunknowndependence=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastOtherOrUnknownDependence.
-	 */
-	public Integer getSubstanceusedisorders_pastotherorunknowndependence() {
-		try{
-			if (_Substanceusedisorders_pastotherorunknowndependence==null){
-				_Substanceusedisorders_pastotherorunknowndependence=getIntegerProperty("substanceUseDisorders/pastOtherOrUnknownDependence");
-				return _Substanceusedisorders_pastotherorunknowndependence;
-			}else {
-				return _Substanceusedisorders_pastotherorunknowndependence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastOtherOrUnknownDependence.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastotherorunknowndependence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastOtherOrUnknownDependence",v);
-		_Substanceusedisorders_pastotherorunknowndependence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_currentotherorunknownabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/currentOtherOrUnknownAbuse.
-	 */
-	public Integer getSubstanceusedisorders_currentotherorunknownabuse() {
-		try{
-			if (_Substanceusedisorders_currentotherorunknownabuse==null){
-				_Substanceusedisorders_currentotherorunknownabuse=getIntegerProperty("substanceUseDisorders/currentOtherOrUnknownAbuse");
-				return _Substanceusedisorders_currentotherorunknownabuse;
-			}else {
-				return _Substanceusedisorders_currentotherorunknownabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/currentOtherOrUnknownAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_currentotherorunknownabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/currentOtherOrUnknownAbuse",v);
-		_Substanceusedisorders_currentotherorunknownabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Substanceusedisorders_pastotherorunknownabuse=null;
-
-	/**
-	 * @return Returns the substanceUseDisorders/pastOtherOrUnknownAbuse.
-	 */
-	public Integer getSubstanceusedisorders_pastotherorunknownabuse() {
-		try{
-			if (_Substanceusedisorders_pastotherorunknownabuse==null){
-				_Substanceusedisorders_pastotherorunknownabuse=getIntegerProperty("substanceUseDisorders/pastOtherOrUnknownAbuse");
-				return _Substanceusedisorders_pastotherorunknownabuse;
-			}else {
-				return _Substanceusedisorders_pastotherorunknownabuse;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for substanceUseDisorders/pastOtherOrUnknownAbuse.
-	 * @param v Value to Set.
-	 */
-	public void setSubstanceusedisorders_pastotherorunknownabuse(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/substanceUseDisorders/pastOtherOrUnknownAbuse",v);
-		_Substanceusedisorders_pastotherorunknownabuse=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentpanicwithagoraphobia=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentPanicWithAgoraphobia.
-	 */
-	public Integer getAnxietydisorders_currentpanicwithagoraphobia() {
-		try{
-			if (_Anxietydisorders_currentpanicwithagoraphobia==null){
-				_Anxietydisorders_currentpanicwithagoraphobia=getIntegerProperty("anxietyDisorders/currentPanicWithAgoraphobia");
-				return _Anxietydisorders_currentpanicwithagoraphobia;
-			}else {
-				return _Anxietydisorders_currentpanicwithagoraphobia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentPanicWithAgoraphobia.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentpanicwithagoraphobia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentPanicWithAgoraphobia",v);
-		_Anxietydisorders_currentpanicwithagoraphobia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastpanicwithagoraphobia=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastPanicWithAgoraphobia.
-	 */
-	public Integer getAnxietydisorders_pastpanicwithagoraphobia() {
-		try{
-			if (_Anxietydisorders_pastpanicwithagoraphobia==null){
-				_Anxietydisorders_pastpanicwithagoraphobia=getIntegerProperty("anxietyDisorders/pastPanicWithAgoraphobia");
-				return _Anxietydisorders_pastpanicwithagoraphobia;
-			}else {
-				return _Anxietydisorders_pastpanicwithagoraphobia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastPanicWithAgoraphobia.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastpanicwithagoraphobia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastPanicWithAgoraphobia",v);
-		_Anxietydisorders_pastpanicwithagoraphobia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentpanicwithoutagoraphobia=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentPanicWithoutAgoraphobia.
-	 */
-	public Integer getAnxietydisorders_currentpanicwithoutagoraphobia() {
-		try{
-			if (_Anxietydisorders_currentpanicwithoutagoraphobia==null){
-				_Anxietydisorders_currentpanicwithoutagoraphobia=getIntegerProperty("anxietyDisorders/currentPanicWithoutAgoraphobia");
-				return _Anxietydisorders_currentpanicwithoutagoraphobia;
-			}else {
-				return _Anxietydisorders_currentpanicwithoutagoraphobia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentPanicWithoutAgoraphobia.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentpanicwithoutagoraphobia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentPanicWithoutAgoraphobia",v);
-		_Anxietydisorders_currentpanicwithoutagoraphobia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastpanicwithoutagoraphobia=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastPanicWithoutAgoraphobia.
-	 */
-	public Integer getAnxietydisorders_pastpanicwithoutagoraphobia() {
-		try{
-			if (_Anxietydisorders_pastpanicwithoutagoraphobia==null){
-				_Anxietydisorders_pastpanicwithoutagoraphobia=getIntegerProperty("anxietyDisorders/pastPanicWithoutAgoraphobia");
-				return _Anxietydisorders_pastpanicwithoutagoraphobia;
-			}else {
-				return _Anxietydisorders_pastpanicwithoutagoraphobia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastPanicWithoutAgoraphobia.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastpanicwithoutagoraphobia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastPanicWithoutAgoraphobia",v);
-		_Anxietydisorders_pastpanicwithoutagoraphobia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentagoraphobiawithoutpanichx=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentAgoraphobiaWithoutPanicHx.
-	 */
-	public Integer getAnxietydisorders_currentagoraphobiawithoutpanichx() {
-		try{
-			if (_Anxietydisorders_currentagoraphobiawithoutpanichx==null){
-				_Anxietydisorders_currentagoraphobiawithoutpanichx=getIntegerProperty("anxietyDisorders/currentAgoraphobiaWithoutPanicHx");
-				return _Anxietydisorders_currentagoraphobiawithoutpanichx;
-			}else {
-				return _Anxietydisorders_currentagoraphobiawithoutpanichx;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentAgoraphobiaWithoutPanicHx.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentagoraphobiawithoutpanichx(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentAgoraphobiaWithoutPanicHx",v);
-		_Anxietydisorders_currentagoraphobiawithoutpanichx=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastagoraphobiawithoutpanichx=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastAgoraphobiaWithoutPanicHx.
-	 */
-	public Integer getAnxietydisorders_pastagoraphobiawithoutpanichx() {
-		try{
-			if (_Anxietydisorders_pastagoraphobiawithoutpanichx==null){
-				_Anxietydisorders_pastagoraphobiawithoutpanichx=getIntegerProperty("anxietyDisorders/pastAgoraphobiaWithoutPanicHx");
-				return _Anxietydisorders_pastagoraphobiawithoutpanichx;
-			}else {
-				return _Anxietydisorders_pastagoraphobiawithoutpanichx;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastAgoraphobiaWithoutPanicHx.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastagoraphobiawithoutpanichx(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastAgoraphobiaWithoutPanicHx",v);
-		_Anxietydisorders_pastagoraphobiawithoutpanichx=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentsocialphobia=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentSocialPhobia.
-	 */
-	public Integer getAnxietydisorders_currentsocialphobia() {
-		try{
-			if (_Anxietydisorders_currentsocialphobia==null){
-				_Anxietydisorders_currentsocialphobia=getIntegerProperty("anxietyDisorders/currentSocialPhobia");
-				return _Anxietydisorders_currentsocialphobia;
-			}else {
-				return _Anxietydisorders_currentsocialphobia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentSocialPhobia.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentsocialphobia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentSocialPhobia",v);
-		_Anxietydisorders_currentsocialphobia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastsocialphobia=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastSocialPhobia.
-	 */
-	public Integer getAnxietydisorders_pastsocialphobia() {
-		try{
-			if (_Anxietydisorders_pastsocialphobia==null){
-				_Anxietydisorders_pastsocialphobia=getIntegerProperty("anxietyDisorders/pastSocialPhobia");
-				return _Anxietydisorders_pastsocialphobia;
-			}else {
-				return _Anxietydisorders_pastsocialphobia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastSocialPhobia.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastsocialphobia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastSocialPhobia",v);
-		_Anxietydisorders_pastsocialphobia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentspecificphobia=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentSpecificPhobia.
-	 */
-	public Integer getAnxietydisorders_currentspecificphobia() {
-		try{
-			if (_Anxietydisorders_currentspecificphobia==null){
-				_Anxietydisorders_currentspecificphobia=getIntegerProperty("anxietyDisorders/currentSpecificPhobia");
-				return _Anxietydisorders_currentspecificphobia;
-			}else {
-				return _Anxietydisorders_currentspecificphobia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentSpecificPhobia.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentspecificphobia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentSpecificPhobia",v);
-		_Anxietydisorders_currentspecificphobia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastspecificphobia=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastSpecificPhobia.
-	 */
-	public Integer getAnxietydisorders_pastspecificphobia() {
-		try{
-			if (_Anxietydisorders_pastspecificphobia==null){
-				_Anxietydisorders_pastspecificphobia=getIntegerProperty("anxietyDisorders/pastSpecificPhobia");
-				return _Anxietydisorders_pastspecificphobia;
-			}else {
-				return _Anxietydisorders_pastspecificphobia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastSpecificPhobia.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastspecificphobia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastSpecificPhobia",v);
-		_Anxietydisorders_pastspecificphobia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentocd=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentOCD.
-	 */
-	public Integer getAnxietydisorders_currentocd() {
-		try{
-			if (_Anxietydisorders_currentocd==null){
-				_Anxietydisorders_currentocd=getIntegerProperty("anxietyDisorders/currentOCD");
-				return _Anxietydisorders_currentocd;
-			}else {
-				return _Anxietydisorders_currentocd;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentOCD.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentocd(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentOCD",v);
-		_Anxietydisorders_currentocd=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastocd=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastOCD.
-	 */
-	public Integer getAnxietydisorders_pastocd() {
-		try{
-			if (_Anxietydisorders_pastocd==null){
-				_Anxietydisorders_pastocd=getIntegerProperty("anxietyDisorders/pastOCD");
-				return _Anxietydisorders_pastocd;
-			}else {
-				return _Anxietydisorders_pastocd;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastOCD.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastocd(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastOCD",v);
-		_Anxietydisorders_pastocd=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentptsd=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentPTSD.
-	 */
-	public Integer getAnxietydisorders_currentptsd() {
-		try{
-			if (_Anxietydisorders_currentptsd==null){
-				_Anxietydisorders_currentptsd=getIntegerProperty("anxietyDisorders/currentPTSD");
-				return _Anxietydisorders_currentptsd;
-			}else {
-				return _Anxietydisorders_currentptsd;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentPTSD.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentptsd(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentPTSD",v);
-		_Anxietydisorders_currentptsd=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastptsd=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastPTSD.
-	 */
-	public Integer getAnxietydisorders_pastptsd() {
-		try{
-			if (_Anxietydisorders_pastptsd==null){
-				_Anxietydisorders_pastptsd=getIntegerProperty("anxietyDisorders/pastPTSD");
-				return _Anxietydisorders_pastptsd;
-			}else {
-				return _Anxietydisorders_pastptsd;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastPTSD.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastptsd(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastPTSD",v);
-		_Anxietydisorders_pastptsd=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentgeneralizedanxietydisorder=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentGeneralizedAnxietyDisorder.
-	 */
-	public Integer getAnxietydisorders_currentgeneralizedanxietydisorder() {
-		try{
-			if (_Anxietydisorders_currentgeneralizedanxietydisorder==null){
-				_Anxietydisorders_currentgeneralizedanxietydisorder=getIntegerProperty("anxietyDisorders/currentGeneralizedAnxietyDisorder");
-				return _Anxietydisorders_currentgeneralizedanxietydisorder;
-			}else {
-				return _Anxietydisorders_currentgeneralizedanxietydisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentGeneralizedAnxietyDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentgeneralizedanxietydisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentGeneralizedAnxietyDisorder",v);
-		_Anxietydisorders_currentgeneralizedanxietydisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentanxietyduetomedicalcondition=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentAnxietyDueToMedicalCondition.
-	 */
-	public Integer getAnxietydisorders_currentanxietyduetomedicalcondition() {
-		try{
-			if (_Anxietydisorders_currentanxietyduetomedicalcondition==null){
-				_Anxietydisorders_currentanxietyduetomedicalcondition=getIntegerProperty("anxietyDisorders/currentAnxietyDueToMedicalCondition");
-				return _Anxietydisorders_currentanxietyduetomedicalcondition;
-			}else {
-				return _Anxietydisorders_currentanxietyduetomedicalcondition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentAnxietyDueToMedicalCondition.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentanxietyduetomedicalcondition(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentAnxietyDueToMedicalCondition",v);
-		_Anxietydisorders_currentanxietyduetomedicalcondition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastanxietyduetomedicalcondition=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastAnxietyDueToMedicalCondition.
-	 */
-	public Integer getAnxietydisorders_pastanxietyduetomedicalcondition() {
-		try{
-			if (_Anxietydisorders_pastanxietyduetomedicalcondition==null){
-				_Anxietydisorders_pastanxietyduetomedicalcondition=getIntegerProperty("anxietyDisorders/pastAnxietyDueToMedicalCondition");
-				return _Anxietydisorders_pastanxietyduetomedicalcondition;
-			}else {
-				return _Anxietydisorders_pastanxietyduetomedicalcondition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastAnxietyDueToMedicalCondition.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastanxietyduetomedicalcondition(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastAnxietyDueToMedicalCondition",v);
-		_Anxietydisorders_pastanxietyduetomedicalcondition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentsubstanceinducedanxietydisorder=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentSubstanceInducedAnxietyDisorder.
-	 */
-	public Integer getAnxietydisorders_currentsubstanceinducedanxietydisorder() {
-		try{
-			if (_Anxietydisorders_currentsubstanceinducedanxietydisorder==null){
-				_Anxietydisorders_currentsubstanceinducedanxietydisorder=getIntegerProperty("anxietyDisorders/currentSubstanceInducedAnxietyDisorder");
-				return _Anxietydisorders_currentsubstanceinducedanxietydisorder;
-			}else {
-				return _Anxietydisorders_currentsubstanceinducedanxietydisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentSubstanceInducedAnxietyDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentsubstanceinducedanxietydisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentSubstanceInducedAnxietyDisorder",v);
-		_Anxietydisorders_currentsubstanceinducedanxietydisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastsubstanceinducedanxietydisorder=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastSubstanceInducedAnxietyDisorder.
-	 */
-	public Integer getAnxietydisorders_pastsubstanceinducedanxietydisorder() {
-		try{
-			if (_Anxietydisorders_pastsubstanceinducedanxietydisorder==null){
-				_Anxietydisorders_pastsubstanceinducedanxietydisorder=getIntegerProperty("anxietyDisorders/pastSubstanceInducedAnxietyDisorder");
-				return _Anxietydisorders_pastsubstanceinducedanxietydisorder;
-			}else {
-				return _Anxietydisorders_pastsubstanceinducedanxietydisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastSubstanceInducedAnxietyDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastsubstanceinducedanxietydisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastSubstanceInducedAnxietyDisorder",v);
-		_Anxietydisorders_pastsubstanceinducedanxietydisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_currentanxietydisordernos=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/currentAnxietyDisorderNOS.
-	 */
-	public Integer getAnxietydisorders_currentanxietydisordernos() {
-		try{
-			if (_Anxietydisorders_currentanxietydisordernos==null){
-				_Anxietydisorders_currentanxietydisordernos=getIntegerProperty("anxietyDisorders/currentAnxietyDisorderNOS");
-				return _Anxietydisorders_currentanxietydisordernos;
-			}else {
-				return _Anxietydisorders_currentanxietydisordernos;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/currentAnxietyDisorderNOS.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_currentanxietydisordernos(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/currentAnxietyDisorderNOS",v);
-		_Anxietydisorders_currentanxietydisordernos=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Anxietydisorders_pastanxietydisordernos=null;
-
-	/**
-	 * @return Returns the anxietyDisorders/pastAnxietyDisorderNOS.
-	 */
-	public Integer getAnxietydisorders_pastanxietydisordernos() {
-		try{
-			if (_Anxietydisorders_pastanxietydisordernos==null){
-				_Anxietydisorders_pastanxietydisordernos=getIntegerProperty("anxietyDisorders/pastAnxietyDisorderNOS");
-				return _Anxietydisorders_pastanxietydisordernos;
-			}else {
-				return _Anxietydisorders_pastanxietydisordernos;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for anxietyDisorders/pastAnxietyDisorderNOS.
-	 * @param v Value to Set.
-	 */
-	public void setAnxietydisorders_pastanxietydisordernos(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/anxietyDisorders/pastAnxietyDisorderNOS",v);
-		_Anxietydisorders_pastanxietydisordernos=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Somatoformdisorders_somatizationdisorder=null;
-
-	/**
-	 * @return Returns the somatoformDisorders/somatizationDisorder.
-	 */
-	public Integer getSomatoformdisorders_somatizationdisorder() {
-		try{
-			if (_Somatoformdisorders_somatizationdisorder==null){
-				_Somatoformdisorders_somatizationdisorder=getIntegerProperty("somatoformDisorders/somatizationDisorder");
-				return _Somatoformdisorders_somatizationdisorder;
-			}else {
-				return _Somatoformdisorders_somatizationdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for somatoformDisorders/somatizationDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setSomatoformdisorders_somatizationdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/somatoformDisorders/somatizationDisorder",v);
-		_Somatoformdisorders_somatizationdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Somatoformdisorders_undifferentiatedsomatformdisorder=null;
-
-	/**
-	 * @return Returns the somatoformDisorders/undifferentiatedSomatformDisorder.
-	 */
-	public Integer getSomatoformdisorders_undifferentiatedsomatformdisorder() {
-		try{
-			if (_Somatoformdisorders_undifferentiatedsomatformdisorder==null){
-				_Somatoformdisorders_undifferentiatedsomatformdisorder=getIntegerProperty("somatoformDisorders/undifferentiatedSomatformDisorder");
-				return _Somatoformdisorders_undifferentiatedsomatformdisorder;
-			}else {
-				return _Somatoformdisorders_undifferentiatedsomatformdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for somatoformDisorders/undifferentiatedSomatformDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setSomatoformdisorders_undifferentiatedsomatformdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/somatoformDisorders/undifferentiatedSomatformDisorder",v);
-		_Somatoformdisorders_undifferentiatedsomatformdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Somatoformdisorders_paindisorder=null;
-
-	/**
-	 * @return Returns the somatoformDisorders/painDisorder.
-	 */
-	public Integer getSomatoformdisorders_paindisorder() {
-		try{
-			if (_Somatoformdisorders_paindisorder==null){
-				_Somatoformdisorders_paindisorder=getIntegerProperty("somatoformDisorders/painDisorder");
-				return _Somatoformdisorders_paindisorder;
-			}else {
-				return _Somatoformdisorders_paindisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for somatoformDisorders/painDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setSomatoformdisorders_paindisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/somatoformDisorders/painDisorder",v);
-		_Somatoformdisorders_paindisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Somatoformdisorders_hypochondriasis=null;
-
-	/**
-	 * @return Returns the somatoformDisorders/hypochondriasis.
-	 */
-	public Integer getSomatoformdisorders_hypochondriasis() {
-		try{
-			if (_Somatoformdisorders_hypochondriasis==null){
-				_Somatoformdisorders_hypochondriasis=getIntegerProperty("somatoformDisorders/hypochondriasis");
-				return _Somatoformdisorders_hypochondriasis;
-			}else {
-				return _Somatoformdisorders_hypochondriasis;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for somatoformDisorders/hypochondriasis.
-	 * @param v Value to Set.
-	 */
-	public void setSomatoformdisorders_hypochondriasis(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/somatoformDisorders/hypochondriasis",v);
-		_Somatoformdisorders_hypochondriasis=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Somatoformdisorders_bodydysmorphicdisorder=null;
-
-	/**
-	 * @return Returns the somatoformDisorders/bodyDysmorphicDisorder.
-	 */
-	public Integer getSomatoformdisorders_bodydysmorphicdisorder() {
-		try{
-			if (_Somatoformdisorders_bodydysmorphicdisorder==null){
-				_Somatoformdisorders_bodydysmorphicdisorder=getIntegerProperty("somatoformDisorders/bodyDysmorphicDisorder");
-				return _Somatoformdisorders_bodydysmorphicdisorder;
-			}else {
-				return _Somatoformdisorders_bodydysmorphicdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for somatoformDisorders/bodyDysmorphicDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setSomatoformdisorders_bodydysmorphicdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/somatoformDisorders/bodyDysmorphicDisorder",v);
-		_Somatoformdisorders_bodydysmorphicdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Eatingdisorders_currentanorexianervosa=null;
-
-	/**
-	 * @return Returns the eatingDisorders/currentAnorexiaNervosa.
-	 */
-	public Integer getEatingdisorders_currentanorexianervosa() {
-		try{
-			if (_Eatingdisorders_currentanorexianervosa==null){
-				_Eatingdisorders_currentanorexianervosa=getIntegerProperty("eatingDisorders/currentAnorexiaNervosa");
-				return _Eatingdisorders_currentanorexianervosa;
-			}else {
-				return _Eatingdisorders_currentanorexianervosa;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for eatingDisorders/currentAnorexiaNervosa.
-	 * @param v Value to Set.
-	 */
-	public void setEatingdisorders_currentanorexianervosa(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/eatingDisorders/currentAnorexiaNervosa",v);
-		_Eatingdisorders_currentanorexianervosa=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Eatingdisorders_pastanorexianervosa=null;
-
-	/**
-	 * @return Returns the eatingDisorders/pastAnorexiaNervosa.
-	 */
-	public Integer getEatingdisorders_pastanorexianervosa() {
-		try{
-			if (_Eatingdisorders_pastanorexianervosa==null){
-				_Eatingdisorders_pastanorexianervosa=getIntegerProperty("eatingDisorders/pastAnorexiaNervosa");
-				return _Eatingdisorders_pastanorexianervosa;
-			}else {
-				return _Eatingdisorders_pastanorexianervosa;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for eatingDisorders/pastAnorexiaNervosa.
-	 * @param v Value to Set.
-	 */
-	public void setEatingdisorders_pastanorexianervosa(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/eatingDisorders/pastAnorexiaNervosa",v);
-		_Eatingdisorders_pastanorexianervosa=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Eatingdisorders_currentbulimianervosa=null;
-
-	/**
-	 * @return Returns the eatingDisorders/currentBulimiaNervosa.
-	 */
-	public Integer getEatingdisorders_currentbulimianervosa() {
-		try{
-			if (_Eatingdisorders_currentbulimianervosa==null){
-				_Eatingdisorders_currentbulimianervosa=getIntegerProperty("eatingDisorders/currentBulimiaNervosa");
-				return _Eatingdisorders_currentbulimianervosa;
-			}else {
-				return _Eatingdisorders_currentbulimianervosa;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for eatingDisorders/currentBulimiaNervosa.
-	 * @param v Value to Set.
-	 */
-	public void setEatingdisorders_currentbulimianervosa(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/eatingDisorders/currentBulimiaNervosa",v);
-		_Eatingdisorders_currentbulimianervosa=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Eatingdisorders_pastbulimianervosa=null;
-
-	/**
-	 * @return Returns the eatingDisorders/pastBulimiaNervosa.
-	 */
-	public Integer getEatingdisorders_pastbulimianervosa() {
-		try{
-			if (_Eatingdisorders_pastbulimianervosa==null){
-				_Eatingdisorders_pastbulimianervosa=getIntegerProperty("eatingDisorders/pastBulimiaNervosa");
-				return _Eatingdisorders_pastbulimianervosa;
-			}else {
-				return _Eatingdisorders_pastbulimianervosa;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for eatingDisorders/pastBulimiaNervosa.
-	 * @param v Value to Set.
-	 */
-	public void setEatingdisorders_pastbulimianervosa(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/eatingDisorders/pastBulimiaNervosa",v);
-		_Eatingdisorders_pastbulimianervosa=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Eatingdisorders_currentbingeeatingdisorder=null;
-
-	/**
-	 * @return Returns the eatingDisorders/currentBingeEatingDisorder.
-	 */
-	public Integer getEatingdisorders_currentbingeeatingdisorder() {
-		try{
-			if (_Eatingdisorders_currentbingeeatingdisorder==null){
-				_Eatingdisorders_currentbingeeatingdisorder=getIntegerProperty("eatingDisorders/currentBingeEatingDisorder");
-				return _Eatingdisorders_currentbingeeatingdisorder;
-			}else {
-				return _Eatingdisorders_currentbingeeatingdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for eatingDisorders/currentBingeEatingDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setEatingdisorders_currentbingeeatingdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/eatingDisorders/currentBingeEatingDisorder",v);
-		_Eatingdisorders_currentbingeeatingdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Eatingdisorders_pastbingeeatingdisorder=null;
-
-	/**
-	 * @return Returns the eatingDisorders/pastBingeEatingDisorder.
-	 */
-	public Integer getEatingdisorders_pastbingeeatingdisorder() {
-		try{
-			if (_Eatingdisorders_pastbingeeatingdisorder==null){
-				_Eatingdisorders_pastbingeeatingdisorder=getIntegerProperty("eatingDisorders/pastBingeEatingDisorder");
-				return _Eatingdisorders_pastbingeeatingdisorder;
-			}else {
-				return _Eatingdisorders_pastbingeeatingdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for eatingDisorders/pastBingeEatingDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setEatingdisorders_pastbingeeatingdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/eatingDisorders/pastBingeEatingDisorder",v);
-		_Eatingdisorders_pastbingeeatingdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Adjustmentdisorder=null;
-
-	/**
-	 * @return Returns the adjustmentDisorder.
-	 */
-	public Integer getAdjustmentdisorder() {
-		try{
-			if (_Adjustmentdisorder==null){
-				_Adjustmentdisorder=getIntegerProperty("adjustmentDisorder");
-				return _Adjustmentdisorder;
-			}else {
-				return _Adjustmentdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for adjustmentDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setAdjustmentdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/adjustmentDisorder",v);
-		_Adjustmentdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Optional_currentacutestressdisorder=null;
-
-	/**
-	 * @return Returns the optional/currentAcuteStressDisorder.
-	 */
-	public Integer getOptional_currentacutestressdisorder() {
-		try{
-			if (_Optional_currentacutestressdisorder==null){
-				_Optional_currentacutestressdisorder=getIntegerProperty("optional/currentAcuteStressDisorder");
-				return _Optional_currentacutestressdisorder;
-			}else {
-				return _Optional_currentacutestressdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for optional/currentAcuteStressDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setOptional_currentacutestressdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/optional/currentAcuteStressDisorder",v);
-		_Optional_currentacutestressdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Optional_pastacutestressdisorder=null;
-
-	/**
-	 * @return Returns the optional/pastAcuteStressDisorder.
-	 */
-	public Integer getOptional_pastacutestressdisorder() {
-		try{
-			if (_Optional_pastacutestressdisorder==null){
-				_Optional_pastacutestressdisorder=getIntegerProperty("optional/pastAcuteStressDisorder");
-				return _Optional_pastacutestressdisorder;
-			}else {
-				return _Optional_pastacutestressdisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for optional/pastAcuteStressDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setOptional_pastacutestressdisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/optional/pastAcuteStressDisorder",v);
-		_Optional_pastacutestressdisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Optional_currentminordepressivedisorder=null;
-
-	/**
-	 * @return Returns the optional/currentMinorDepressiveDisorder.
-	 */
-	public Integer getOptional_currentminordepressivedisorder() {
-		try{
-			if (_Optional_currentminordepressivedisorder==null){
-				_Optional_currentminordepressivedisorder=getIntegerProperty("optional/currentMinorDepressiveDisorder");
-				return _Optional_currentminordepressivedisorder;
-			}else {
-				return _Optional_currentminordepressivedisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for optional/currentMinorDepressiveDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setOptional_currentminordepressivedisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/optional/currentMinorDepressiveDisorder",v);
-		_Optional_currentminordepressivedisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Optional_pastminordepressivedisorder=null;
-
-	/**
-	 * @return Returns the optional/pastMinorDepressiveDisorder.
-	 */
-	public Integer getOptional_pastminordepressivedisorder() {
-		try{
-			if (_Optional_pastminordepressivedisorder==null){
-				_Optional_pastminordepressivedisorder=getIntegerProperty("optional/pastMinorDepressiveDisorder");
-				return _Optional_pastminordepressivedisorder;
-			}else {
-				return _Optional_pastminordepressivedisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for optional/pastMinorDepressiveDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setOptional_pastminordepressivedisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/optional/pastMinorDepressiveDisorder",v);
-		_Optional_pastminordepressivedisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Optional_currentmixedanxietydepressivedisorder=null;
-
-	/**
-	 * @return Returns the optional/currentMixedAnxietyDepressiveDisorder.
-	 */
-	public Integer getOptional_currentmixedanxietydepressivedisorder() {
-		try{
-			if (_Optional_currentmixedanxietydepressivedisorder==null){
-				_Optional_currentmixedanxietydepressivedisorder=getIntegerProperty("optional/currentMixedAnxietyDepressiveDisorder");
-				return _Optional_currentmixedanxietydepressivedisorder;
-			}else {
-				return _Optional_currentmixedanxietydepressivedisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for optional/currentMixedAnxietyDepressiveDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setOptional_currentmixedanxietydepressivedisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/optional/currentMixedAnxietyDepressiveDisorder",v);
-		_Optional_currentmixedanxietydepressivedisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Optional_pastmixedanxietydepressivedisorder=null;
-
-	/**
-	 * @return Returns the optional/pastMixedAnxietyDepressiveDisorder.
-	 */
-	public Integer getOptional_pastmixedanxietydepressivedisorder() {
-		try{
-			if (_Optional_pastmixedanxietydepressivedisorder==null){
-				_Optional_pastmixedanxietydepressivedisorder=getIntegerProperty("optional/pastMixedAnxietyDepressiveDisorder");
-				return _Optional_pastmixedanxietydepressivedisorder;
-			}else {
-				return _Optional_pastmixedanxietydepressivedisorder;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for optional/pastMixedAnxietyDepressiveDisorder.
-	 * @param v Value to Set.
-	 */
-	public void setOptional_pastmixedanxietydepressivedisorder(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/optional/pastMixedAnxietyDepressiveDisorder",v);
-		_Optional_pastmixedanxietydepressivedisorder=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Optional_pastsympomaticdetails=null;
-
-	/**
-	 * @return Returns the optional/pastSympomaticDetails.
-	 */
-	public String getOptional_pastsympomaticdetails(){
-		try{
-			if (_Optional_pastsympomaticdetails==null){
-				_Optional_pastsympomaticdetails=getStringProperty("optional/pastSympomaticDetails");
-				return _Optional_pastsympomaticdetails;
-			}else {
-				return _Optional_pastsympomaticdetails;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for optional/pastSympomaticDetails.
-	 * @param v Value to Set.
-	 */
-	public void setOptional_pastsympomaticdetails(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/optional/pastSympomaticDetails",v);
-		_Optional_pastsympomaticdetails=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAscidresearchdata> getAllXnatAscidresearchdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAscidresearchdata> al = new ArrayList<org.nrg.xdat.om.XnatAscidresearchdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAscidresearchdata> getXnatAscidresearchdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAscidresearchdata> al = new ArrayList<org.nrg.xdat.om.XnatAscidresearchdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAscidresearchdata> getXnatAscidresearchdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAscidresearchdata> al = new ArrayList<org.nrg.xdat.om.XnatAscidresearchdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAscidresearchdata getXnatAscidresearchdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat_a:scidResearchData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAscidresearchdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //subjectAssessorData
-	        XnatSubjectassessordata childSubjectassessordata = (XnatSubjectassessordata)this.getSubjectassessordata();
-	            if (childSubjectassessordata!=null){
-	              for(ResourceFile rf: ((XnatSubjectassessordata)childSubjectassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectAssessorData[" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectAssessorData/" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAsideeffectspittsburghdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAsideeffectspittsburghdata.java
deleted file mode 100644
index 95806734..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAsideeffectspittsburghdata.java
+++ /dev/null
@@ -1,749 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAsideeffectspittsburghdata extends XnatSubjectassessordata implements org.nrg.xdat.model.XnatAsideeffectspittsburghdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAsideeffectspittsburghdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat_a:sideEffectsPittsburghData";
-
-	public AutoXnatAsideeffectspittsburghdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAsideeffectspittsburghdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAsideeffectspittsburghdata(UserI user)
-	 **/
-	public AutoXnatAsideeffectspittsburghdata(){}
-
-	public AutoXnatAsideeffectspittsburghdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat_a:sideEffectsPittsburghData";
-	}
-	 private org.nrg.xdat.om.XnatSubjectassessordata _Subjectassessordata =null;
-
-	/**
-	 * subjectAssessorData
-	 * @return org.nrg.xdat.om.XnatSubjectassessordata
-	 */
-	public org.nrg.xdat.om.XnatSubjectassessordata getSubjectassessordata() {
-		try{
-			if (_Subjectassessordata==null){
-				_Subjectassessordata=((XnatSubjectassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("subjectAssessorData")));
-				return _Subjectassessordata;
-			}else {
-				return _Subjectassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for subjectAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectassessordata(ItemI v) throws Exception{
-		_Subjectassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectAssessorData
-	 * set org.nrg.xdat.model.XnatSubjectassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> void setSubjectassessordata(A item) throws Exception{
-	setSubjectassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectAssessorData.
-	 * */
-	public void removeSubjectassessordata() {
-		_Subjectassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Motortics=null;
-
-	/**
-	 * @return Returns the motorTics.
-	 */
-	public Integer getMotortics() {
-		try{
-			if (_Motortics==null){
-				_Motortics=getIntegerProperty("motorTics");
-				return _Motortics;
-			}else {
-				return _Motortics;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for motorTics.
-	 * @param v Value to Set.
-	 */
-	public void setMotortics(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/motorTics",v);
-		_Motortics=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _BuccalLingualmovements=null;
-
-	/**
-	 * @return Returns the buccal_lingualMovements.
-	 */
-	public Integer getBuccalLingualmovements() {
-		try{
-			if (_BuccalLingualmovements==null){
-				_BuccalLingualmovements=getIntegerProperty("buccal_lingualMovements");
-				return _BuccalLingualmovements;
-			}else {
-				return _BuccalLingualmovements;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for buccal_lingualMovements.
-	 * @param v Value to Set.
-	 */
-	public void setBuccalLingualmovements(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/buccal_lingualMovements",v);
-		_BuccalLingualmovements=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _PickingSkinFingersNailsLip=null;
-
-	/**
-	 * @return Returns the picking_skin_fingers_nails_lip.
-	 */
-	public Integer getPickingSkinFingersNailsLip() {
-		try{
-			if (_PickingSkinFingersNailsLip==null){
-				_PickingSkinFingersNailsLip=getIntegerProperty("picking_skin_fingers_nails_lip");
-				return _PickingSkinFingersNailsLip;
-			}else {
-				return _PickingSkinFingersNailsLip;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for picking_skin_fingers_nails_lip.
-	 * @param v Value to Set.
-	 */
-	public void setPickingSkinFingersNailsLip(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/picking_skin_fingers_nails_lip",v);
-		_PickingSkinFingersNailsLip=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _WorriedAnxious=null;
-
-	/**
-	 * @return Returns the worried_anxious.
-	 */
-	public Integer getWorriedAnxious() {
-		try{
-			if (_WorriedAnxious==null){
-				_WorriedAnxious=getIntegerProperty("worried_anxious");
-				return _WorriedAnxious;
-			}else {
-				return _WorriedAnxious;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for worried_anxious.
-	 * @param v Value to Set.
-	 */
-	public void setWorriedAnxious(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/worried_anxious",v);
-		_WorriedAnxious=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _DullTiredListless=null;
-
-	/**
-	 * @return Returns the dull_tired_listless.
-	 */
-	public Integer getDullTiredListless() {
-		try{
-			if (_DullTiredListless==null){
-				_DullTiredListless=getIntegerProperty("dull_tired_listless");
-				return _DullTiredListless;
-			}else {
-				return _DullTiredListless;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dull_tired_listless.
-	 * @param v Value to Set.
-	 */
-	public void setDullTiredListless(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dull_tired_listless",v);
-		_DullTiredListless=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Sedation=null;
-
-	/**
-	 * @return Returns the sedation.
-	 */
-	public Integer getSedation() {
-		try{
-			if (_Sedation==null){
-				_Sedation=getIntegerProperty("sedation");
-				return _Sedation;
-			}else {
-				return _Sedation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for sedation.
-	 * @param v Value to Set.
-	 */
-	public void setSedation(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/sedation",v);
-		_Sedation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Stomachache=null;
-
-	/**
-	 * @return Returns the stomachache.
-	 */
-	public Integer getStomachache() {
-		try{
-			if (_Stomachache==null){
-				_Stomachache=getIntegerProperty("stomachache");
-				return _Stomachache;
-			}else {
-				return _Stomachache;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stomachache.
-	 * @param v Value to Set.
-	 */
-	public void setStomachache(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stomachache",v);
-		_Stomachache=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _NauseaVomiting=null;
-
-	/**
-	 * @return Returns the nausea_vomiting.
-	 */
-	public Integer getNauseaVomiting() {
-		try{
-			if (_NauseaVomiting==null){
-				_NauseaVomiting=getIntegerProperty("nausea_vomiting");
-				return _NauseaVomiting;
-			}else {
-				return _NauseaVomiting;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for nausea_vomiting.
-	 * @param v Value to Set.
-	 */
-	public void setNauseaVomiting(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/nausea_vomiting",v);
-		_NauseaVomiting=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _CrabbyIrritable=null;
-
-	/**
-	 * @return Returns the crabby_irritable.
-	 */
-	public Integer getCrabbyIrritable() {
-		try{
-			if (_CrabbyIrritable==null){
-				_CrabbyIrritable=getIntegerProperty("crabby_irritable");
-				return _CrabbyIrritable;
-			}else {
-				return _CrabbyIrritable;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for crabby_irritable.
-	 * @param v Value to Set.
-	 */
-	public void setCrabbyIrritable(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/crabby_irritable",v);
-		_CrabbyIrritable=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _TearfulSadDepressed=null;
-
-	/**
-	 * @return Returns the tearful_sad_depressed.
-	 */
-	public Integer getTearfulSadDepressed() {
-		try{
-			if (_TearfulSadDepressed==null){
-				_TearfulSadDepressed=getIntegerProperty("tearful_sad_depressed");
-				return _TearfulSadDepressed;
-			}else {
-				return _TearfulSadDepressed;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tearful_sad_depressed.
-	 * @param v Value to Set.
-	 */
-	public void setTearfulSadDepressed(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tearful_sad_depressed",v);
-		_TearfulSadDepressed=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Hallucinations=null;
-
-	/**
-	 * @return Returns the hallucinations.
-	 */
-	public Integer getHallucinations() {
-		try{
-			if (_Hallucinations==null){
-				_Hallucinations=getIntegerProperty("hallucinations");
-				return _Hallucinations;
-			}else {
-				return _Hallucinations;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for hallucinations.
-	 * @param v Value to Set.
-	 */
-	public void setHallucinations(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/hallucinations",v);
-		_Hallucinations=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Troublesleeping=null;
-
-	/**
-	 * @return Returns the troubleSleeping.
-	 */
-	public Integer getTroublesleeping() {
-		try{
-			if (_Troublesleeping==null){
-				_Troublesleeping=getIntegerProperty("troubleSleeping");
-				return _Troublesleeping;
-			}else {
-				return _Troublesleeping;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for troubleSleeping.
-	 * @param v Value to Set.
-	 */
-	public void setTroublesleeping(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/troubleSleeping",v);
-		_Troublesleeping=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Lossofappetite=null;
-
-	/**
-	 * @return Returns the lossOfAppetite.
-	 */
-	public Integer getLossofappetite() {
-		try{
-			if (_Lossofappetite==null){
-				_Lossofappetite=getIntegerProperty("lossOfAppetite");
-				return _Lossofappetite;
-			}else {
-				return _Lossofappetite;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for lossOfAppetite.
-	 * @param v Value to Set.
-	 */
-	public void setLossofappetite(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/lossOfAppetite",v);
-		_Lossofappetite=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _TroubleconcentratingDistractible=null;
-
-	/**
-	 * @return Returns the troubleConcentrating_distractible.
-	 */
-	public Integer getTroubleconcentratingDistractible() {
-		try{
-			if (_TroubleconcentratingDistractible==null){
-				_TroubleconcentratingDistractible=getIntegerProperty("troubleConcentrating_distractible");
-				return _TroubleconcentratingDistractible;
-			}else {
-				return _TroubleconcentratingDistractible;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for troubleConcentrating_distractible.
-	 * @param v Value to Set.
-	 */
-	public void setTroubleconcentratingDistractible(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/troubleConcentrating_distractible",v);
-		_TroubleconcentratingDistractible=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _DizzinessLightheadedness=null;
-
-	/**
-	 * @return Returns the dizziness_lightheadedness.
-	 */
-	public Integer getDizzinessLightheadedness() {
-		try{
-			if (_DizzinessLightheadedness==null){
-				_DizzinessLightheadedness=getIntegerProperty("dizziness_lightheadedness");
-				return _DizzinessLightheadedness;
-			}else {
-				return _DizzinessLightheadedness;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dizziness_lightheadedness.
-	 * @param v Value to Set.
-	 */
-	public void setDizzinessLightheadedness(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dizziness_lightheadedness",v);
-		_DizzinessLightheadedness=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Headaches=null;
-
-	/**
-	 * @return Returns the headaches.
-	 */
-	public Integer getHeadaches() {
-		try{
-			if (_Headaches==null){
-				_Headaches=getIntegerProperty("headaches");
-				return _Headaches;
-			}else {
-				return _Headaches;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for headaches.
-	 * @param v Value to Set.
-	 */
-	public void setHeadaches(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/headaches",v);
-		_Headaches=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Socialwithdrawal=null;
-
-	/**
-	 * @return Returns the socialWithdrawal.
-	 */
-	public Integer getSocialwithdrawal() {
-		try{
-			if (_Socialwithdrawal==null){
-				_Socialwithdrawal=getIntegerProperty("socialWithdrawal");
-				return _Socialwithdrawal;
-			}else {
-				return _Socialwithdrawal;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for socialWithdrawal.
-	 * @param v Value to Set.
-	 */
-	public void setSocialwithdrawal(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/socialWithdrawal",v);
-		_Socialwithdrawal=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Drymouth=null;
-
-	/**
-	 * @return Returns the dryMouth.
-	 */
-	public Integer getDrymouth() {
-		try{
-			if (_Drymouth==null){
-				_Drymouth=getIntegerProperty("dryMouth");
-				return _Drymouth;
-			}else {
-				return _Drymouth;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dryMouth.
-	 * @param v Value to Set.
-	 */
-	public void setDrymouth(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dryMouth",v);
-		_Drymouth=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Palpitations=null;
-
-	/**
-	 * @return Returns the palpitations.
-	 */
-	public Integer getPalpitations() {
-		try{
-			if (_Palpitations==null){
-				_Palpitations=getIntegerProperty("palpitations");
-				return _Palpitations;
-			}else {
-				return _Palpitations;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for palpitations.
-	 * @param v Value to Set.
-	 */
-	public void setPalpitations(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/palpitations",v);
-		_Palpitations=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata> getAllXnatAsideeffectspittsburghdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata> al = new ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata> getXnatAsideeffectspittsburghdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata> al = new ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata> getXnatAsideeffectspittsburghdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata> al = new ArrayList<org.nrg.xdat.om.XnatAsideeffectspittsburghdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAsideeffectspittsburghdata getXnatAsideeffectspittsburghdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat_a:sideEffectsPittsburghData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAsideeffectspittsburghdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //subjectAssessorData
-	        XnatSubjectassessordata childSubjectassessordata = (XnatSubjectassessordata)this.getSubjectassessordata();
-	            if (childSubjectassessordata!=null){
-	              for(ResourceFile rf: ((XnatSubjectassessordata)childSubjectassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectAssessorData[" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectAssessorData/" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAupdrs3data.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAupdrs3data.java
deleted file mode 100644
index c6b21fe6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAupdrs3data.java
+++ /dev/null
@@ -1,1155 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAupdrs3data extends XnatSubjectassessordata implements org.nrg.xdat.model.XnatAupdrs3dataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAupdrs3data.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat_a:updrs3Data";
-
-	public AutoXnatAupdrs3data(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAupdrs3data(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAupdrs3data(UserI user)
-	 **/
-	public AutoXnatAupdrs3data(){}
-
-	public AutoXnatAupdrs3data(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat_a:updrs3Data";
-	}
-	 private org.nrg.xdat.om.XnatSubjectassessordata _Subjectassessordata =null;
-
-	/**
-	 * subjectAssessorData
-	 * @return org.nrg.xdat.om.XnatSubjectassessordata
-	 */
-	public org.nrg.xdat.om.XnatSubjectassessordata getSubjectassessordata() {
-		try{
-			if (_Subjectassessordata==null){
-				_Subjectassessordata=((XnatSubjectassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("subjectAssessorData")));
-				return _Subjectassessordata;
-			}else {
-				return _Subjectassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for subjectAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectassessordata(ItemI v) throws Exception{
-		_Subjectassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectAssessorData
-	 * set org.nrg.xdat.model.XnatSubjectassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> void setSubjectassessordata(A item) throws Exception{
-	setSubjectassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectAssessorData.
-	 * */
-	public void removeSubjectassessordata() {
-		_Subjectassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Inscanner=null;
-
-	/**
-	 * @return Returns the inScanner.
-	 */
-	public Boolean getInscanner() {
-		try{
-			if (_Inscanner==null){
-				_Inscanner=getBooleanProperty("inScanner");
-				return _Inscanner;
-			}else {
-				return _Inscanner;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for inScanner.
-	 * @param v Value to Set.
-	 */
-	public void setInscanner(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/inScanner",v);
-		_Inscanner=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Clicker_right=null;
-
-	/**
-	 * @return Returns the clicker/right.
-	 */
-	public Integer getClicker_right() {
-		try{
-			if (_Clicker_right==null){
-				_Clicker_right=getIntegerProperty("clicker/right");
-				return _Clicker_right;
-			}else {
-				return _Clicker_right;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for clicker/right.
-	 * @param v Value to Set.
-	 */
-	public void setClicker_right(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/clicker/right",v);
-		_Clicker_right=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Clicker_left=null;
-
-	/**
-	 * @return Returns the clicker/left.
-	 */
-	public Integer getClicker_left() {
-		try{
-			if (_Clicker_left==null){
-				_Clicker_left=getIntegerProperty("clicker/left");
-				return _Clicker_left;
-			}else {
-				return _Clicker_left;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for clicker/left.
-	 * @param v Value to Set.
-	 */
-	public void setClicker_left(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/clicker/left",v);
-		_Clicker_left=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Clicker_interval=null;
-
-	/**
-	 * @return Returns the clicker/interval.
-	 */
-	public Integer getClicker_interval() {
-		try{
-			if (_Clicker_interval==null){
-				_Clicker_interval=getIntegerProperty("clicker/interval");
-				return _Clicker_interval;
-			}else {
-				return _Clicker_interval;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for clicker/interval.
-	 * @param v Value to Set.
-	 */
-	public void setClicker_interval(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/clicker/interval",v);
-		_Clicker_interval=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tremorrest_face=null;
-
-	/**
-	 * @return Returns the tremorRest/face.
-	 */
-	public String getTremorrest_face(){
-		try{
-			if (_Tremorrest_face==null){
-				_Tremorrest_face=getStringProperty("tremorRest/face");
-				return _Tremorrest_face;
-			}else {
-				return _Tremorrest_face;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tremorRest/face.
-	 * @param v Value to Set.
-	 */
-	public void setTremorrest_face(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tremorRest/face",v);
-		_Tremorrest_face=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tremorrest_rue=null;
-
-	/**
-	 * @return Returns the tremorRest/rue.
-	 */
-	public String getTremorrest_rue(){
-		try{
-			if (_Tremorrest_rue==null){
-				_Tremorrest_rue=getStringProperty("tremorRest/rue");
-				return _Tremorrest_rue;
-			}else {
-				return _Tremorrest_rue;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tremorRest/rue.
-	 * @param v Value to Set.
-	 */
-	public void setTremorrest_rue(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tremorRest/rue",v);
-		_Tremorrest_rue=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tremorrest_lue=null;
-
-	/**
-	 * @return Returns the tremorRest/lue.
-	 */
-	public String getTremorrest_lue(){
-		try{
-			if (_Tremorrest_lue==null){
-				_Tremorrest_lue=getStringProperty("tremorRest/lue");
-				return _Tremorrest_lue;
-			}else {
-				return _Tremorrest_lue;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tremorRest/lue.
-	 * @param v Value to Set.
-	 */
-	public void setTremorrest_lue(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tremorRest/lue",v);
-		_Tremorrest_lue=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tremorrest_rle=null;
-
-	/**
-	 * @return Returns the tremorRest/rle.
-	 */
-	public String getTremorrest_rle(){
-		try{
-			if (_Tremorrest_rle==null){
-				_Tremorrest_rle=getStringProperty("tremorRest/rle");
-				return _Tremorrest_rle;
-			}else {
-				return _Tremorrest_rle;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tremorRest/rle.
-	 * @param v Value to Set.
-	 */
-	public void setTremorrest_rle(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tremorRest/rle",v);
-		_Tremorrest_rle=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tremorrest_lle=null;
-
-	/**
-	 * @return Returns the tremorRest/lle.
-	 */
-	public String getTremorrest_lle(){
-		try{
-			if (_Tremorrest_lle==null){
-				_Tremorrest_lle=getStringProperty("tremorRest/lle");
-				return _Tremorrest_lle;
-			}else {
-				return _Tremorrest_lle;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tremorRest/lle.
-	 * @param v Value to Set.
-	 */
-	public void setTremorrest_lle(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tremorRest/lle",v);
-		_Tremorrest_lle=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rigidity_neck=null;
-
-	/**
-	 * @return Returns the rigidity/neck.
-	 */
-	public String getRigidity_neck(){
-		try{
-			if (_Rigidity_neck==null){
-				_Rigidity_neck=getStringProperty("rigidity/neck");
-				return _Rigidity_neck;
-			}else {
-				return _Rigidity_neck;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rigidity/neck.
-	 * @param v Value to Set.
-	 */
-	public void setRigidity_neck(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rigidity/neck",v);
-		_Rigidity_neck=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rigidity_rue=null;
-
-	/**
-	 * @return Returns the rigidity/rue.
-	 */
-	public String getRigidity_rue(){
-		try{
-			if (_Rigidity_rue==null){
-				_Rigidity_rue=getStringProperty("rigidity/rue");
-				return _Rigidity_rue;
-			}else {
-				return _Rigidity_rue;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rigidity/rue.
-	 * @param v Value to Set.
-	 */
-	public void setRigidity_rue(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rigidity/rue",v);
-		_Rigidity_rue=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rigidity_lue=null;
-
-	/**
-	 * @return Returns the rigidity/lue.
-	 */
-	public String getRigidity_lue(){
-		try{
-			if (_Rigidity_lue==null){
-				_Rigidity_lue=getStringProperty("rigidity/lue");
-				return _Rigidity_lue;
-			}else {
-				return _Rigidity_lue;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rigidity/lue.
-	 * @param v Value to Set.
-	 */
-	public void setRigidity_lue(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rigidity/lue",v);
-		_Rigidity_lue=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rigidity_rle=null;
-
-	/**
-	 * @return Returns the rigidity/rle.
-	 */
-	public String getRigidity_rle(){
-		try{
-			if (_Rigidity_rle==null){
-				_Rigidity_rle=getStringProperty("rigidity/rle");
-				return _Rigidity_rle;
-			}else {
-				return _Rigidity_rle;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rigidity/rle.
-	 * @param v Value to Set.
-	 */
-	public void setRigidity_rle(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rigidity/rle",v);
-		_Rigidity_rle=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rigidity_lle=null;
-
-	/**
-	 * @return Returns the rigidity/lle.
-	 */
-	public String getRigidity_lle(){
-		try{
-			if (_Rigidity_lle==null){
-				_Rigidity_lle=getStringProperty("rigidity/lle");
-				return _Rigidity_lle;
-			}else {
-				return _Rigidity_lle;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rigidity/lle.
-	 * @param v Value to Set.
-	 */
-	public void setRigidity_lle(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rigidity/lle",v);
-		_Rigidity_lle=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Handmovementsgrip_right=null;
-
-	/**
-	 * @return Returns the handMovementsGrip/right.
-	 */
-	public Integer getHandmovementsgrip_right() {
-		try{
-			if (_Handmovementsgrip_right==null){
-				_Handmovementsgrip_right=getIntegerProperty("handMovementsGrip/right");
-				return _Handmovementsgrip_right;
-			}else {
-				return _Handmovementsgrip_right;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for handMovementsGrip/right.
-	 * @param v Value to Set.
-	 */
-	public void setHandmovementsgrip_right(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/handMovementsGrip/right",v);
-		_Handmovementsgrip_right=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Handmovementsgrip_left=null;
-
-	/**
-	 * @return Returns the handMovementsGrip/left.
-	 */
-	public Integer getHandmovementsgrip_left() {
-		try{
-			if (_Handmovementsgrip_left==null){
-				_Handmovementsgrip_left=getIntegerProperty("handMovementsGrip/left");
-				return _Handmovementsgrip_left;
-			}else {
-				return _Handmovementsgrip_left;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for handMovementsGrip/left.
-	 * @param v Value to Set.
-	 */
-	public void setHandmovementsgrip_left(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/handMovementsGrip/left",v);
-		_Handmovementsgrip_left=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Facialexpression=null;
-
-	/**
-	 * @return Returns the facialExpression.
-	 */
-	public Integer getFacialexpression() {
-		try{
-			if (_Facialexpression==null){
-				_Facialexpression=getIntegerProperty("facialExpression");
-				return _Facialexpression;
-			}else {
-				return _Facialexpression;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for facialExpression.
-	 * @param v Value to Set.
-	 */
-	public void setFacialexpression(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/facialExpression",v);
-		_Facialexpression=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Gait=null;
-
-	/**
-	 * @return Returns the gait.
-	 */
-	public Integer getGait() {
-		try{
-			if (_Gait==null){
-				_Gait=getIntegerProperty("gait");
-				return _Gait;
-			}else {
-				return _Gait;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for gait.
-	 * @param v Value to Set.
-	 */
-	public void setGait(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/gait",v);
-		_Gait=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Speech=null;
-
-	/**
-	 * @return Returns the speech.
-	 */
-	public Integer getSpeech() {
-		try{
-			if (_Speech==null){
-				_Speech=getIntegerProperty("speech");
-				return _Speech;
-			}else {
-				return _Speech;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for speech.
-	 * @param v Value to Set.
-	 */
-	public void setSpeech(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/speech",v);
-		_Speech=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Writing=null;
-
-	/**
-	 * @return Returns the writing.
-	 */
-	public Integer getWriting() {
-		try{
-			if (_Writing==null){
-				_Writing=getIntegerProperty("writing");
-				return _Writing;
-			}else {
-				return _Writing;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for writing.
-	 * @param v Value to Set.
-	 */
-	public void setWriting(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/writing",v);
-		_Writing=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Arisefromchair=null;
-
-	/**
-	 * @return Returns the ariseFromChair.
-	 */
-	public Integer getArisefromchair() {
-		try{
-			if (_Arisefromchair==null){
-				_Arisefromchair=getIntegerProperty("ariseFromChair");
-				return _Arisefromchair;
-			}else {
-				return _Arisefromchair;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ariseFromChair.
-	 * @param v Value to Set.
-	 */
-	public void setArisefromchair(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ariseFromChair",v);
-		_Arisefromchair=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Actionposturaltremor_right=null;
-
-	/**
-	 * @return Returns the actionPosturalTremor/right.
-	 */
-	public Integer getActionposturaltremor_right() {
-		try{
-			if (_Actionposturaltremor_right==null){
-				_Actionposturaltremor_right=getIntegerProperty("actionPosturalTremor/right");
-				return _Actionposturaltremor_right;
-			}else {
-				return _Actionposturaltremor_right;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for actionPosturalTremor/right.
-	 * @param v Value to Set.
-	 */
-	public void setActionposturaltremor_right(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/actionPosturalTremor/right",v);
-		_Actionposturaltremor_right=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Actionposturaltremor_left=null;
-
-	/**
-	 * @return Returns the actionPosturalTremor/left.
-	 */
-	public Integer getActionposturaltremor_left() {
-		try{
-			if (_Actionposturaltremor_left==null){
-				_Actionposturaltremor_left=getIntegerProperty("actionPosturalTremor/left");
-				return _Actionposturaltremor_left;
-			}else {
-				return _Actionposturaltremor_left;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for actionPosturalTremor/left.
-	 * @param v Value to Set.
-	 */
-	public void setActionposturaltremor_left(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/actionPosturalTremor/left",v);
-		_Actionposturaltremor_left=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Handsram_right=null;
-
-	/**
-	 * @return Returns the handsRAM/right.
-	 */
-	public Integer getHandsram_right() {
-		try{
-			if (_Handsram_right==null){
-				_Handsram_right=getIntegerProperty("handsRAM/right");
-				return _Handsram_right;
-			}else {
-				return _Handsram_right;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for handsRAM/right.
-	 * @param v Value to Set.
-	 */
-	public void setHandsram_right(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/handsRAM/right",v);
-		_Handsram_right=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Handsram_left=null;
-
-	/**
-	 * @return Returns the handsRAM/left.
-	 */
-	public Integer getHandsram_left() {
-		try{
-			if (_Handsram_left==null){
-				_Handsram_left=getIntegerProperty("handsRAM/left");
-				return _Handsram_left;
-			}else {
-				return _Handsram_left;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for handsRAM/left.
-	 * @param v Value to Set.
-	 */
-	public void setHandsram_left(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/handsRAM/left",v);
-		_Handsram_left=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Fingertaps_right=null;
-
-	/**
-	 * @return Returns the fingerTaps/right.
-	 */
-	public Integer getFingertaps_right() {
-		try{
-			if (_Fingertaps_right==null){
-				_Fingertaps_right=getIntegerProperty("fingerTaps/right");
-				return _Fingertaps_right;
-			}else {
-				return _Fingertaps_right;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for fingerTaps/right.
-	 * @param v Value to Set.
-	 */
-	public void setFingertaps_right(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/fingerTaps/right",v);
-		_Fingertaps_right=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Fingertaps_left=null;
-
-	/**
-	 * @return Returns the fingerTaps/left.
-	 */
-	public Integer getFingertaps_left() {
-		try{
-			if (_Fingertaps_left==null){
-				_Fingertaps_left=getIntegerProperty("fingerTaps/left");
-				return _Fingertaps_left;
-			}else {
-				return _Fingertaps_left;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for fingerTaps/left.
-	 * @param v Value to Set.
-	 */
-	public void setFingertaps_left(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/fingerTaps/left",v);
-		_Fingertaps_left=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Posture=null;
-
-	/**
-	 * @return Returns the posture.
-	 */
-	public Integer getPosture() {
-		try{
-			if (_Posture==null){
-				_Posture=getIntegerProperty("posture");
-				return _Posture;
-			}else {
-				return _Posture;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for posture.
-	 * @param v Value to Set.
-	 */
-	public void setPosture(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/posture",v);
-		_Posture=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Posturalstability=null;
-
-	/**
-	 * @return Returns the posturalStability.
-	 */
-	public Integer getPosturalstability() {
-		try{
-			if (_Posturalstability==null){
-				_Posturalstability=getIntegerProperty("posturalStability");
-				return _Posturalstability;
-			}else {
-				return _Posturalstability;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for posturalStability.
-	 * @param v Value to Set.
-	 */
-	public void setPosturalstability(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/posturalStability",v);
-		_Posturalstability=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Foottaps_right=null;
-
-	/**
-	 * @return Returns the footTaps/right.
-	 */
-	public Integer getFoottaps_right() {
-		try{
-			if (_Foottaps_right==null){
-				_Foottaps_right=getIntegerProperty("footTaps/right");
-				return _Foottaps_right;
-			}else {
-				return _Foottaps_right;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for footTaps/right.
-	 * @param v Value to Set.
-	 */
-	public void setFoottaps_right(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/footTaps/right",v);
-		_Foottaps_right=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Foottaps_left=null;
-
-	/**
-	 * @return Returns the footTaps/left.
-	 */
-	public Integer getFoottaps_left() {
-		try{
-			if (_Foottaps_left==null){
-				_Foottaps_left=getIntegerProperty("footTaps/left");
-				return _Foottaps_left;
-			}else {
-				return _Foottaps_left;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for footTaps/left.
-	 * @param v Value to Set.
-	 */
-	public void setFoottaps_left(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/footTaps/left",v);
-		_Foottaps_left=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Bodybradykinesiahypokinesia=null;
-
-	/**
-	 * @return Returns the bodyBradykinesiaHypokinesia.
-	 */
-	public Integer getBodybradykinesiahypokinesia() {
-		try{
-			if (_Bodybradykinesiahypokinesia==null){
-				_Bodybradykinesiahypokinesia=getIntegerProperty("bodyBradykinesiaHypokinesia");
-				return _Bodybradykinesiahypokinesia;
-			}else {
-				return _Bodybradykinesiahypokinesia;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for bodyBradykinesiaHypokinesia.
-	 * @param v Value to Set.
-	 */
-	public void setBodybradykinesiahypokinesia(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/bodyBradykinesiaHypokinesia",v);
-		_Bodybradykinesiahypokinesia=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Problem=null;
-
-	/**
-	 * @return Returns the problem.
-	 */
-	public Boolean getProblem() {
-		try{
-			if (_Problem==null){
-				_Problem=getBooleanProperty("problem");
-				return _Problem;
-			}else {
-				return _Problem;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for problem.
-	 * @param v Value to Set.
-	 */
-	public void setProblem(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/problem",v);
-		_Problem=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAupdrs3data> getAllXnatAupdrs3datas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAupdrs3data> al = new ArrayList<org.nrg.xdat.om.XnatAupdrs3data>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAupdrs3data> getXnatAupdrs3datasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAupdrs3data> al = new ArrayList<org.nrg.xdat.om.XnatAupdrs3data>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAupdrs3data> getXnatAupdrs3datasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAupdrs3data> al = new ArrayList<org.nrg.xdat.om.XnatAupdrs3data>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAupdrs3data getXnatAupdrs3datasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat_a:updrs3Data/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAupdrs3data) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //subjectAssessorData
-	        XnatSubjectassessordata childSubjectassessordata = (XnatSubjectassessordata)this.getSubjectassessordata();
-	            if (childSubjectassessordata!=null){
-	              for(ResourceFile rf: ((XnatSubjectassessordata)childSubjectassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectAssessorData[" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectAssessorData/" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAybocsdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAybocsdata.java
deleted file mode 100644
index 8563c0df..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAybocsdata.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAybocsdata extends XnatSubjectassessordata implements org.nrg.xdat.model.XnatAybocsdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAybocsdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat_a:ybocsData";
-
-	public AutoXnatAybocsdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAybocsdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAybocsdata(UserI user)
-	 **/
-	public AutoXnatAybocsdata(){}
-
-	public AutoXnatAybocsdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat_a:ybocsData";
-	}
-	 private org.nrg.xdat.om.XnatSubjectassessordata _Subjectassessordata =null;
-
-	/**
-	 * subjectAssessorData
-	 * @return org.nrg.xdat.om.XnatSubjectassessordata
-	 */
-	public org.nrg.xdat.om.XnatSubjectassessordata getSubjectassessordata() {
-		try{
-			if (_Subjectassessordata==null){
-				_Subjectassessordata=((XnatSubjectassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("subjectAssessorData")));
-				return _Subjectassessordata;
-			}else {
-				return _Subjectassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for subjectAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectassessordata(ItemI v) throws Exception{
-		_Subjectassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectAssessorData
-	 * set org.nrg.xdat.model.XnatSubjectassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> void setSubjectassessordata(A item) throws Exception{
-	setSubjectassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectAssessorData.
-	 * */
-	public void removeSubjectassessordata() {
-		_Subjectassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Currentorworstever=null;
-
-	/**
-	 * @return Returns the currentOrWorstEver.
-	 */
-	public String getCurrentorworstever(){
-		try{
-			if (_Currentorworstever==null){
-				_Currentorworstever=getStringProperty("currentOrWorstEver");
-				return _Currentorworstever;
-			}else {
-				return _Currentorworstever;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for currentOrWorstEver.
-	 * @param v Value to Set.
-	 */
-	public void setCurrentorworstever(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/currentOrWorstEver",v);
-		_Currentorworstever=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Timeoccupiedwiththoughts=null;
-
-	/**
-	 * @return Returns the timeOccupiedWithThoughts.
-	 */
-	public Integer getTimeoccupiedwiththoughts() {
-		try{
-			if (_Timeoccupiedwiththoughts==null){
-				_Timeoccupiedwiththoughts=getIntegerProperty("timeOccupiedWithThoughts");
-				return _Timeoccupiedwiththoughts;
-			}else {
-				return _Timeoccupiedwiththoughts;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for timeOccupiedWithThoughts.
-	 * @param v Value to Set.
-	 */
-	public void setTimeoccupiedwiththoughts(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/timeOccupiedWithThoughts",v);
-		_Timeoccupiedwiththoughts=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Thoughtsinterferefunctioning=null;
-
-	/**
-	 * @return Returns the thoughtsInterfereFunctioning.
-	 */
-	public Integer getThoughtsinterferefunctioning() {
-		try{
-			if (_Thoughtsinterferefunctioning==null){
-				_Thoughtsinterferefunctioning=getIntegerProperty("thoughtsInterfereFunctioning");
-				return _Thoughtsinterferefunctioning;
-			}else {
-				return _Thoughtsinterferefunctioning;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for thoughtsInterfereFunctioning.
-	 * @param v Value to Set.
-	 */
-	public void setThoughtsinterferefunctioning(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/thoughtsInterfereFunctioning",v);
-		_Thoughtsinterferefunctioning=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Distresscaused=null;
-
-	/**
-	 * @return Returns the distressCaused.
-	 */
-	public Integer getDistresscaused() {
-		try{
-			if (_Distresscaused==null){
-				_Distresscaused=getIntegerProperty("distressCaused");
-				return _Distresscaused;
-			}else {
-				return _Distresscaused;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for distressCaused.
-	 * @param v Value to Set.
-	 */
-	public void setDistresscaused(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/distressCaused",v);
-		_Distresscaused=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Efforttoresistthoughts=null;
-
-	/**
-	 * @return Returns the effortToResistThoughts.
-	 */
-	public Integer getEfforttoresistthoughts() {
-		try{
-			if (_Efforttoresistthoughts==null){
-				_Efforttoresistthoughts=getIntegerProperty("effortToResistThoughts");
-				return _Efforttoresistthoughts;
-			}else {
-				return _Efforttoresistthoughts;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for effortToResistThoughts.
-	 * @param v Value to Set.
-	 */
-	public void setEfforttoresistthoughts(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/effortToResistThoughts",v);
-		_Efforttoresistthoughts=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Controloverthoughts=null;
-
-	/**
-	 * @return Returns the controlOverThoughts.
-	 */
-	public Integer getControloverthoughts() {
-		try{
-			if (_Controloverthoughts==null){
-				_Controloverthoughts=getIntegerProperty("controlOverThoughts");
-				return _Controloverthoughts;
-			}else {
-				return _Controloverthoughts;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for controlOverThoughts.
-	 * @param v Value to Set.
-	 */
-	public void setControloverthoughts(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/controlOverThoughts",v);
-		_Controloverthoughts=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Timeperforming=null;
-
-	/**
-	 * @return Returns the timePerforming.
-	 */
-	public Integer getTimeperforming() {
-		try{
-			if (_Timeperforming==null){
-				_Timeperforming=getIntegerProperty("timePerforming");
-				return _Timeperforming;
-			}else {
-				return _Timeperforming;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for timePerforming.
-	 * @param v Value to Set.
-	 */
-	public void setTimeperforming(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/timePerforming",v);
-		_Timeperforming=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Behaviorsinterferefunctioning=null;
-
-	/**
-	 * @return Returns the behaviorsInterfereFunctioning.
-	 */
-	public Integer getBehaviorsinterferefunctioning() {
-		try{
-			if (_Behaviorsinterferefunctioning==null){
-				_Behaviorsinterferefunctioning=getIntegerProperty("behaviorsInterfereFunctioning");
-				return _Behaviorsinterferefunctioning;
-			}else {
-				return _Behaviorsinterferefunctioning;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for behaviorsInterfereFunctioning.
-	 * @param v Value to Set.
-	 */
-	public void setBehaviorsinterferefunctioning(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/behaviorsInterfereFunctioning",v);
-		_Behaviorsinterferefunctioning=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Feelingifprevented=null;
-
-	/**
-	 * @return Returns the feelingIfPrevented.
-	 */
-	public Integer getFeelingifprevented() {
-		try{
-			if (_Feelingifprevented==null){
-				_Feelingifprevented=getIntegerProperty("feelingIfPrevented");
-				return _Feelingifprevented;
-			}else {
-				return _Feelingifprevented;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for feelingIfPrevented.
-	 * @param v Value to Set.
-	 */
-	public void setFeelingifprevented(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/feelingIfPrevented",v);
-		_Feelingifprevented=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Efforttoresistbehaviors=null;
-
-	/**
-	 * @return Returns the effortToResistBehaviors.
-	 */
-	public Integer getEfforttoresistbehaviors() {
-		try{
-			if (_Efforttoresistbehaviors==null){
-				_Efforttoresistbehaviors=getIntegerProperty("effortToResistBehaviors");
-				return _Efforttoresistbehaviors;
-			}else {
-				return _Efforttoresistbehaviors;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for effortToResistBehaviors.
-	 * @param v Value to Set.
-	 */
-	public void setEfforttoresistbehaviors(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/effortToResistBehaviors",v);
-		_Efforttoresistbehaviors=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Behaviordrivestrength=null;
-
-	/**
-	 * @return Returns the behaviorDriveStrength.
-	 */
-	public Integer getBehaviordrivestrength() {
-		try{
-			if (_Behaviordrivestrength==null){
-				_Behaviordrivestrength=getIntegerProperty("behaviorDriveStrength");
-				return _Behaviordrivestrength;
-			}else {
-				return _Behaviordrivestrength;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for behaviorDriveStrength.
-	 * @param v Value to Set.
-	 */
-	public void setBehaviordrivestrength(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/behaviorDriveStrength",v);
-		_Behaviordrivestrength=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Untiljustright=null;
-
-	/**
-	 * @return Returns the untilJustRight.
-	 */
-	public Boolean getUntiljustright() {
-		try{
-			if (_Untiljustright==null){
-				_Untiljustright=getBooleanProperty("untilJustRight");
-				return _Untiljustright;
-			}else {
-				return _Untiljustright;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for untilJustRight.
-	 * @param v Value to Set.
-	 */
-	public void setUntiljustright(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/untilJustRight",v);
-		_Untiljustright=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Untiljustrightawareness=null;
-
-	/**
-	 * @return Returns the untilJustRightAwareness.
-	 */
-	public String getUntiljustrightawareness(){
-		try{
-			if (_Untiljustrightawareness==null){
-				_Untiljustrightawareness=getStringProperty("untilJustRightAwareness");
-				return _Untiljustrightawareness;
-			}else {
-				return _Untiljustrightawareness;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for untilJustRightAwareness.
-	 * @param v Value to Set.
-	 */
-	public void setUntiljustrightawareness(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/untilJustRightAwareness",v);
-		_Untiljustrightawareness=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Untiljustrightperceptions=null;
-
-	/**
-	 * @return Returns the untilJustRightPerceptions.
-	 */
-	public String getUntiljustrightperceptions(){
-		try{
-			if (_Untiljustrightperceptions==null){
-				_Untiljustrightperceptions=getStringProperty("untilJustRightPerceptions");
-				return _Untiljustrightperceptions;
-			}else {
-				return _Untiljustrightperceptions;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for untilJustRightPerceptions.
-	 * @param v Value to Set.
-	 */
-	public void setUntiljustrightperceptions(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/untilJustRightPerceptions",v);
-		_Untiljustrightperceptions=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Whenstartuntiljustright=null;
-
-	/**
-	 * @return Returns the whenStartUntilJustRight.
-	 */
-	public String getWhenstartuntiljustright(){
-		try{
-			if (_Whenstartuntiljustright==null){
-				_Whenstartuntiljustright=getStringProperty("whenStartUntilJustRight");
-				return _Whenstartuntiljustright;
-			}else {
-				return _Whenstartuntiljustright;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for whenStartUntilJustRight.
-	 * @param v Value to Set.
-	 */
-	public void setWhenstartuntiljustright(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/whenStartUntilJustRight",v);
-		_Whenstartuntiljustright=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Frequencyuntiljustright=null;
-
-	/**
-	 * @return Returns the frequencyUntilJustRight.
-	 */
-	public String getFrequencyuntiljustright(){
-		try{
-			if (_Frequencyuntiljustright==null){
-				_Frequencyuntiljustright=getStringProperty("frequencyUntilJustRight");
-				return _Frequencyuntiljustright;
-			}else {
-				return _Frequencyuntiljustright;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for frequencyUntilJustRight.
-	 * @param v Value to Set.
-	 */
-	public void setFrequencyuntiljustright(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/frequencyUntilJustRight",v);
-		_Frequencyuntiljustright=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Firstuntiljustrightage=null;
-
-	/**
-	 * @return Returns the firstUntilJustRightAge.
-	 */
-	public Double getFirstuntiljustrightage() {
-		try{
-			if (_Firstuntiljustrightage==null){
-				_Firstuntiljustrightage=getDoubleProperty("firstUntilJustRightAge");
-				return _Firstuntiljustrightage;
-			}else {
-				return _Firstuntiljustrightage;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for firstUntilJustRightAge.
-	 * @param v Value to Set.
-	 */
-	public void setFirstuntiljustrightage(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/firstUntilJustRightAge",v);
-		_Firstuntiljustrightage=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAybocsdata> getAllXnatAybocsdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAybocsdata> al = new ArrayList<org.nrg.xdat.om.XnatAybocsdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAybocsdata> getXnatAybocsdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAybocsdata> al = new ArrayList<org.nrg.xdat.om.XnatAybocsdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAybocsdata> getXnatAybocsdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAybocsdata> al = new ArrayList<org.nrg.xdat.om.XnatAybocsdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAybocsdata getXnatAybocsdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat_a:ybocsData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAybocsdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //subjectAssessorData
-	        XnatSubjectassessordata childSubjectassessordata = (XnatSubjectassessordata)this.getSubjectassessordata();
-	            if (childSubjectassessordata!=null){
-	              for(ResourceFile rf: ((XnatSubjectassessordata)childSubjectassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectAssessorData[" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectAssessorData/" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAygtssdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAygtssdata.java
deleted file mode 100644
index 2eee4c8f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatAygtssdata.java
+++ /dev/null
@@ -1,662 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatAygtssdata extends XnatSubjectassessordata implements org.nrg.xdat.model.XnatAygtssdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatAygtssdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat_a:ygtssData";
-
-	public AutoXnatAygtssdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatAygtssdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatAygtssdata(UserI user)
-	 **/
-	public AutoXnatAygtssdata(){}
-
-	public AutoXnatAygtssdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat_a:ygtssData";
-	}
-	 private org.nrg.xdat.om.XnatSubjectassessordata _Subjectassessordata =null;
-
-	/**
-	 * subjectAssessorData
-	 * @return org.nrg.xdat.om.XnatSubjectassessordata
-	 */
-	public org.nrg.xdat.om.XnatSubjectassessordata getSubjectassessordata() {
-		try{
-			if (_Subjectassessordata==null){
-				_Subjectassessordata=((XnatSubjectassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("subjectAssessorData")));
-				return _Subjectassessordata;
-			}else {
-				return _Subjectassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for subjectAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectassessordata(ItemI v) throws Exception{
-		_Subjectassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectAssessorData
-	 * set org.nrg.xdat.model.XnatSubjectassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> void setSubjectassessordata(A item) throws Exception{
-	setSubjectassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectAssessorData.
-	 * */
-	public void removeSubjectassessordata() {
-		_Subjectassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Filledoutby=null;
-
-	/**
-	 * @return Returns the filledOutBy.
-	 */
-	public String getFilledoutby(){
-		try{
-			if (_Filledoutby==null){
-				_Filledoutby=getStringProperty("filledOutBy");
-				return _Filledoutby;
-			}else {
-				return _Filledoutby;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for filledOutBy.
-	 * @param v Value to Set.
-	 */
-	public void setFilledoutby(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/filledOutBy",v);
-		_Filledoutby=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Period=null;
-
-	/**
-	 * @return Returns the period.
-	 */
-	public String getPeriod(){
-		try{
-			if (_Period==null){
-				_Period=getStringProperty("period");
-				return _Period;
-			}else {
-				return _Period;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for period.
-	 * @param v Value to Set.
-	 */
-	public void setPeriod(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/period",v);
-		_Period=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Worsteverage=null;
-
-	/**
-	 * @return Returns the worstEverAge.
-	 */
-	public Double getWorsteverage() {
-		try{
-			if (_Worsteverage==null){
-				_Worsteverage=getDoubleProperty("worstEverAge");
-				return _Worsteverage;
-			}else {
-				return _Worsteverage;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for worstEverAge.
-	 * @param v Value to Set.
-	 */
-	public void setWorsteverage(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/worstEverAge",v);
-		_Worsteverage=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Motor_number=null;
-
-	/**
-	 * @return Returns the motor/number.
-	 */
-	public Integer getMotor_number() {
-		try{
-			if (_Motor_number==null){
-				_Motor_number=getIntegerProperty("motor/number");
-				return _Motor_number;
-			}else {
-				return _Motor_number;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for motor/number.
-	 * @param v Value to Set.
-	 */
-	public void setMotor_number(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/motor/number",v);
-		_Motor_number=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Motor_frequency=null;
-
-	/**
-	 * @return Returns the motor/frequency.
-	 */
-	public Integer getMotor_frequency() {
-		try{
-			if (_Motor_frequency==null){
-				_Motor_frequency=getIntegerProperty("motor/frequency");
-				return _Motor_frequency;
-			}else {
-				return _Motor_frequency;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for motor/frequency.
-	 * @param v Value to Set.
-	 */
-	public void setMotor_frequency(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/motor/frequency",v);
-		_Motor_frequency=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Motor_intensity=null;
-
-	/**
-	 * @return Returns the motor/intensity.
-	 */
-	public Integer getMotor_intensity() {
-		try{
-			if (_Motor_intensity==null){
-				_Motor_intensity=getIntegerProperty("motor/intensity");
-				return _Motor_intensity;
-			}else {
-				return _Motor_intensity;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for motor/intensity.
-	 * @param v Value to Set.
-	 */
-	public void setMotor_intensity(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/motor/intensity",v);
-		_Motor_intensity=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Motor_complexity=null;
-
-	/**
-	 * @return Returns the motor/complexity.
-	 */
-	public Integer getMotor_complexity() {
-		try{
-			if (_Motor_complexity==null){
-				_Motor_complexity=getIntegerProperty("motor/complexity");
-				return _Motor_complexity;
-			}else {
-				return _Motor_complexity;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for motor/complexity.
-	 * @param v Value to Set.
-	 */
-	public void setMotor_complexity(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/motor/complexity",v);
-		_Motor_complexity=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Motor_interference=null;
-
-	/**
-	 * @return Returns the motor/interference.
-	 */
-	public Integer getMotor_interference() {
-		try{
-			if (_Motor_interference==null){
-				_Motor_interference=getIntegerProperty("motor/interference");
-				return _Motor_interference;
-			}else {
-				return _Motor_interference;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for motor/interference.
-	 * @param v Value to Set.
-	 */
-	public void setMotor_interference(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/motor/interference",v);
-		_Motor_interference=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Motor_inventory=null;
-
-	/**
-	 * @return Returns the motor/inventory.
-	 */
-	public String getMotor_inventory(){
-		try{
-			if (_Motor_inventory==null){
-				_Motor_inventory=getStringProperty("motor/inventory");
-				return _Motor_inventory;
-			}else {
-				return _Motor_inventory;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for motor/inventory.
-	 * @param v Value to Set.
-	 */
-	public void setMotor_inventory(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/motor/inventory",v);
-		_Motor_inventory=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Phonic_number=null;
-
-	/**
-	 * @return Returns the phonic/number.
-	 */
-	public Integer getPhonic_number() {
-		try{
-			if (_Phonic_number==null){
-				_Phonic_number=getIntegerProperty("phonic/number");
-				return _Phonic_number;
-			}else {
-				return _Phonic_number;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for phonic/number.
-	 * @param v Value to Set.
-	 */
-	public void setPhonic_number(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/phonic/number",v);
-		_Phonic_number=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Phonic_frequency=null;
-
-	/**
-	 * @return Returns the phonic/frequency.
-	 */
-	public Integer getPhonic_frequency() {
-		try{
-			if (_Phonic_frequency==null){
-				_Phonic_frequency=getIntegerProperty("phonic/frequency");
-				return _Phonic_frequency;
-			}else {
-				return _Phonic_frequency;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for phonic/frequency.
-	 * @param v Value to Set.
-	 */
-	public void setPhonic_frequency(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/phonic/frequency",v);
-		_Phonic_frequency=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Phonic_intensity=null;
-
-	/**
-	 * @return Returns the phonic/intensity.
-	 */
-	public Integer getPhonic_intensity() {
-		try{
-			if (_Phonic_intensity==null){
-				_Phonic_intensity=getIntegerProperty("phonic/intensity");
-				return _Phonic_intensity;
-			}else {
-				return _Phonic_intensity;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for phonic/intensity.
-	 * @param v Value to Set.
-	 */
-	public void setPhonic_intensity(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/phonic/intensity",v);
-		_Phonic_intensity=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Phonic_complexity=null;
-
-	/**
-	 * @return Returns the phonic/complexity.
-	 */
-	public Integer getPhonic_complexity() {
-		try{
-			if (_Phonic_complexity==null){
-				_Phonic_complexity=getIntegerProperty("phonic/complexity");
-				return _Phonic_complexity;
-			}else {
-				return _Phonic_complexity;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for phonic/complexity.
-	 * @param v Value to Set.
-	 */
-	public void setPhonic_complexity(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/phonic/complexity",v);
-		_Phonic_complexity=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Phonic_interference=null;
-
-	/**
-	 * @return Returns the phonic/interference.
-	 */
-	public Integer getPhonic_interference() {
-		try{
-			if (_Phonic_interference==null){
-				_Phonic_interference=getIntegerProperty("phonic/interference");
-				return _Phonic_interference;
-			}else {
-				return _Phonic_interference;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for phonic/interference.
-	 * @param v Value to Set.
-	 */
-	public void setPhonic_interference(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/phonic/interference",v);
-		_Phonic_interference=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Phonic_inventory=null;
-
-	/**
-	 * @return Returns the phonic/inventory.
-	 */
-	public String getPhonic_inventory(){
-		try{
-			if (_Phonic_inventory==null){
-				_Phonic_inventory=getStringProperty("phonic/inventory");
-				return _Phonic_inventory;
-			}else {
-				return _Phonic_inventory;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for phonic/inventory.
-	 * @param v Value to Set.
-	 */
-	public void setPhonic_inventory(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/phonic/inventory",v);
-		_Phonic_inventory=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Impairment=null;
-
-	/**
-	 * @return Returns the impairment.
-	 */
-	public Integer getImpairment() {
-		try{
-			if (_Impairment==null){
-				_Impairment=getIntegerProperty("impairment");
-				return _Impairment;
-			}else {
-				return _Impairment;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for impairment.
-	 * @param v Value to Set.
-	 */
-	public void setImpairment(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/impairment",v);
-		_Impairment=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAygtssdata> getAllXnatAygtssdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAygtssdata> al = new ArrayList<org.nrg.xdat.om.XnatAygtssdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAygtssdata> getXnatAygtssdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAygtssdata> al = new ArrayList<org.nrg.xdat.om.XnatAygtssdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatAygtssdata> getXnatAygtssdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatAygtssdata> al = new ArrayList<org.nrg.xdat.om.XnatAygtssdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatAygtssdata getXnatAygtssdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat_a:ygtssData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatAygtssdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //subjectAssessorData
-	        XnatSubjectassessordata childSubjectassessordata = (XnatSubjectassessordata)this.getSubjectassessordata();
-	            if (childSubjectassessordata!=null){
-	              for(ResourceFile rf: ((XnatSubjectassessordata)childSubjectassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectAssessorData[" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectAssessorData/" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatComputationdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatComputationdata.java
deleted file mode 100644
index 9cf12571..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatComputationdata.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatComputationdata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatComputationdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatComputationdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:computationData";
-
-	public AutoXnatComputationdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatComputationdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatComputationdata(UserI user)
-	 **/
-	public AutoXnatComputationdata(){}
-
-	public AutoXnatComputationdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:computationData";
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Value=null;
-
-	/**
-	 * @return Returns the value.
-	 */
-	public String getValue(){
-		try{
-			if (_Value==null){
-				_Value=getStringProperty("value");
-				return _Value;
-			}else {
-				return _Value;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for value.
-	 * @param v Value to Set.
-	 */
-	public void setValue(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/value",v);
-		_Value=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Source=null;
-
-	/**
-	 * @return Returns the source.
-	 */
-	public String getSource(){
-		try{
-			if (_Source==null){
-				_Source=getStringProperty("source");
-				return _Source;
-			}else {
-				return _Source;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for source.
-	 * @param v Value to Set.
-	 */
-	public void setSource(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/source",v);
-		_Source=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Units=null;
-
-	/**
-	 * @return Returns the units.
-	 */
-	public String getUnits(){
-		try{
-			if (_Units==null){
-				_Units=getStringProperty("units");
-				return _Units;
-			}else {
-				return _Units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for units.
-	 * @param v Value to Set.
-	 */
-	public void setUnits(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/units",v);
-		_Units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatComputationdataId=null;
-
-	/**
-	 * @return Returns the xnat_computationData_id.
-	 */
-	public Integer getXnatComputationdataId() {
-		try{
-			if (_XnatComputationdataId==null){
-				_XnatComputationdataId=getIntegerProperty("xnat_computationData_id");
-				return _XnatComputationdataId;
-			}else {
-				return _XnatComputationdataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_computationData_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatComputationdataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_computationData_id",v);
-		_XnatComputationdataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatComputationdata> getAllXnatComputationdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatComputationdata> al = new ArrayList<org.nrg.xdat.om.XnatComputationdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatComputationdata> getXnatComputationdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatComputationdata> al = new ArrayList<org.nrg.xdat.om.XnatComputationdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatComputationdata> getXnatComputationdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatComputationdata> al = new ArrayList<org.nrg.xdat.om.XnatComputationdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatComputationdata getXnatComputationdatasByXnatComputationdataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:computationData/xnat_computationData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatComputationdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatContrastbolus.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatContrastbolus.java
deleted file mode 100644
index 4d4c3a52..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatContrastbolus.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatContrastbolus extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatContrastbolusI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatContrastbolus.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:contrastBolus";
-
-	public AutoXnatContrastbolus(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatContrastbolus(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatContrastbolus(UserI user)
-	 **/
-	public AutoXnatContrastbolus(){}
-
-	public AutoXnatContrastbolus(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:contrastBolus";
-	}
-
-	//FIELD
-
-	private String _Agent=null;
-
-	/**
-	 * @return Returns the agent.
-	 */
-	public String getAgent(){
-		try{
-			if (_Agent==null){
-				_Agent=getStringProperty("agent");
-				return _Agent;
-			}else {
-				return _Agent;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for agent.
-	 * @param v Value to Set.
-	 */
-	public void setAgent(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/agent",v);
-		_Agent=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Route=null;
-
-	/**
-	 * @return Returns the route.
-	 */
-	public String getRoute(){
-		try{
-			if (_Route==null){
-				_Route=getStringProperty("route");
-				return _Route;
-			}else {
-				return _Route;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for route.
-	 * @param v Value to Set.
-	 */
-	public void setRoute(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/route",v);
-		_Route=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Volume=null;
-
-	/**
-	 * @return Returns the volume.
-	 */
-	public Double getVolume() {
-		try{
-			if (_Volume==null){
-				_Volume=getDoubleProperty("volume");
-				return _Volume;
-			}else {
-				return _Volume;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for volume.
-	 * @param v Value to Set.
-	 */
-	public void setVolume(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/volume",v);
-		_Volume=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Totaldose=null;
-
-	/**
-	 * @return Returns the totalDose.
-	 */
-	public Double getTotaldose() {
-		try{
-			if (_Totaldose==null){
-				_Totaldose=getDoubleProperty("totalDose");
-				return _Totaldose;
-			}else {
-				return _Totaldose;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for totalDose.
-	 * @param v Value to Set.
-	 */
-	public void setTotaldose(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/totalDose",v);
-		_Totaldose=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Flowrate=null;
-
-	/**
-	 * @return Returns the flowRate.
-	 */
-	public Double getFlowrate() {
-		try{
-			if (_Flowrate==null){
-				_Flowrate=getDoubleProperty("flowRate");
-				return _Flowrate;
-			}else {
-				return _Flowrate;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for flowRate.
-	 * @param v Value to Set.
-	 */
-	public void setFlowrate(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/flowRate",v);
-		_Flowrate=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Flowduration=null;
-
-	/**
-	 * @return Returns the flowDuration.
-	 */
-	public Double getFlowduration() {
-		try{
-			if (_Flowduration==null){
-				_Flowduration=getDoubleProperty("flowDuration");
-				return _Flowduration;
-			}else {
-				return _Flowduration;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for flowDuration.
-	 * @param v Value to Set.
-	 */
-	public void setFlowduration(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/flowDuration",v);
-		_Flowduration=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Activeingredient=null;
-
-	/**
-	 * @return Returns the activeIngredient.
-	 */
-	public String getActiveingredient(){
-		try{
-			if (_Activeingredient==null){
-				_Activeingredient=getStringProperty("activeIngredient");
-				return _Activeingredient;
-			}else {
-				return _Activeingredient;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for activeIngredient.
-	 * @param v Value to Set.
-	 */
-	public void setActiveingredient(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/activeIngredient",v);
-		_Activeingredient=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Concentration=null;
-
-	/**
-	 * @return Returns the concentration.
-	 */
-	public Double getConcentration() {
-		try{
-			if (_Concentration==null){
-				_Concentration=getDoubleProperty("concentration");
-				return _Concentration;
-			}else {
-				return _Concentration;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for concentration.
-	 * @param v Value to Set.
-	 */
-	public void setConcentration(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/concentration",v);
-		_Concentration=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatContrastbolusId=null;
-
-	/**
-	 * @return Returns the xnat_contrastBolus_id.
-	 */
-	public Integer getXnatContrastbolusId() {
-		try{
-			if (_XnatContrastbolusId==null){
-				_XnatContrastbolusId=getIntegerProperty("xnat_contrastBolus_id");
-				return _XnatContrastbolusId;
-			}else {
-				return _XnatContrastbolusId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_contrastBolus_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatContrastbolusId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_contrastBolus_id",v);
-		_XnatContrastbolusId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatContrastbolus> getAllXnatContrastboluss(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatContrastbolus> al = new ArrayList<org.nrg.xdat.om.XnatContrastbolus>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatContrastbolus> getXnatContrastbolussByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatContrastbolus> al = new ArrayList<org.nrg.xdat.om.XnatContrastbolus>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatContrastbolus> getXnatContrastbolussByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatContrastbolus> al = new ArrayList<org.nrg.xdat.om.XnatContrastbolus>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatContrastbolus getXnatContrastbolussByXnatContrastbolusId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:contrastBolus/xnat_contrastBolus_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatContrastbolus) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCrscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCrscandata.java
deleted file mode 100644
index f6030f0f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCrscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatCrscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatCrscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatCrscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:crScanData";
-
-	public AutoXnatCrscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatCrscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatCrscandata(UserI user)
-	 **/
-	public AutoXnatCrscandata(){}
-
-	public AutoXnatCrscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:crScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCrscandata> getAllXnatCrscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCrscandata> al = new ArrayList<org.nrg.xdat.om.XnatCrscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCrscandata> getXnatCrscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCrscandata> al = new ArrayList<org.nrg.xdat.om.XnatCrscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCrscandata> getXnatCrscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCrscandata> al = new ArrayList<org.nrg.xdat.om.XnatCrscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatCrscandata getXnatCrscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:crScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatCrscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCrsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCrsessiondata.java
deleted file mode 100644
index a4a30bcb..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCrsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatCrsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatCrsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatCrsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:crSessionData";
-
-	public AutoXnatCrsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatCrsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatCrsessiondata(UserI user)
-	 **/
-	public AutoXnatCrsessiondata(){}
-
-	public AutoXnatCrsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:crSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCrsessiondata> getAllXnatCrsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatCrsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCrsessiondata> getXnatCrsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatCrsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCrsessiondata> getXnatCrsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatCrsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatCrsessiondata getXnatCrsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:crSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatCrsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtscandata.java
deleted file mode 100644
index 0bc37892..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtscandata.java
+++ /dev/null
@@ -1,1387 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatCtscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatCtscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatCtscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:ctScanData";
-
-	public AutoXnatCtscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatCtscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatCtscandata(UserI user)
-	 **/
-	public AutoXnatCtscandata(){}
-
-	public AutoXnatCtscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:ctScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_voxelres_units=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/units.
-	 */
-	public String getParameters_voxelres_units(){
-		try{
-			if (_Parameters_voxelres_units==null){
-				_Parameters_voxelres_units=getStringProperty("parameters/voxelRes/units");
-				return _Parameters_voxelres_units;
-			}else {
-				return _Parameters_voxelres_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/units.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/units",v);
-		_Parameters_voxelres_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_x=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/x.
-	 */
-	public Double getParameters_voxelres_x() {
-		try{
-			if (_Parameters_voxelres_x==null){
-				_Parameters_voxelres_x=getDoubleProperty("parameters/voxelRes/x");
-				return _Parameters_voxelres_x;
-			}else {
-				return _Parameters_voxelres_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/x",v);
-		_Parameters_voxelres_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_y=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/y.
-	 */
-	public Double getParameters_voxelres_y() {
-		try{
-			if (_Parameters_voxelres_y==null){
-				_Parameters_voxelres_y=getDoubleProperty("parameters/voxelRes/y");
-				return _Parameters_voxelres_y;
-			}else {
-				return _Parameters_voxelres_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/y",v);
-		_Parameters_voxelres_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_z=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/z.
-	 */
-	public Double getParameters_voxelres_z() {
-		try{
-			if (_Parameters_voxelres_z==null){
-				_Parameters_voxelres_z=getDoubleProperty("parameters/voxelRes/z");
-				return _Parameters_voxelres_z;
-			}else {
-				return _Parameters_voxelres_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/z.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/z",v);
-		_Parameters_voxelres_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_orientation=null;
-
-	/**
-	 * @return Returns the parameters/orientation.
-	 */
-	public String getParameters_orientation(){
-		try{
-			if (_Parameters_orientation==null){
-				_Parameters_orientation=getStringProperty("parameters/orientation");
-				return _Parameters_orientation;
-			}else {
-				return _Parameters_orientation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/orientation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_orientation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/orientation",v);
-		_Parameters_orientation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_fov_x=null;
-
-	/**
-	 * @return Returns the parameters/fov/x.
-	 */
-	public Integer getParameters_fov_x() {
-		try{
-			if (_Parameters_fov_x==null){
-				_Parameters_fov_x=getIntegerProperty("parameters/fov/x");
-				return _Parameters_fov_x;
-			}else {
-				return _Parameters_fov_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fov/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_fov_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fov/x",v);
-		_Parameters_fov_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_fov_y=null;
-
-	/**
-	 * @return Returns the parameters/fov/y.
-	 */
-	public Integer getParameters_fov_y() {
-		try{
-			if (_Parameters_fov_y==null){
-				_Parameters_fov_y=getIntegerProperty("parameters/fov/y");
-				return _Parameters_fov_y;
-			}else {
-				return _Parameters_fov_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fov/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_fov_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fov/y",v);
-		_Parameters_fov_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_rescale_intercept=null;
-
-	/**
-	 * @return Returns the parameters/rescale/intercept.
-	 */
-	public String getParameters_rescale_intercept(){
-		try{
-			if (_Parameters_rescale_intercept==null){
-				_Parameters_rescale_intercept=getStringProperty("parameters/rescale/intercept");
-				return _Parameters_rescale_intercept;
-			}else {
-				return _Parameters_rescale_intercept;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/rescale/intercept.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_rescale_intercept(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/rescale/intercept",v);
-		_Parameters_rescale_intercept=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_rescale_slope=null;
-
-	/**
-	 * @return Returns the parameters/rescale/slope.
-	 */
-	public String getParameters_rescale_slope(){
-		try{
-			if (_Parameters_rescale_slope==null){
-				_Parameters_rescale_slope=getStringProperty("parameters/rescale/slope");
-				return _Parameters_rescale_slope;
-			}else {
-				return _Parameters_rescale_slope;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/rescale/slope.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_rescale_slope(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/rescale/slope",v);
-		_Parameters_rescale_slope=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_kvp=null;
-
-	/**
-	 * @return Returns the parameters/kvp.
-	 */
-	public Double getParameters_kvp() {
-		try{
-			if (_Parameters_kvp==null){
-				_Parameters_kvp=getDoubleProperty("parameters/kvp");
-				return _Parameters_kvp;
-			}else {
-				return _Parameters_kvp;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/kvp.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_kvp(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/kvp",v);
-		_Parameters_kvp=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_acquisitionnumber=null;
-
-	/**
-	 * @return Returns the parameters/acquisitionNumber.
-	 */
-	public Integer getParameters_acquisitionnumber() {
-		try{
-			if (_Parameters_acquisitionnumber==null){
-				_Parameters_acquisitionnumber=getIntegerProperty("parameters/acquisitionNumber");
-				return _Parameters_acquisitionnumber;
-			}else {
-				return _Parameters_acquisitionnumber;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/acquisitionNumber.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_acquisitionnumber(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/acquisitionNumber",v);
-		_Parameters_acquisitionnumber=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_imagetype=null;
-
-	/**
-	 * @return Returns the parameters/imageType.
-	 */
-	public String getParameters_imagetype(){
-		try{
-			if (_Parameters_imagetype==null){
-				_Parameters_imagetype=getStringProperty("parameters/imageType");
-				return _Parameters_imagetype;
-			}else {
-				return _Parameters_imagetype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/imageType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_imagetype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/imageType",v);
-		_Parameters_imagetype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_options=null;
-
-	/**
-	 * @return Returns the parameters/options.
-	 */
-	public String getParameters_options(){
-		try{
-			if (_Parameters_options==null){
-				_Parameters_options=getStringProperty("parameters/options");
-				return _Parameters_options;
-			}else {
-				return _Parameters_options;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/options.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_options(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/options",v);
-		_Parameters_options=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_collectiondiameter=null;
-
-	/**
-	 * @return Returns the parameters/collectionDiameter.
-	 */
-	public Double getParameters_collectiondiameter() {
-		try{
-			if (_Parameters_collectiondiameter==null){
-				_Parameters_collectiondiameter=getDoubleProperty("parameters/collectionDiameter");
-				return _Parameters_collectiondiameter;
-			}else {
-				return _Parameters_collectiondiameter;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/collectionDiameter.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_collectiondiameter(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/collectionDiameter",v);
-		_Parameters_collectiondiameter=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_distancesourcetodetector=null;
-
-	/**
-	 * @return Returns the parameters/distanceSourceToDetector.
-	 */
-	public Double getParameters_distancesourcetodetector() {
-		try{
-			if (_Parameters_distancesourcetodetector==null){
-				_Parameters_distancesourcetodetector=getDoubleProperty("parameters/distanceSourceToDetector");
-				return _Parameters_distancesourcetodetector;
-			}else {
-				return _Parameters_distancesourcetodetector;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/distanceSourceToDetector.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_distancesourcetodetector(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/distanceSourceToDetector",v);
-		_Parameters_distancesourcetodetector=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_distancesourcetopatient=null;
-
-	/**
-	 * @return Returns the parameters/distanceSourceToPatient.
-	 */
-	public Double getParameters_distancesourcetopatient() {
-		try{
-			if (_Parameters_distancesourcetopatient==null){
-				_Parameters_distancesourcetopatient=getDoubleProperty("parameters/distanceSourceToPatient");
-				return _Parameters_distancesourcetopatient;
-			}else {
-				return _Parameters_distancesourcetopatient;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/distanceSourceToPatient.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_distancesourcetopatient(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/distanceSourceToPatient",v);
-		_Parameters_distancesourcetopatient=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_gantrytilt=null;
-
-	/**
-	 * @return Returns the parameters/gantryTilt.
-	 */
-	public Double getParameters_gantrytilt() {
-		try{
-			if (_Parameters_gantrytilt==null){
-				_Parameters_gantrytilt=getDoubleProperty("parameters/gantryTilt");
-				return _Parameters_gantrytilt;
-			}else {
-				return _Parameters_gantrytilt;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/gantryTilt.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_gantrytilt(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/gantryTilt",v);
-		_Parameters_gantrytilt=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_tableheight=null;
-
-	/**
-	 * @return Returns the parameters/tableHeight.
-	 */
-	public Double getParameters_tableheight() {
-		try{
-			if (_Parameters_tableheight==null){
-				_Parameters_tableheight=getDoubleProperty("parameters/tableHeight");
-				return _Parameters_tableheight;
-			}else {
-				return _Parameters_tableheight;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/tableHeight.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_tableheight(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/tableHeight",v);
-		_Parameters_tableheight=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_rotationdirection=null;
-
-	/**
-	 * @return Returns the parameters/rotationDirection.
-	 */
-	public String getParameters_rotationdirection(){
-		try{
-			if (_Parameters_rotationdirection==null){
-				_Parameters_rotationdirection=getStringProperty("parameters/rotationDirection");
-				return _Parameters_rotationdirection;
-			}else {
-				return _Parameters_rotationdirection;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/rotationDirection.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_rotationdirection(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/rotationDirection",v);
-		_Parameters_rotationdirection=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_exposuretime=null;
-
-	/**
-	 * @return Returns the parameters/exposureTime.
-	 */
-	public Double getParameters_exposuretime() {
-		try{
-			if (_Parameters_exposuretime==null){
-				_Parameters_exposuretime=getDoubleProperty("parameters/exposureTime");
-				return _Parameters_exposuretime;
-			}else {
-				return _Parameters_exposuretime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/exposureTime.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_exposuretime(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/exposureTime",v);
-		_Parameters_exposuretime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_xraytubecurrent=null;
-
-	/**
-	 * @return Returns the parameters/xrayTubeCurrent.
-	 */
-	public Double getParameters_xraytubecurrent() {
-		try{
-			if (_Parameters_xraytubecurrent==null){
-				_Parameters_xraytubecurrent=getDoubleProperty("parameters/xrayTubeCurrent");
-				return _Parameters_xraytubecurrent;
-			}else {
-				return _Parameters_xraytubecurrent;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/xrayTubeCurrent.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_xraytubecurrent(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/xrayTubeCurrent",v);
-		_Parameters_xraytubecurrent=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_exposure=null;
-
-	/**
-	 * @return Returns the parameters/exposure.
-	 */
-	public Double getParameters_exposure() {
-		try{
-			if (_Parameters_exposure==null){
-				_Parameters_exposure=getDoubleProperty("parameters/exposure");
-				return _Parameters_exposure;
-			}else {
-				return _Parameters_exposure;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/exposure.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_exposure(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/exposure",v);
-		_Parameters_exposure=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_filter=null;
-
-	/**
-	 * @return Returns the parameters/filter.
-	 */
-	public String getParameters_filter(){
-		try{
-			if (_Parameters_filter==null){
-				_Parameters_filter=getStringProperty("parameters/filter");
-				return _Parameters_filter;
-			}else {
-				return _Parameters_filter;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/filter.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_filter(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/filter",v);
-		_Parameters_filter=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_generatorpower=null;
-
-	/**
-	 * @return Returns the parameters/generatorPower.
-	 */
-	public Double getParameters_generatorpower() {
-		try{
-			if (_Parameters_generatorpower==null){
-				_Parameters_generatorpower=getDoubleProperty("parameters/generatorPower");
-				return _Parameters_generatorpower;
-			}else {
-				return _Parameters_generatorpower;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/generatorPower.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_generatorpower(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/generatorPower",v);
-		_Parameters_generatorpower=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot> _Parameters_focalspots_focalspot =null;
-
-	/**
-	 * parameters/focalSpots/focalSpot
-	 * @return Returns an List of org.nrg.xdat.om.XnatCtscandataFocalspot
-	 */
-	public <A extends org.nrg.xdat.model.XnatCtscandataFocalspotI> List<A> getParameters_focalspots_focalspot() {
-		try{
-			if (_Parameters_focalspots_focalspot==null){
-				_Parameters_focalspots_focalspot=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/focalSpots/focalSpot"));
-			}
-			return (List<A>) _Parameters_focalspots_focalspot;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot>();}
-	}
-
-	/**
-	 * Sets the value for parameters/focalSpots/focalSpot.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_focalspots_focalspot(ItemI v) throws Exception{
-		_Parameters_focalspots_focalspot =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/focalSpots/focalSpot",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/focalSpots/focalSpot",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/focalSpots/focalSpot
-	 * Adds org.nrg.xdat.model.XnatCtscandataFocalspotI
-	 */
-	public <A extends org.nrg.xdat.model.XnatCtscandataFocalspotI> void addParameters_focalspots_focalspot(A item) throws Exception{
-	setParameters_focalspots_focalspot((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/focalSpots/focalSpot of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_focalspots_focalspot(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_focalspots_focalspot =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/focalSpots/focalSpot",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_convolutionkernel=null;
-
-	/**
-	 * @return Returns the parameters/convolutionKernel.
-	 */
-	public String getParameters_convolutionkernel(){
-		try{
-			if (_Parameters_convolutionkernel==null){
-				_Parameters_convolutionkernel=getStringProperty("parameters/convolutionKernel");
-				return _Parameters_convolutionkernel;
-			}else {
-				return _Parameters_convolutionkernel;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/convolutionKernel.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_convolutionkernel(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/convolutionKernel",v);
-		_Parameters_convolutionkernel=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_collimationwidth_single=null;
-
-	/**
-	 * @return Returns the parameters/collimationWidth/single.
-	 */
-	public Double getParameters_collimationwidth_single() {
-		try{
-			if (_Parameters_collimationwidth_single==null){
-				_Parameters_collimationwidth_single=getDoubleProperty("parameters/collimationWidth/single");
-				return _Parameters_collimationwidth_single;
-			}else {
-				return _Parameters_collimationwidth_single;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/collimationWidth/single.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_collimationwidth_single(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/collimationWidth/single",v);
-		_Parameters_collimationwidth_single=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_collimationwidth_total=null;
-
-	/**
-	 * @return Returns the parameters/collimationWidth/total.
-	 */
-	public Double getParameters_collimationwidth_total() {
-		try{
-			if (_Parameters_collimationwidth_total==null){
-				_Parameters_collimationwidth_total=getDoubleProperty("parameters/collimationWidth/total");
-				return _Parameters_collimationwidth_total;
-			}else {
-				return _Parameters_collimationwidth_total;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/collimationWidth/total.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_collimationwidth_total(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/collimationWidth/total",v);
-		_Parameters_collimationwidth_total=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_tablespeed=null;
-
-	/**
-	 * @return Returns the parameters/tableSpeed.
-	 */
-	public Double getParameters_tablespeed() {
-		try{
-			if (_Parameters_tablespeed==null){
-				_Parameters_tablespeed=getDoubleProperty("parameters/tableSpeed");
-				return _Parameters_tablespeed;
-			}else {
-				return _Parameters_tablespeed;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/tableSpeed.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_tablespeed(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/tableSpeed",v);
-		_Parameters_tablespeed=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_tablefeedperrotation=null;
-
-	/**
-	 * @return Returns the parameters/tableFeedPerRotation.
-	 */
-	public Double getParameters_tablefeedperrotation() {
-		try{
-			if (_Parameters_tablefeedperrotation==null){
-				_Parameters_tablefeedperrotation=getDoubleProperty("parameters/tableFeedPerRotation");
-				return _Parameters_tablefeedperrotation;
-			}else {
-				return _Parameters_tablefeedperrotation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/tableFeedPerRotation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_tablefeedperrotation(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/tableFeedPerRotation",v);
-		_Parameters_tablefeedperrotation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_pitchfactor=null;
-
-	/**
-	 * @return Returns the parameters/pitchFactor.
-	 */
-	public Double getParameters_pitchfactor() {
-		try{
-			if (_Parameters_pitchfactor==null){
-				_Parameters_pitchfactor=getDoubleProperty("parameters/pitchFactor");
-				return _Parameters_pitchfactor;
-			}else {
-				return _Parameters_pitchfactor;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/pitchFactor.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_pitchfactor(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/pitchFactor",v);
-		_Parameters_pitchfactor=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_estimateddosesaving_modulation=null;
-
-	/**
-	 * @return Returns the parameters/estimatedDoseSaving/modulation.
-	 */
-	public String getParameters_estimateddosesaving_modulation(){
-		try{
-			if (_Parameters_estimateddosesaving_modulation==null){
-				_Parameters_estimateddosesaving_modulation=getStringProperty("parameters/estimatedDoseSaving/modulation");
-				return _Parameters_estimateddosesaving_modulation;
-			}else {
-				return _Parameters_estimateddosesaving_modulation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/estimatedDoseSaving/modulation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_estimateddosesaving_modulation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/estimatedDoseSaving/modulation",v);
-		_Parameters_estimateddosesaving_modulation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_estimateddosesaving=null;
-
-	/**
-	 * @return Returns the parameters/estimatedDoseSaving.
-	 */
-	public Double getParameters_estimateddosesaving() {
-		try{
-			if (_Parameters_estimateddosesaving==null){
-				_Parameters_estimateddosesaving=getDoubleProperty("parameters/estimatedDoseSaving");
-				return _Parameters_estimateddosesaving;
-			}else {
-				return _Parameters_estimateddosesaving;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/estimatedDoseSaving.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_estimateddosesaving(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/estimatedDoseSaving",v);
-		_Parameters_estimateddosesaving=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_ctdivol=null;
-
-	/**
-	 * @return Returns the parameters/ctDIvol.
-	 */
-	public Double getParameters_ctdivol() {
-		try{
-			if (_Parameters_ctdivol==null){
-				_Parameters_ctdivol=getDoubleProperty("parameters/ctDIvol");
-				return _Parameters_ctdivol;
-			}else {
-				return _Parameters_ctdivol;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/ctDIvol.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_ctdivol(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/ctDIvol",v);
-		_Parameters_ctdivol=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_derivation=null;
-
-	/**
-	 * @return Returns the parameters/derivation.
-	 */
-	public String getParameters_derivation(){
-		try{
-			if (_Parameters_derivation==null){
-				_Parameters_derivation=getStringProperty("parameters/derivation");
-				return _Parameters_derivation;
-			}else {
-				return _Parameters_derivation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/derivation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_derivation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/derivation",v);
-		_Parameters_derivation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatContrastbolus _Parameters_contrastbolus =null;
-
-	/**
-	 * parameters/contrastBolus
-	 * @return org.nrg.xdat.om.XnatContrastbolus
-	 */
-	public org.nrg.xdat.om.XnatContrastbolus getParameters_contrastbolus() {
-		try{
-			if (_Parameters_contrastbolus==null){
-				_Parameters_contrastbolus=((XnatContrastbolus)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("parameters/contrastBolus")));
-				return _Parameters_contrastbolus;
-			}else {
-				return _Parameters_contrastbolus;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/contrastBolus.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_contrastbolus(ItemI v) throws Exception{
-		_Parameters_contrastbolus =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/contrastBolus",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/contrastBolus",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/contrastBolus
-	 * set org.nrg.xdat.model.XnatContrastbolusI
-	 */
-	public <A extends org.nrg.xdat.model.XnatContrastbolusI> void setParameters_contrastbolus(A item) throws Exception{
-	setParameters_contrastbolus((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/contrastBolus.
-	 * */
-	public void removeParameters_contrastbolus() {
-		_Parameters_contrastbolus =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/contrastBolus",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_contrastbolusFK=null;
-
-	/**
-	 * @return Returns the xnat:ctScanData/parameters_contrastbolus_xnat_contrastbolus_id.
-	 */
-	public Integer getParameters_contrastbolusFK(){
-		try{
-			if (_Parameters_contrastbolusFK==null){
-				_Parameters_contrastbolusFK=getIntegerProperty("xnat:ctScanData/parameters_contrastbolus_xnat_contrastbolus_id");
-				return _Parameters_contrastbolusFK;
-			}else {
-				return _Parameters_contrastbolusFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:ctScanData/parameters_contrastbolus_xnat_contrastbolus_id.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_contrastbolusFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters_contrastbolus_xnat_contrastbolus_id",v);
-		_Parameters_contrastbolusFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcmvalidation=null;
-
-	/**
-	 * @return Returns the dcmValidation.
-	 */
-	public String getDcmvalidation(){
-		try{
-			if (_Dcmvalidation==null){
-				_Dcmvalidation=getStringProperty("dcmValidation");
-				return _Dcmvalidation;
-			}else {
-				return _Dcmvalidation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmValidation.
-	 * @param v Value to Set.
-	 */
-	public void setDcmvalidation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcmValidation",v);
-		_Dcmvalidation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Dcmvalidation_status=null;
-
-	/**
-	 * @return Returns the dcmValidation/status.
-	 */
-	public Boolean getDcmvalidation_status() {
-		try{
-			if (_Dcmvalidation_status==null){
-				_Dcmvalidation_status=getBooleanProperty("dcmValidation/status");
-				return _Dcmvalidation_status;
-			}else {
-				return _Dcmvalidation_status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmValidation/status.
-	 * @param v Value to Set.
-	 */
-	public void setDcmvalidation_status(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/dcmValidation/status",v);
-		_Dcmvalidation_status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtscandata> getAllXnatCtscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtscandata> al = new ArrayList<org.nrg.xdat.om.XnatCtscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtscandata> getXnatCtscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtscandata> al = new ArrayList<org.nrg.xdat.om.XnatCtscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtscandata> getXnatCtscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtscandata> al = new ArrayList<org.nrg.xdat.om.XnatCtscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatCtscandata getXnatCtscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:ctScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatCtscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/focalSpots/focalSpot
-	        for(org.nrg.xdat.model.XnatCtscandataFocalspotI childParameters_focalspots_focalspot : this.getParameters_focalspots_focalspot()){
-	            if (childParameters_focalspots_focalspot!=null){
-	              for(ResourceFile rf: ((XnatCtscandataFocalspot)childParameters_focalspots_focalspot).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/focalSpots/focalSpot[" + ((XnatCtscandataFocalspot)childParameters_focalspots_focalspot).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/focalSpots/focalSpot/" + ((XnatCtscandataFocalspot)childParameters_focalspots_focalspot).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/contrastBolus
-	        XnatContrastbolus childParameters_contrastbolus = (XnatContrastbolus)this.getParameters_contrastbolus();
-	            if (childParameters_contrastbolus!=null){
-	              for(ResourceFile rf: ((XnatContrastbolus)childParameters_contrastbolus).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/contrastBolus[" + ((XnatContrastbolus)childParameters_contrastbolus).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/contrastBolus/" + ((XnatContrastbolus)childParameters_contrastbolus).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtscandataFocalspot.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtscandataFocalspot.java
deleted file mode 100644
index b2916827..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtscandataFocalspot.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatCtscandataFocalspot extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatCtscandataFocalspotI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatCtscandataFocalspot.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:ctScanData_focalSpot";
-
-	public AutoXnatCtscandataFocalspot(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatCtscandataFocalspot(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatCtscandataFocalspot(UserI user)
-	 **/
-	public AutoXnatCtscandataFocalspot(){}
-
-	public AutoXnatCtscandataFocalspot(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:ctScanData_focalSpot";
-	}
-
-	//FIELD
-
-	private Double _Focalspot=null;
-
-	/**
-	 * @return Returns the focalSpot.
-	 */
-	public Double getFocalspot() {
-		try{
-			if (_Focalspot==null){
-				_Focalspot=getDoubleProperty("focalSpot");
-				return _Focalspot;
-			}else {
-				return _Focalspot;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for focalSpot.
-	 * @param v Value to Set.
-	 */
-	public void setFocalspot(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/focalSpot",v);
-		_Focalspot=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatCtscandataFocalspotId=null;
-
-	/**
-	 * @return Returns the xnat_ctScanData_focalSpot_id.
-	 */
-	public Integer getXnatCtscandataFocalspotId() {
-		try{
-			if (_XnatCtscandataFocalspotId==null){
-				_XnatCtscandataFocalspotId=getIntegerProperty("xnat_ctScanData_focalSpot_id");
-				return _XnatCtscandataFocalspotId;
-			}else {
-				return _XnatCtscandataFocalspotId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_ctScanData_focalSpot_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatCtscandataFocalspotId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_ctScanData_focalSpot_id",v);
-		_XnatCtscandataFocalspotId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot> getAllXnatCtscandataFocalspots(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot> al = new ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot> getXnatCtscandataFocalspotsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot> al = new ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot> getXnatCtscandataFocalspotsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot> al = new ArrayList<org.nrg.xdat.om.XnatCtscandataFocalspot>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatCtscandataFocalspot getXnatCtscandataFocalspotsByXnatCtscandataFocalspotId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:ctScanData_focalSpot/xnat_ctScanData_focalSpot_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatCtscandataFocalspot) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtsessiondata.java
deleted file mode 100644
index 144cb960..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatCtsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatCtsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatCtsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatCtsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:ctSessionData";
-
-	public AutoXnatCtsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatCtsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatCtsessiondata(UserI user)
-	 **/
-	public AutoXnatCtsessiondata(){}
-
-	public AutoXnatCtsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:ctSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtsessiondata> getAllXnatCtsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatCtsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtsessiondata> getXnatCtsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatCtsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatCtsessiondata> getXnatCtsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatCtsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatCtsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatCtsessiondata getXnatCtsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:ctSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatCtsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDatatypeprotocol.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDatatypeprotocol.java
deleted file mode 100644
index ba110b52..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDatatypeprotocol.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDatatypeprotocol extends XnatAbstractprotocol implements org.nrg.xdat.model.XnatDatatypeprotocolI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDatatypeprotocol.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:datatypeProtocol";
-
-	public AutoXnatDatatypeprotocol(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDatatypeprotocol(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDatatypeprotocol(UserI user)
-	 **/
-	public AutoXnatDatatypeprotocol(){}
-
-	public AutoXnatDatatypeprotocol(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:datatypeProtocol";
-	}
-	 private org.nrg.xdat.om.XnatAbstractprotocol _Abstractprotocol =null;
-
-	/**
-	 * abstractProtocol
-	 * @return org.nrg.xdat.om.XnatAbstractprotocol
-	 */
-	public org.nrg.xdat.om.XnatAbstractprotocol getAbstractprotocol() {
-		try{
-			if (_Abstractprotocol==null){
-				_Abstractprotocol=((XnatAbstractprotocol)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractProtocol")));
-				return _Abstractprotocol;
-			}else {
-				return _Abstractprotocol;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractProtocol.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractprotocol(ItemI v) throws Exception{
-		_Abstractprotocol =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractProtocol",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractProtocol",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractProtocol
-	 * set org.nrg.xdat.model.XnatAbstractprotocolI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractprotocolI> void setAbstractprotocol(A item) throws Exception{
-	setAbstractprotocol((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractProtocol.
-	 * */
-	public void removeAbstractprotocol() {
-		_Abstractprotocol =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractProtocol",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup> _Definitions_definition =null;
-
-	/**
-	 * definitions/definition
-	 * @return Returns an List of org.nrg.xdat.om.XnatFielddefinitiongroup
-	 */
-	public <A extends org.nrg.xdat.model.XnatFielddefinitiongroupI> List<A> getDefinitions_definition() {
-		try{
-			if (_Definitions_definition==null){
-				_Definitions_definition=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("definitions/definition"));
-			}
-			return (List<A>) _Definitions_definition;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup>();}
-	}
-
-	/**
-	 * Sets the value for definitions/definition.
-	 * @param v Value to Set.
-	 */
-	public void setDefinitions_definition(ItemI v) throws Exception{
-		_Definitions_definition =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/definitions/definition",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/definitions/definition",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * definitions/definition
-	 * Adds org.nrg.xdat.model.XnatFielddefinitiongroupI
-	 */
-	public <A extends org.nrg.xdat.model.XnatFielddefinitiongroupI> void addDefinitions_definition(A item) throws Exception{
-	setDefinitions_definition((ItemI)item);
-	}
-
-	/**
-	 * Removes the definitions/definition of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeDefinitions_definition(int index) throws java.lang.IndexOutOfBoundsException {
-		_Definitions_definition =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/definitions/definition",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol> getAllXnatDatatypeprotocols(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol> al = new ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol> getXnatDatatypeprotocolsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol> al = new ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol> getXnatDatatypeprotocolsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol> al = new ArrayList<org.nrg.xdat.om.XnatDatatypeprotocol>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDatatypeprotocol getXnatDatatypeprotocolsByXnatAbstractprotocolId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:datatypeProtocol/xnat_abstractprotocol_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDatatypeprotocol) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //abstractProtocol
-	        XnatAbstractprotocol childAbstractprotocol = (XnatAbstractprotocol)this.getAbstractprotocol();
-	            if (childAbstractprotocol!=null){
-	              for(ResourceFile rf: ((XnatAbstractprotocol)childAbstractprotocol).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("abstractProtocol[" + ((XnatAbstractprotocol)childAbstractprotocol).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("abstractProtocol/" + ((XnatAbstractprotocol)childAbstractprotocol).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //definitions/definition
-	        for(org.nrg.xdat.model.XnatFielddefinitiongroupI childDefinitions_definition : this.getDefinitions_definition()){
-	            if (childDefinitions_definition!=null){
-	              for(ResourceFile rf: ((XnatFielddefinitiongroup)childDefinitions_definition).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("definitions/definition[" + ((XnatFielddefinitiongroup)childDefinitions_definition).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("definitions/definition/" + ((XnatFielddefinitiongroup)childDefinitions_definition).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDemographicdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDemographicdata.java
deleted file mode 100644
index faefb51d..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDemographicdata.java
+++ /dev/null
@@ -1,856 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDemographicdata extends XnatAbstractdemographicdata implements org.nrg.xdat.model.XnatDemographicdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDemographicdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:demographicData";
-
-	public AutoXnatDemographicdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDemographicdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDemographicdata(UserI user)
-	 **/
-	public AutoXnatDemographicdata(){}
-
-	public AutoXnatDemographicdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:demographicData";
-	}
-	 private org.nrg.xdat.om.XnatAbstractdemographicdata _Abstractdemographicdata =null;
-
-	/**
-	 * abstractDemographicData
-	 * @return org.nrg.xdat.om.XnatAbstractdemographicdata
-	 */
-	public org.nrg.xdat.om.XnatAbstractdemographicdata getAbstractdemographicdata() {
-		try{
-			if (_Abstractdemographicdata==null){
-				_Abstractdemographicdata=((XnatAbstractdemographicdata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractDemographicData")));
-				return _Abstractdemographicdata;
-			}else {
-				return _Abstractdemographicdata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractDemographicData.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractdemographicdata(ItemI v) throws Exception{
-		_Abstractdemographicdata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractDemographicData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractDemographicData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractDemographicData
-	 * set org.nrg.xdat.model.XnatAbstractdemographicdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractdemographicdataI> void setAbstractdemographicdata(A item) throws Exception{
-	setAbstractdemographicdata((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractDemographicData.
-	 * */
-	public void removeAbstractdemographicdata() {
-		_Abstractdemographicdata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractDemographicData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Dob=null;
-
-	/**
-	 * @return Returns the dob.
-	 */
-	public Object getDob(){
-		try{
-			if (_Dob==null){
-				_Dob=getProperty("dob");
-				return _Dob;
-			}else {
-				return _Dob;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dob.
-	 * @param v Value to Set.
-	 */
-	public void setDob(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dob",v);
-		_Dob=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Yob=null;
-
-	/**
-	 * @return Returns the yob.
-	 */
-	public Integer getYob() {
-		try{
-			if (_Yob==null){
-				_Yob=getIntegerProperty("yob");
-				return _Yob;
-			}else {
-				return _Yob;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for yob.
-	 * @param v Value to Set.
-	 */
-	public void setYob(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/yob",v);
-		_Yob=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Age=null;
-
-	/**
-	 * @return Returns the age.
-	 */
-	public Integer getAge() {
-		try{
-			if (_Age==null){
-				_Age=getIntegerProperty("age");
-				return _Age;
-			}else {
-				return _Age;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for age.
-	 * @param v Value to Set.
-	 */
-	public void setAge(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/age",v);
-		_Age=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Gender=null;
-
-	/**
-	 * @return Returns the gender.
-	 */
-	public String getGender(){
-		try{
-			if (_Gender==null){
-				_Gender=getStringProperty("gender");
-				return _Gender;
-			}else {
-				return _Gender;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for gender.
-	 * @param v Value to Set.
-	 */
-	public void setGender(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/gender",v);
-		_Gender=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Handedness=null;
-
-	/**
-	 * @return Returns the handedness.
-	 */
-	public String getHandedness(){
-		try{
-			if (_Handedness==null){
-				_Handedness=getStringProperty("handedness");
-				return _Handedness;
-			}else {
-				return _Handedness;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for handedness.
-	 * @param v Value to Set.
-	 */
-	public void setHandedness(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/handedness",v);
-		_Handedness=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Ses=null;
-
-	/**
-	 * @return Returns the ses.
-	 */
-	public Integer getSes() {
-		try{
-			if (_Ses==null){
-				_Ses=getIntegerProperty("ses");
-				return _Ses;
-			}else {
-				return _Ses;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ses.
-	 * @param v Value to Set.
-	 */
-	public void setSes(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ses",v);
-		_Ses=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Employment=null;
-
-	/**
-	 * @return Returns the employment.
-	 */
-	public Integer getEmployment() {
-		try{
-			if (_Employment==null){
-				_Employment=getIntegerProperty("employment");
-				return _Employment;
-			}else {
-				return _Employment;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for employment.
-	 * @param v Value to Set.
-	 */
-	public void setEmployment(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/employment",v);
-		_Employment=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Education=null;
-
-	/**
-	 * @return Returns the education.
-	 */
-	public Integer getEducation() {
-		try{
-			if (_Education==null){
-				_Education=getIntegerProperty("education");
-				return _Education;
-			}else {
-				return _Education;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for education.
-	 * @param v Value to Set.
-	 */
-	public void setEducation(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/education",v);
-		_Education=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Educationdesc=null;
-
-	/**
-	 * @return Returns the educationDesc.
-	 */
-	public String getEducationdesc(){
-		try{
-			if (_Educationdesc==null){
-				_Educationdesc=getStringProperty("educationDesc");
-				return _Educationdesc;
-			}else {
-				return _Educationdesc;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for educationDesc.
-	 * @param v Value to Set.
-	 */
-	public void setEducationdesc(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/educationDesc",v);
-		_Educationdesc=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Race=null;
-
-	/**
-	 * @return Returns the race.
-	 */
-	public String getRace(){
-		try{
-			if (_Race==null){
-				_Race=getStringProperty("race");
-				return _Race;
-			}else {
-				return _Race;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for race.
-	 * @param v Value to Set.
-	 */
-	public void setRace(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/race",v);
-		_Race=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Race2=null;
-
-	/**
-	 * @return Returns the race2.
-	 */
-	public String getRace2(){
-		try{
-			if (_Race2==null){
-				_Race2=getStringProperty("race2");
-				return _Race2;
-			}else {
-				return _Race2;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for race2.
-	 * @param v Value to Set.
-	 */
-	public void setRace2(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/race2",v);
-		_Race2=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Race3=null;
-
-	/**
-	 * @return Returns the race3.
-	 */
-	public String getRace3(){
-		try{
-			if (_Race3==null){
-				_Race3=getStringProperty("race3");
-				return _Race3;
-			}else {
-				return _Race3;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for race3.
-	 * @param v Value to Set.
-	 */
-	public void setRace3(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/race3",v);
-		_Race3=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Race4=null;
-
-	/**
-	 * @return Returns the race4.
-	 */
-	public String getRace4(){
-		try{
-			if (_Race4==null){
-				_Race4=getStringProperty("race4");
-				return _Race4;
-			}else {
-				return _Race4;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for race4.
-	 * @param v Value to Set.
-	 */
-	public void setRace4(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/race4",v);
-		_Race4=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Race5=null;
-
-	/**
-	 * @return Returns the race5.
-	 */
-	public String getRace5(){
-		try{
-			if (_Race5==null){
-				_Race5=getStringProperty("race5");
-				return _Race5;
-			}else {
-				return _Race5;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for race5.
-	 * @param v Value to Set.
-	 */
-	public void setRace5(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/race5",v);
-		_Race5=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Race6=null;
-
-	/**
-	 * @return Returns the race6.
-	 */
-	public String getRace6(){
-		try{
-			if (_Race6==null){
-				_Race6=getStringProperty("race6");
-				return _Race6;
-			}else {
-				return _Race6;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for race6.
-	 * @param v Value to Set.
-	 */
-	public void setRace6(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/race6",v);
-		_Race6=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Ethnicity=null;
-
-	/**
-	 * @return Returns the ethnicity.
-	 */
-	public String getEthnicity(){
-		try{
-			if (_Ethnicity==null){
-				_Ethnicity=getStringProperty("ethnicity");
-				return _Ethnicity;
-			}else {
-				return _Ethnicity;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ethnicity.
-	 * @param v Value to Set.
-	 */
-	public void setEthnicity(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ethnicity",v);
-		_Ethnicity=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Weight=null;
-
-	/**
-	 * @return Returns the weight.
-	 */
-	public Double getWeight() {
-		try{
-			if (_Weight==null){
-				_Weight=getDoubleProperty("weight");
-				return _Weight;
-			}else {
-				return _Weight;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for weight.
-	 * @param v Value to Set.
-	 */
-	public void setWeight(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/weight",v);
-		_Weight=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Weight_units=null;
-
-	/**
-	 * @return Returns the weight/units.
-	 */
-	public String getWeight_units(){
-		try{
-			if (_Weight_units==null){
-				_Weight_units=getStringProperty("weight/units");
-				return _Weight_units;
-			}else {
-				return _Weight_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for weight/units.
-	 * @param v Value to Set.
-	 */
-	public void setWeight_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/weight/units",v);
-		_Weight_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Height=null;
-
-	/**
-	 * @return Returns the height.
-	 */
-	public Double getHeight() {
-		try{
-			if (_Height==null){
-				_Height=getDoubleProperty("height");
-				return _Height;
-			}else {
-				return _Height;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for height.
-	 * @param v Value to Set.
-	 */
-	public void setHeight(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/height",v);
-		_Height=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Height_units=null;
-
-	/**
-	 * @return Returns the height/units.
-	 */
-	public String getHeight_units(){
-		try{
-			if (_Height_units==null){
-				_Height_units=getStringProperty("height/units");
-				return _Height_units;
-			}else {
-				return _Height_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for height/units.
-	 * @param v Value to Set.
-	 */
-	public void setHeight_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/height/units",v);
-		_Height_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _GestationalAge=null;
-
-	/**
-	 * @return Returns the gestational_age.
-	 */
-	public Double getGestationalAge() {
-		try{
-			if (_GestationalAge==null){
-				_GestationalAge=getDoubleProperty("gestational_age");
-				return _GestationalAge;
-			}else {
-				return _GestationalAge;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for gestational_age.
-	 * @param v Value to Set.
-	 */
-	public void setGestationalAge(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/gestational_age",v);
-		_GestationalAge=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _PostMenstrualAge=null;
-
-	/**
-	 * @return Returns the post_menstrual_age.
-	 */
-	public Double getPostMenstrualAge() {
-		try{
-			if (_PostMenstrualAge==null){
-				_PostMenstrualAge=getDoubleProperty("post_menstrual_age");
-				return _PostMenstrualAge;
-			}else {
-				return _PostMenstrualAge;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for post_menstrual_age.
-	 * @param v Value to Set.
-	 */
-	public void setPostMenstrualAge(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/post_menstrual_age",v);
-		_PostMenstrualAge=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _BirthWeight=null;
-
-	/**
-	 * @return Returns the birth_weight.
-	 */
-	public Double getBirthWeight() {
-		try{
-			if (_BirthWeight==null){
-				_BirthWeight=getDoubleProperty("birth_weight");
-				return _BirthWeight;
-			}else {
-				return _BirthWeight;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for birth_weight.
-	 * @param v Value to Set.
-	 */
-	public void setBirthWeight(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/birth_weight",v);
-		_BirthWeight=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDemographicdata> getAllXnatDemographicdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDemographicdata> al = new ArrayList<org.nrg.xdat.om.XnatDemographicdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDemographicdata> getXnatDemographicdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDemographicdata> al = new ArrayList<org.nrg.xdat.om.XnatDemographicdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDemographicdata> getXnatDemographicdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDemographicdata> al = new ArrayList<org.nrg.xdat.om.XnatDemographicdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDemographicdata getXnatDemographicdatasByXnatAbstractdemographicdataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:demographicData/xnat_abstractdemographicdata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDemographicdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //abstractDemographicData
-	        XnatAbstractdemographicdata childAbstractdemographicdata = (XnatAbstractdemographicdata)this.getAbstractdemographicdata();
-	            if (childAbstractdemographicdata!=null){
-	              for(ResourceFile rf: ((XnatAbstractdemographicdata)childAbstractdemographicdata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("abstractDemographicData[" + ((XnatAbstractdemographicdata)childAbstractdemographicdata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("abstractDemographicData/" + ((XnatAbstractdemographicdata)childAbstractdemographicdata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDeriveddata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDeriveddata.java
deleted file mode 100644
index 3532e1c4..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDeriveddata.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDeriveddata extends XnatExperimentdata implements org.nrg.xdat.model.XnatDeriveddataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDeriveddata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:derivedData";
-
-	public AutoXnatDeriveddata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDeriveddata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDeriveddata(UserI user)
-	 **/
-	public AutoXnatDeriveddata(){}
-
-	public AutoXnatDeriveddata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:derivedData";
-	}
-	 private org.nrg.xdat.om.XnatExperimentdata _Experimentdata =null;
-
-	/**
-	 * experimentData
-	 * @return org.nrg.xdat.om.XnatExperimentdata
-	 */
-	public org.nrg.xdat.om.XnatExperimentdata getExperimentdata() {
-		try{
-			if (_Experimentdata==null){
-				_Experimentdata=((XnatExperimentdata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("experimentData")));
-				return _Experimentdata;
-			}else {
-				return _Experimentdata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for experimentData.
-	 * @param v Value to Set.
-	 */
-	public void setExperimentdata(ItemI v) throws Exception{
-		_Experimentdata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/experimentData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/experimentData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * experimentData
-	 * set org.nrg.xdat.model.XnatExperimentdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatExperimentdataI> void setExperimentdata(A item) throws Exception{
-	setExperimentdata((ItemI)item);
-	}
-
-	/**
-	 * Removes the experimentData.
-	 * */
-	public void removeExperimentdata() {
-		_Experimentdata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/experimentData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.ProvProcess _Provenance =null;
-
-	/**
-	 * provenance
-	 * @return org.nrg.xdat.om.ProvProcess
-	 */
-	public org.nrg.xdat.om.ProvProcess getProvenance() {
-		try{
-			if (_Provenance==null){
-				_Provenance=((ProvProcess)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("provenance")));
-				return _Provenance;
-			}else {
-				return _Provenance;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for provenance.
-	 * @param v Value to Set.
-	 */
-	public void setProvenance(ItemI v) throws Exception{
-		_Provenance =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/provenance",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/provenance",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * provenance
-	 * set org.nrg.xdat.model.ProvProcessI
-	 */
-	public <A extends org.nrg.xdat.model.ProvProcessI> void setProvenance(A item) throws Exception{
-	setProvenance((ItemI)item);
-	}
-
-	/**
-	 * Removes the provenance.
-	 * */
-	public void removeProvenance() {
-		_Provenance =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/provenance",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ProvenanceFK=null;
-
-	/**
-	 * @return Returns the xnat:derivedData/provenance_prov_process_id.
-	 */
-	public Integer getProvenanceFK(){
-		try{
-			if (_ProvenanceFK==null){
-				_ProvenanceFK=getIntegerProperty("xnat:derivedData/provenance_prov_process_id");
-				return _ProvenanceFK;
-			}else {
-				return _ProvenanceFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:derivedData/provenance_prov_process_id.
-	 * @param v Value to Set.
-	 */
-	public void setProvenanceFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/provenance_prov_process_id",v);
-		_ProvenanceFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDeriveddata> getAllXnatDeriveddatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDeriveddata> al = new ArrayList<org.nrg.xdat.om.XnatDeriveddata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDeriveddata> getXnatDeriveddatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDeriveddata> al = new ArrayList<org.nrg.xdat.om.XnatDeriveddata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDeriveddata> getXnatDeriveddatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDeriveddata> al = new ArrayList<org.nrg.xdat.om.XnatDeriveddata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDeriveddata getXnatDeriveddatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:derivedData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDeriveddata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //experimentData
-	        XnatExperimentdata childExperimentdata = (XnatExperimentdata)this.getExperimentdata();
-	            if (childExperimentdata!=null){
-	              for(ResourceFile rf: ((XnatExperimentdata)childExperimentdata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("experimentData[" + ((XnatExperimentdata)childExperimentdata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("experimentData/" + ((XnatExperimentdata)childExperimentdata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //provenance
-	        ProvProcess childProvenance = (ProvProcess)this.getProvenance();
-	            if (childProvenance!=null){
-	              for(ResourceFile rf: ((ProvProcess)childProvenance).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("provenance[" + ((ProvProcess)childProvenance).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("provenance/" + ((ProvProcess)childProvenance).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDicomseries.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDicomseries.java
deleted file mode 100644
index 7b728839..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDicomseries.java
+++ /dev/null
@@ -1,655 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDicomseries extends XnatAbstractresource implements org.nrg.xdat.model.XnatDicomseriesI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDicomseries.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:dicomSeries";
-
-	public AutoXnatDicomseries(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDicomseries(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDicomseries(UserI user)
-	 **/
-	public AutoXnatDicomseries(){}
-
-	public AutoXnatDicomseries(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:dicomSeries";
-	}
-	 private org.nrg.xdat.om.XnatAbstractresource _Abstractresource =null;
-
-	/**
-	 * abstractResource
-	 * @return org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public org.nrg.xdat.om.XnatAbstractresource getAbstractresource() {
-		try{
-			if (_Abstractresource==null){
-				_Abstractresource=((XnatAbstractresource)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractResource")));
-				return _Abstractresource;
-			}else {
-				return _Abstractresource;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractResource.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractresource(ItemI v) throws Exception{
-		_Abstractresource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractResource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractResource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractResource
-	 * set org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void setAbstractresource(A item) throws Exception{
-	setAbstractresource((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractResource.
-	 * */
-	public void removeAbstractresource() {
-		_Abstractresource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractResource",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_x=null;
-
-	/**
-	 * @return Returns the dimensions/x.
-	 */
-	public Integer getDimensions_x() {
-		try{
-			if (_Dimensions_x==null){
-				_Dimensions_x=getIntegerProperty("dimensions/x");
-				return _Dimensions_x;
-			}else {
-				return _Dimensions_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/x.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/x",v);
-		_Dimensions_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_y=null;
-
-	/**
-	 * @return Returns the dimensions/y.
-	 */
-	public Integer getDimensions_y() {
-		try{
-			if (_Dimensions_y==null){
-				_Dimensions_y=getIntegerProperty("dimensions/y");
-				return _Dimensions_y;
-			}else {
-				return _Dimensions_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/y.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/y",v);
-		_Dimensions_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_z=null;
-
-	/**
-	 * @return Returns the dimensions/z.
-	 */
-	public Integer getDimensions_z() {
-		try{
-			if (_Dimensions_z==null){
-				_Dimensions_z=getIntegerProperty("dimensions/z");
-				return _Dimensions_z;
-			}else {
-				return _Dimensions_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/z.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_z(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/z",v);
-		_Dimensions_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_volumes=null;
-
-	/**
-	 * @return Returns the dimensions/volumes.
-	 */
-	public Integer getDimensions_volumes() {
-		try{
-			if (_Dimensions_volumes==null){
-				_Dimensions_volumes=getIntegerProperty("dimensions/volumes");
-				return _Dimensions_volumes;
-			}else {
-				return _Dimensions_volumes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/volumes.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_volumes(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/volumes",v);
-		_Dimensions_volumes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_x=null;
-
-	/**
-	 * @return Returns the voxelRes/x.
-	 */
-	public Double getVoxelres_x() {
-		try{
-			if (_Voxelres_x==null){
-				_Voxelres_x=getDoubleProperty("voxelRes/x");
-				return _Voxelres_x;
-			}else {
-				return _Voxelres_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/x.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/x",v);
-		_Voxelres_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_y=null;
-
-	/**
-	 * @return Returns the voxelRes/y.
-	 */
-	public Double getVoxelres_y() {
-		try{
-			if (_Voxelres_y==null){
-				_Voxelres_y=getDoubleProperty("voxelRes/y");
-				return _Voxelres_y;
-			}else {
-				return _Voxelres_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/y.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/y",v);
-		_Voxelres_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_z=null;
-
-	/**
-	 * @return Returns the voxelRes/z.
-	 */
-	public Double getVoxelres_z() {
-		try{
-			if (_Voxelres_z==null){
-				_Voxelres_z=getDoubleProperty("voxelRes/z");
-				return _Voxelres_z;
-			}else {
-				return _Voxelres_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/z.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/z",v);
-		_Voxelres_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Voxelres_units=null;
-
-	/**
-	 * @return Returns the voxelRes/units.
-	 */
-	public String getVoxelres_units(){
-		try{
-			if (_Voxelres_units==null){
-				_Voxelres_units=getStringProperty("voxelRes/units");
-				return _Voxelres_units;
-			}else {
-				return _Voxelres_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/units.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/units",v);
-		_Voxelres_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Orientation=null;
-
-	/**
-	 * @return Returns the orientation.
-	 */
-	public String getOrientation(){
-		try{
-			if (_Orientation==null){
-				_Orientation=getStringProperty("orientation");
-				return _Orientation;
-			}else {
-				return _Orientation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for orientation.
-	 * @param v Value to Set.
-	 */
-	public void setOrientation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/orientation",v);
-		_Orientation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatDicomseriesImage> _Imageset_image =null;
-
-	/**
-	 * imageSet/image
-	 * @return Returns an List of org.nrg.xdat.om.XnatDicomseriesImage
-	 */
-	public <A extends org.nrg.xdat.model.XnatDicomseriesImageI> List<A> getImageset_image() {
-		try{
-			if (_Imageset_image==null){
-				_Imageset_image=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("imageSet/image"));
-			}
-			return (List<A>) _Imageset_image;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatDicomseriesImage>();}
-	}
-
-	/**
-	 * Sets the value for imageSet/image.
-	 * @param v Value to Set.
-	 */
-	public void setImageset_image(ItemI v) throws Exception{
-		_Imageset_image =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSet/image",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSet/image",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSet/image
-	 * Adds org.nrg.xdat.model.XnatDicomseriesImageI
-	 */
-	public <A extends org.nrg.xdat.model.XnatDicomseriesImageI> void addImageset_image(A item) throws Exception{
-	setImageset_image((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSet/image of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeImageset_image(int index) throws java.lang.IndexOutOfBoundsException {
-		_Imageset_image =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSet/image",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Format=null;
-
-	/**
-	 * @return Returns the format.
-	 */
-	public String getFormat(){
-		try{
-			if (_Format==null){
-				_Format=getStringProperty("format");
-				return _Format;
-			}else {
-				return _Format;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for format.
-	 * @param v Value to Set.
-	 */
-	public void setFormat(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/format",v);
-		_Format=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Content=null;
-
-	/**
-	 * @return Returns the content.
-	 */
-	public String getContent(){
-		try{
-			if (_Content==null){
-				_Content=getStringProperty("content");
-				return _Content;
-			}else {
-				return _Content;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for content.
-	 * @param v Value to Set.
-	 */
-	public void setContent(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/content",v);
-		_Content=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Cachepath=null;
-
-	/**
-	 * @return Returns the cachePath.
-	 */
-	public String getCachepath(){
-		try{
-			if (_Cachepath==null){
-				_Cachepath=getStringProperty("cachePath");
-				return _Cachepath;
-			}else {
-				return _Cachepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cachePath.
-	 * @param v Value to Set.
-	 */
-	public void setCachepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cachePath",v);
-		_Cachepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Uid=null;
-
-	/**
-	 * @return Returns the UID.
-	 */
-	public String getUid(){
-		try{
-			if (_Uid==null){
-				_Uid=getStringProperty("UID");
-				return _Uid;
-			}else {
-				return _Uid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for UID.
-	 * @param v Value to Set.
-	 */
-	public void setUid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/UID",v);
-		_Uid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDicomseries> getAllXnatDicomseriess(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDicomseries> al = new ArrayList<org.nrg.xdat.om.XnatDicomseries>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDicomseries> getXnatDicomseriessByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDicomseries> al = new ArrayList<org.nrg.xdat.om.XnatDicomseries>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDicomseries> getXnatDicomseriessByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDicomseries> al = new ArrayList<org.nrg.xdat.om.XnatDicomseries>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDicomseries getXnatDicomseriessByXnatAbstractresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:dicomSeries/xnat_abstractresource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDicomseries) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatDicomseries getXnatDicomseriessByUid(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:dicomSeries/UID",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDicomseries) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	              int counter=0;
-	              for(java.io.File f: this.getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file/" + counter +"");
-	                 rf.setXdatPath((counter++) +"");
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDicomseriesImage.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDicomseriesImage.java
deleted file mode 100644
index 6278e384..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDicomseriesImage.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDicomseriesImage extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatDicomseriesImageI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDicomseriesImage.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:dicomSeries_image";
-
-	public AutoXnatDicomseriesImage(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDicomseriesImage(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDicomseriesImage(UserI user)
-	 **/
-	public AutoXnatDicomseriesImage(){}
-
-	public AutoXnatDicomseriesImage(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:dicomSeries_image";
-	}
-
-	//FIELD
-
-	private String _Uri=null;
-
-	/**
-	 * @return Returns the URI.
-	 */
-	public String getUri(){
-		try{
-			if (_Uri==null){
-				_Uri=getStringProperty("URI");
-				return _Uri;
-			}else {
-				return _Uri;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for URI.
-	 * @param v Value to Set.
-	 */
-	public void setUri(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/URI",v);
-		_Uri=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SopInstanceUid=null;
-
-	/**
-	 * @return Returns the sop_instance_UID.
-	 */
-	public String getSopInstanceUid(){
-		try{
-			if (_SopInstanceUid==null){
-				_SopInstanceUid=getStringProperty("sop_instance_UID");
-				return _SopInstanceUid;
-			}else {
-				return _SopInstanceUid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for sop_instance_UID.
-	 * @param v Value to Set.
-	 */
-	public void setSopInstanceUid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/sop_instance_UID",v);
-		_SopInstanceUid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _InstanceNumber=null;
-
-	/**
-	 * @return Returns the instance_number.
-	 */
-	public Integer getInstanceNumber() {
-		try{
-			if (_InstanceNumber==null){
-				_InstanceNumber=getIntegerProperty("instance_number");
-				return _InstanceNumber;
-			}else {
-				return _InstanceNumber;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for instance_number.
-	 * @param v Value to Set.
-	 */
-	public void setInstanceNumber(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/instance_number",v);
-		_InstanceNumber=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatDicomseriesImageId=null;
-
-	/**
-	 * @return Returns the xnat_dicomSeries_image_id.
-	 */
-	public Integer getXnatDicomseriesImageId() {
-		try{
-			if (_XnatDicomseriesImageId==null){
-				_XnatDicomseriesImageId=getIntegerProperty("xnat_dicomSeries_image_id");
-				return _XnatDicomseriesImageId;
-			}else {
-				return _XnatDicomseriesImageId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_dicomSeries_image_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatDicomseriesImageId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_dicomSeries_image_id",v);
-		_XnatDicomseriesImageId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDicomseriesImage> getAllXnatDicomseriesImages(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDicomseriesImage> al = new ArrayList<org.nrg.xdat.om.XnatDicomseriesImage>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDicomseriesImage> getXnatDicomseriesImagesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDicomseriesImage> al = new ArrayList<org.nrg.xdat.om.XnatDicomseriesImage>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDicomseriesImage> getXnatDicomseriesImagesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDicomseriesImage> al = new ArrayList<org.nrg.xdat.om.XnatDicomseriesImage>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDicomseriesImage getXnatDicomseriesImagesByXnatDicomseriesImageId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:dicomSeries_image/xnat_dicomSeries_image_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDicomseriesImage) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatDicomseriesImage getXnatDicomseriesImagesBySopInstanceUid(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:dicomSeries_image/sop_instance_UID",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDicomseriesImage) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDx3dcraniofacialscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDx3dcraniofacialscandata.java
deleted file mode 100644
index 42ff1602..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDx3dcraniofacialscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDx3dcraniofacialscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatDx3dcraniofacialscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDx3dcraniofacialscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:dx3DCraniofacialScanData";
-
-	public AutoXnatDx3dcraniofacialscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDx3dcraniofacialscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDx3dcraniofacialscandata(UserI user)
-	 **/
-	public AutoXnatDx3dcraniofacialscandata(){}
-
-	public AutoXnatDx3dcraniofacialscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:dx3DCraniofacialScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata> getAllXnatDx3dcraniofacialscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata> al = new ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata> getXnatDx3dcraniofacialscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata> al = new ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata> getXnatDx3dcraniofacialscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata> al = new ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDx3dcraniofacialscandata getXnatDx3dcraniofacialscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:dx3DCraniofacialScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDx3dcraniofacialscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDx3dcraniofacialsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDx3dcraniofacialsessiondata.java
deleted file mode 100644
index dffc01cc..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDx3dcraniofacialsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDx3dcraniofacialsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatDx3dcraniofacialsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDx3dcraniofacialsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:dx3DCraniofacialSessionData";
-
-	public AutoXnatDx3dcraniofacialsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDx3dcraniofacialsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDx3dcraniofacialsessiondata(UserI user)
-	 **/
-	public AutoXnatDx3dcraniofacialsessiondata(){}
-
-	public AutoXnatDx3dcraniofacialsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:dx3DCraniofacialSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata> getAllXnatDx3dcraniofacialsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata> getXnatDx3dcraniofacialsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata> getXnatDx3dcraniofacialsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatDx3dcraniofacialsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDx3dcraniofacialsessiondata getXnatDx3dcraniofacialsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:dx3DCraniofacialSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDx3dcraniofacialsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDxscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDxscandata.java
deleted file mode 100644
index 0c0de2d1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDxscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDxscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatDxscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDxscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:dxScanData";
-
-	public AutoXnatDxscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDxscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDxscandata(UserI user)
-	 **/
-	public AutoXnatDxscandata(){}
-
-	public AutoXnatDxscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:dxScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDxscandata> getAllXnatDxscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDxscandata> al = new ArrayList<org.nrg.xdat.om.XnatDxscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDxscandata> getXnatDxscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDxscandata> al = new ArrayList<org.nrg.xdat.om.XnatDxscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDxscandata> getXnatDxscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDxscandata> al = new ArrayList<org.nrg.xdat.om.XnatDxscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDxscandata getXnatDxscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:dxScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDxscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDxsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDxsessiondata.java
deleted file mode 100644
index 1694d611..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatDxsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatDxsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatDxsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatDxsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:dxSessionData";
-
-	public AutoXnatDxsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatDxsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatDxsessiondata(UserI user)
-	 **/
-	public AutoXnatDxsessiondata(){}
-
-	public AutoXnatDxsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:dxSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDxsessiondata> getAllXnatDxsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDxsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatDxsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDxsessiondata> getXnatDxsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDxsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatDxsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatDxsessiondata> getXnatDxsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatDxsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatDxsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatDxsessiondata getXnatDxsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:dxSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatDxsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEcgscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEcgscandata.java
deleted file mode 100644
index 14b4ace6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEcgscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEcgscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatEcgscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEcgscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:ecgScanData";
-
-	public AutoXnatEcgscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEcgscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEcgscandata(UserI user)
-	 **/
-	public AutoXnatEcgscandata(){}
-
-	public AutoXnatEcgscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:ecgScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEcgscandata> getAllXnatEcgscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEcgscandata> al = new ArrayList<org.nrg.xdat.om.XnatEcgscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEcgscandata> getXnatEcgscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEcgscandata> al = new ArrayList<org.nrg.xdat.om.XnatEcgscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEcgscandata> getXnatEcgscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEcgscandata> al = new ArrayList<org.nrg.xdat.om.XnatEcgscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEcgscandata getXnatEcgscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:ecgScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEcgscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEcgsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEcgsessiondata.java
deleted file mode 100644
index b2ea73bd..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEcgsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEcgsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatEcgsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEcgsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:ecgSessionData";
-
-	public AutoXnatEcgsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEcgsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEcgsessiondata(UserI user)
-	 **/
-	public AutoXnatEcgsessiondata(){}
-
-	public AutoXnatEcgsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:ecgSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEcgsessiondata> getAllXnatEcgsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEcgsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEcgsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEcgsessiondata> getXnatEcgsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEcgsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEcgsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEcgsessiondata> getXnatEcgsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEcgsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEcgsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEcgsessiondata getXnatEcgsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:ecgSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEcgsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEegscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEegscandata.java
deleted file mode 100644
index c78e0f48..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEegscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEegscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatEegscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEegscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:eegScanData";
-
-	public AutoXnatEegscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEegscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEegscandata(UserI user)
-	 **/
-	public AutoXnatEegscandata(){}
-
-	public AutoXnatEegscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:eegScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEegscandata> getAllXnatEegscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEegscandata> al = new ArrayList<org.nrg.xdat.om.XnatEegscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEegscandata> getXnatEegscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEegscandata> al = new ArrayList<org.nrg.xdat.om.XnatEegscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEegscandata> getXnatEegscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEegscandata> al = new ArrayList<org.nrg.xdat.om.XnatEegscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEegscandata getXnatEegscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:eegScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEegscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEegsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEegsessiondata.java
deleted file mode 100644
index dbc994ca..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEegsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEegsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatEegsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEegsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:eegSessionData";
-
-	public AutoXnatEegsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEegsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEegsessiondata(UserI user)
-	 **/
-	public AutoXnatEegsessiondata(){}
-
-	public AutoXnatEegsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:eegSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEegsessiondata> getAllXnatEegsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEegsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEegsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEegsessiondata> getXnatEegsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEegsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEegsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEegsessiondata> getXnatEegsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEegsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEegsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEegsessiondata getXnatEegsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:eegSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEegsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEpsscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEpsscandata.java
deleted file mode 100644
index 1702b430..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEpsscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEpsscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatEpsscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEpsscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:epsScanData";
-
-	public AutoXnatEpsscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEpsscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEpsscandata(UserI user)
-	 **/
-	public AutoXnatEpsscandata(){}
-
-	public AutoXnatEpsscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:epsScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEpsscandata> getAllXnatEpsscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEpsscandata> al = new ArrayList<org.nrg.xdat.om.XnatEpsscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEpsscandata> getXnatEpsscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEpsscandata> al = new ArrayList<org.nrg.xdat.om.XnatEpsscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEpsscandata> getXnatEpsscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEpsscandata> al = new ArrayList<org.nrg.xdat.om.XnatEpsscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEpsscandata getXnatEpsscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:epsScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEpsscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEpssessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEpssessiondata.java
deleted file mode 100644
index d3e29459..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEpssessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEpssessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatEpssessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEpssessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:epsSessionData";
-
-	public AutoXnatEpssessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEpssessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEpssessiondata(UserI user)
-	 **/
-	public AutoXnatEpssessiondata(){}
-
-	public AutoXnatEpssessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:epsSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEpssessiondata> getAllXnatEpssessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEpssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEpssessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEpssessiondata> getXnatEpssessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEpssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEpssessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEpssessiondata> getXnatEpssessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEpssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEpssessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEpssessiondata getXnatEpssessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:epsSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEpssessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsscandata.java
deleted file mode 100644
index 413e20cf..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEsscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatEsscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEsscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:esScanData";
-
-	public AutoXnatEsscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEsscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEsscandata(UserI user)
-	 **/
-	public AutoXnatEsscandata(){}
-
-	public AutoXnatEsscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:esScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsscandata> getAllXnatEsscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsscandata> al = new ArrayList<org.nrg.xdat.om.XnatEsscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsscandata> getXnatEsscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsscandata> al = new ArrayList<org.nrg.xdat.om.XnatEsscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsscandata> getXnatEsscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsscandata> al = new ArrayList<org.nrg.xdat.om.XnatEsscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEsscandata getXnatEsscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:esScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEsscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEssessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEssessiondata.java
deleted file mode 100644
index 5c917ea9..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEssessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEssessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatEssessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEssessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:esSessionData";
-
-	public AutoXnatEssessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEssessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEssessiondata(UserI user)
-	 **/
-	public AutoXnatEssessiondata(){}
-
-	public AutoXnatEssessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:esSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEssessiondata> getAllXnatEssessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEssessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEssessiondata> getXnatEssessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEssessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEssessiondata> getXnatEssessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEssessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEssessiondata getXnatEssessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:esSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEssessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsvscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsvscandata.java
deleted file mode 100644
index 2c1b3228..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsvscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEsvscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatEsvscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEsvscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:esvScanData";
-
-	public AutoXnatEsvscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEsvscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEsvscandata(UserI user)
-	 **/
-	public AutoXnatEsvscandata(){}
-
-	public AutoXnatEsvscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:esvScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsvscandata> getAllXnatEsvscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsvscandata> al = new ArrayList<org.nrg.xdat.om.XnatEsvscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsvscandata> getXnatEsvscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsvscandata> al = new ArrayList<org.nrg.xdat.om.XnatEsvscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsvscandata> getXnatEsvscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsvscandata> al = new ArrayList<org.nrg.xdat.om.XnatEsvscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEsvscandata getXnatEsvscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:esvScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEsvscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsvsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsvsessiondata.java
deleted file mode 100644
index a192e2ae..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatEsvsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatEsvsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatEsvsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatEsvsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:esvSessionData";
-
-	public AutoXnatEsvsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatEsvsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatEsvsessiondata(UserI user)
-	 **/
-	public AutoXnatEsvsessiondata(){}
-
-	public AutoXnatEsvsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:esvSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsvsessiondata> getAllXnatEsvsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEsvsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsvsessiondata> getXnatEsvsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEsvsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatEsvsessiondata> getXnatEsvsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatEsvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatEsvsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatEsvsessiondata getXnatEsvsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:esvSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatEsvsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdata.java
deleted file mode 100644
index df4239fb..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdata.java
+++ /dev/null
@@ -1,937 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatExperimentdata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatExperimentdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatExperimentdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:experimentData";
-
-	public AutoXnatExperimentdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatExperimentdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatExperimentdata(UserI user)
-	 **/
-	public AutoXnatExperimentdata(){}
-
-	public AutoXnatExperimentdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:experimentData";
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatExperimentdataShare> _Sharing_share =null;
-
-	/**
-	 * sharing/share
-	 * @return Returns an List of org.nrg.xdat.om.XnatExperimentdataShare
-	 */
-	public <A extends org.nrg.xdat.model.XnatExperimentdataShareI> List<A> getSharing_share() {
-		try{
-			if (_Sharing_share==null){
-				_Sharing_share=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("sharing/share"));
-			}
-			return (List<A>) _Sharing_share;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatExperimentdataShare>();}
-	}
-
-	/**
-	 * Sets the value for sharing/share.
-	 * @param v Value to Set.
-	 */
-	public void setSharing_share(ItemI v) throws Exception{
-		_Sharing_share =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sharing/share",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sharing/share",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * sharing/share
-	 * Adds org.nrg.xdat.model.XnatExperimentdataShareI
-	 */
-	public <A extends org.nrg.xdat.model.XnatExperimentdataShareI> void addSharing_share(A item) throws Exception{
-	setSharing_share((ItemI)item);
-	}
-
-	/**
-	 * Removes the sharing/share of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSharing_share(int index) throws java.lang.IndexOutOfBoundsException {
-		_Sharing_share =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/sharing/share",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Date=null;
-
-	/**
-	 * @return Returns the date.
-	 */
-	public Object getDate(){
-		try{
-			if (_Date==null){
-				_Date=getProperty("date");
-				return _Date;
-			}else {
-				return _Date;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for date.
-	 * @param v Value to Set.
-	 */
-	public void setDate(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/date",v);
-		_Date=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Time=null;
-
-	/**
-	 * @return Returns the time.
-	 */
-	public Object getTime(){
-		try{
-			if (_Time==null){
-				_Time=getProperty("time");
-				return _Time;
-			}else {
-				return _Time;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for time.
-	 * @param v Value to Set.
-	 */
-	public void setTime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/time",v);
-		_Time=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Duration=null;
-
-	/**
-	 * @return Returns the duration.
-	 */
-	public Object getDuration(){
-		try{
-			if (_Duration==null){
-				_Duration=getProperty("duration");
-				return _Duration;
-			}else {
-				return _Duration;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for duration.
-	 * @param v Value to Set.
-	 */
-	public void setDuration(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/duration",v);
-		_Duration=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Delay=null;
-
-	/**
-	 * @return Returns the delay.
-	 */
-	public Integer getDelay() {
-		try{
-			if (_Delay==null){
-				_Delay=getIntegerProperty("delay");
-				return _Delay;
-			}else {
-				return _Delay;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for delay.
-	 * @param v Value to Set.
-	 */
-	public void setDelay(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/delay",v);
-		_Delay=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Delay_refExptId=null;
-
-	/**
-	 * @return Returns the delay/ref_expt_id.
-	 */
-	public String getDelay_refExptId(){
-		try{
-			if (_Delay_refExptId==null){
-				_Delay_refExptId=getStringProperty("delay/ref_expt_id");
-				return _Delay_refExptId;
-			}else {
-				return _Delay_refExptId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for delay/ref_expt_id.
-	 * @param v Value to Set.
-	 */
-	public void setDelay_refExptId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/delay/ref_expt_id",v);
-		_Delay_refExptId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Note=null;
-
-	/**
-	 * @return Returns the note.
-	 */
-	public String getNote(){
-		try{
-			if (_Note==null){
-				_Note=getStringProperty("note");
-				return _Note;
-			}else {
-				return _Note;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for note.
-	 * @param v Value to Set.
-	 */
-	public void setNote(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/note",v);
-		_Note=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatInvestigatordata _Investigator =null;
-
-	/**
-	 * investigator
-	 * @return org.nrg.xdat.om.XnatInvestigatordata
-	 */
-	public org.nrg.xdat.om.XnatInvestigatordata getInvestigator() {
-		try{
-			if (_Investigator==null){
-				_Investigator=((XnatInvestigatordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("investigator")));
-				return _Investigator;
-			}else {
-				return _Investigator;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for investigator.
-	 * @param v Value to Set.
-	 */
-	public void setInvestigator(ItemI v) throws Exception{
-		_Investigator =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/investigator",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/investigator",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * investigator
-	 * set org.nrg.xdat.model.XnatInvestigatordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatInvestigatordataI> void setInvestigator(A item) throws Exception{
-	setInvestigator((ItemI)item);
-	}
-
-	/**
-	 * Removes the investigator.
-	 * */
-	public void removeInvestigator() {
-		_Investigator =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/investigator",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _InvestigatorFK=null;
-
-	/**
-	 * @return Returns the xnat:experimentData/investigator_xnat_investigatordata_id.
-	 */
-	public Integer getInvestigatorFK(){
-		try{
-			if (_InvestigatorFK==null){
-				_InvestigatorFK=getIntegerProperty("xnat:experimentData/investigator_xnat_investigatordata_id");
-				return _InvestigatorFK;
-			}else {
-				return _InvestigatorFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:experimentData/investigator_xnat_investigatordata_id.
-	 * @param v Value to Set.
-	 */
-	public void setInvestigatorFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/investigator_xnat_investigatordata_id",v);
-		_InvestigatorFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatValidationdata _Validation =null;
-
-	/**
-	 * validation
-	 * @return org.nrg.xdat.om.XnatValidationdata
-	 */
-	public org.nrg.xdat.om.XnatValidationdata getValidation() {
-		try{
-			if (_Validation==null){
-				_Validation=((XnatValidationdata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("validation")));
-				return _Validation;
-			}else {
-				return _Validation;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for validation.
-	 * @param v Value to Set.
-	 */
-	public void setValidation(ItemI v) throws Exception{
-		_Validation =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/validation",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/validation",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * validation
-	 * set org.nrg.xdat.model.XnatValidationdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatValidationdataI> void setValidation(A item) throws Exception{
-	setValidation((ItemI)item);
-	}
-
-	/**
-	 * Removes the validation.
-	 * */
-	public void removeValidation() {
-		_Validation =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/validation",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ValidationFK=null;
-
-	/**
-	 * @return Returns the xnat:experimentData/validation_xnat_validationdata_id.
-	 */
-	public Integer getValidationFK(){
-		try{
-			if (_ValidationFK==null){
-				_ValidationFK=getIntegerProperty("xnat:experimentData/validation_xnat_validationdata_id");
-				return _ValidationFK;
-			}else {
-				return _ValidationFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:experimentData/validation_xnat_validationdata_id.
-	 * @param v Value to Set.
-	 */
-	public void setValidationFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/validation_xnat_validationdata_id",v);
-		_ValidationFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresource> _Resources_resource =null;
-
-	/**
-	 * resources/resource
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> List<A> getResources_resource() {
-		try{
-			if (_Resources_resource==null){
-				_Resources_resource=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("resources/resource"));
-			}
-			return (List<A>) _Resources_resource;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();}
-	}
-
-	/**
-	 * Sets the value for resources/resource.
-	 * @param v Value to Set.
-	 */
-	public void setResources_resource(ItemI v) throws Exception{
-		_Resources_resource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resources/resource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resources/resource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * resources/resource
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void addResources_resource(A item) throws Exception{
-	setResources_resource((ItemI)item);
-	}
-
-	/**
-	 * Removes the resources/resource of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeResources_resource(int index) throws java.lang.IndexOutOfBoundsException {
-		_Resources_resource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/resources/resource",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatExperimentdataField> _Fields_field =null;
-
-	/**
-	 * fields/field
-	 * @return Returns an List of org.nrg.xdat.om.XnatExperimentdataField
-	 */
-	public <A extends org.nrg.xdat.model.XnatExperimentdataFieldI> List<A> getFields_field() {
-		try{
-			if (_Fields_field==null){
-				_Fields_field=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("fields/field"));
-			}
-			return (List<A>) _Fields_field;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatExperimentdataField>();}
-	}
-
-	/**
-	 * Sets the value for fields/field.
-	 * @param v Value to Set.
-	 */
-	public void setFields_field(ItemI v) throws Exception{
-		_Fields_field =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * fields/field
-	 * Adds org.nrg.xdat.model.XnatExperimentdataFieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatExperimentdataFieldI> void addFields_field(A item) throws Exception{
-	setFields_field((ItemI)item);
-	}
-
-	/**
-	 * Removes the fields/field of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeFields_field(int index) throws java.lang.IndexOutOfBoundsException {
-		_Fields_field =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/fields/field",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _AcquisitionSite=null;
-
-	/**
-	 * @return Returns the acquisition_site.
-	 */
-	public String getAcquisitionSite(){
-		try{
-			if (_AcquisitionSite==null){
-				_AcquisitionSite=getStringProperty("acquisition_site");
-				return _AcquisitionSite;
-			}else {
-				return _AcquisitionSite;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for acquisition_site.
-	 * @param v Value to Set.
-	 */
-	public void setAcquisitionSite(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/acquisition_site",v);
-		_AcquisitionSite=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Project=null;
-
-	/**
-	 * @return Returns the project.
-	 */
-	public String getProject(){
-		try{
-			if (_Project==null){
-				_Project=getStringProperty("project");
-				return _Project;
-			}else {
-				return _Project;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for project.
-	 * @param v Value to Set.
-	 */
-	public void setProject(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/project",v);
-		_Project=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _VisitId=null;
-
-	/**
-	 * @return Returns the visit_id.
-	 */
-	public String getVisitId(){
-		try{
-			if (_VisitId==null){
-				_VisitId=getStringProperty("visit_id");
-				return _VisitId;
-			}else {
-				return _VisitId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for visit_id.
-	 * @param v Value to Set.
-	 */
-	public void setVisitId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/visit_id",v);
-		_VisitId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Visit=null;
-
-	/**
-	 * @return Returns the visit.
-	 */
-	public String getVisit(){
-		try{
-			if (_Visit==null){
-				_Visit=getStringProperty("visit");
-				return _Visit;
-			}else {
-				return _Visit;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for visit.
-	 * @param v Value to Set.
-	 */
-	public void setVisit(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/visit",v);
-		_Visit=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Version=null;
-
-	/**
-	 * @return Returns the version.
-	 */
-	public Integer getVersion() {
-		try{
-			if (_Version==null){
-				_Version=getIntegerProperty("version");
-				return _Version;
-			}else {
-				return _Version;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for version.
-	 * @param v Value to Set.
-	 */
-	public void setVersion(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/version",v);
-		_Version=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Original=null;
-
-	/**
-	 * @return Returns the original.
-	 */
-	public String getOriginal(){
-		try{
-			if (_Original==null){
-				_Original=getStringProperty("original");
-				return _Original;
-			}else {
-				return _Original;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for original.
-	 * @param v Value to Set.
-	 */
-	public void setOriginal(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/original",v);
-		_Original=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Protocol=null;
-
-	/**
-	 * @return Returns the protocol.
-	 */
-	public String getProtocol(){
-		try{
-			if (_Protocol==null){
-				_Protocol=getStringProperty("protocol");
-				return _Protocol;
-			}else {
-				return _Protocol;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for protocol.
-	 * @param v Value to Set.
-	 */
-	public void setProtocol(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/protocol",v);
-		_Protocol=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Label=null;
-
-	/**
-	 * @return Returns the label.
-	 */
-	public String getLabel(){
-		try{
-			if (_Label==null){
-				_Label=getStringProperty("label");
-				return _Label;
-			}else {
-				return _Label;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for label.
-	 * @param v Value to Set.
-	 */
-	public void setLabel(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/label",v);
-		_Label=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdata> getAllXnatExperimentdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdata> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdata> getXnatExperimentdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdata> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdata> getXnatExperimentdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdata> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatExperimentdata getXnatExperimentdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:experimentData/ID",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatExperimentdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //sharing/share
-	        for(org.nrg.xdat.model.XnatExperimentdataShareI childSharing_share : this.getSharing_share()){
-	            if (childSharing_share!=null){
-	              for(ResourceFile rf: ((XnatExperimentdataShare)childSharing_share).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("sharing/share[" + ((XnatExperimentdataShare)childSharing_share).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("sharing/share/" + ((XnatExperimentdataShare)childSharing_share).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //investigator
-	        XnatInvestigatordata childInvestigator = (XnatInvestigatordata)this.getInvestigator();
-	            if (childInvestigator!=null){
-	              for(ResourceFile rf: ((XnatInvestigatordata)childInvestigator).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("investigator[" + ((XnatInvestigatordata)childInvestigator).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("investigator/" + ((XnatInvestigatordata)childInvestigator).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //validation
-	        XnatValidationdata childValidation = (XnatValidationdata)this.getValidation();
-	            if (childValidation!=null){
-	              for(ResourceFile rf: ((XnatValidationdata)childValidation).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("validation[" + ((XnatValidationdata)childValidation).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("validation/" + ((XnatValidationdata)childValidation).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //resources/resource
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childResources_resource : this.getResources_resource()){
-	            if (childResources_resource!=null){
-	              int counterResources_resource=0;
-	              for(java.io.File f: ((XnatAbstractresource)childResources_resource).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("resources/resource[xnat_abstractresource_id=" + ((XnatAbstractresource)childResources_resource).getXnatAbstractresourceId() + "]/file/" + counterResources_resource +"");
-	                 rf.setXdatPath("resources/resource/" + ((XnatAbstractresource)childResources_resource).getXnatAbstractresourceId() + "/" + counterResources_resource++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //fields/field
-	        for(org.nrg.xdat.model.XnatExperimentdataFieldI childFields_field : this.getFields_field()){
-	            if (childFields_field!=null){
-	              for(ResourceFile rf: ((XnatExperimentdataField)childFields_field).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("fields/field[" + ((XnatExperimentdataField)childFields_field).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("fields/field/" + ((XnatExperimentdataField)childFields_field).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdataField.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdataField.java
deleted file mode 100644
index 6e6934ea..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdataField.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatExperimentdataField extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatExperimentdataFieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatExperimentdataField.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:experimentData_field";
-
-	public AutoXnatExperimentdataField(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatExperimentdataField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatExperimentdataField(UserI user)
-	 **/
-	public AutoXnatExperimentdataField(){}
-
-	public AutoXnatExperimentdataField(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:experimentData_field";
-	}
-
-	//FIELD
-
-	private String _Field=null;
-
-	/**
-	 * @return Returns the field.
-	 */
-	public String getField(){
-		try{
-			if (_Field==null){
-				_Field=getStringProperty("field");
-				return _Field;
-			}else {
-				return _Field;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for field.
-	 * @param v Value to Set.
-	 */
-	public void setField(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/field",v);
-		_Field=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatExperimentdataFieldId=null;
-
-	/**
-	 * @return Returns the xnat_experimentData_field_id.
-	 */
-	public Integer getXnatExperimentdataFieldId() {
-		try{
-			if (_XnatExperimentdataFieldId==null){
-				_XnatExperimentdataFieldId=getIntegerProperty("xnat_experimentData_field_id");
-				return _XnatExperimentdataFieldId;
-			}else {
-				return _XnatExperimentdataFieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_experimentData_field_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatExperimentdataFieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_experimentData_field_id",v);
-		_XnatExperimentdataFieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdataField> getAllXnatExperimentdataFields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdataField> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdataField>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdataField> getXnatExperimentdataFieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdataField> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdataField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdataField> getXnatExperimentdataFieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdataField> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdataField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatExperimentdataField getXnatExperimentdataFieldsByXnatExperimentdataFieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:experimentData_field/xnat_experimentData_field_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatExperimentdataField) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdataShare.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdataShare.java
deleted file mode 100644
index 1e8485b8..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatExperimentdataShare.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatExperimentdataShare extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatExperimentdataShareI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatExperimentdataShare.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:experimentData_share";
-
-	public AutoXnatExperimentdataShare(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatExperimentdataShare(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatExperimentdataShare(UserI user)
-	 **/
-	public AutoXnatExperimentdataShare(){}
-
-	public AutoXnatExperimentdataShare(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:experimentData_share";
-	}
-
-	//FIELD
-
-	private String _Share=null;
-
-	/**
-	 * @return Returns the share.
-	 */
-	public String getShare(){
-		try{
-			if (_Share==null){
-				_Share=getStringProperty("share");
-				return _Share;
-			}else {
-				return _Share;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for share.
-	 * @param v Value to Set.
-	 */
-	public void setShare(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/share",v);
-		_Share=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Label=null;
-
-	/**
-	 * @return Returns the label.
-	 */
-	public String getLabel(){
-		try{
-			if (_Label==null){
-				_Label=getStringProperty("label");
-				return _Label;
-			}else {
-				return _Label;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for label.
-	 * @param v Value to Set.
-	 */
-	public void setLabel(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/label",v);
-		_Label=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Project=null;
-
-	/**
-	 * @return Returns the project.
-	 */
-	public String getProject(){
-		try{
-			if (_Project==null){
-				_Project=getStringProperty("project");
-				return _Project;
-			}else {
-				return _Project;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for project.
-	 * @param v Value to Set.
-	 */
-	public void setProject(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/project",v);
-		_Project=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Visit=null;
-
-	/**
-	 * @return Returns the visit.
-	 */
-	public String getVisit(){
-		try{
-			if (_Visit==null){
-				_Visit=getStringProperty("visit");
-				return _Visit;
-			}else {
-				return _Visit;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for visit.
-	 * @param v Value to Set.
-	 */
-	public void setVisit(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/visit",v);
-		_Visit=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Protocol=null;
-
-	/**
-	 * @return Returns the protocol.
-	 */
-	public String getProtocol(){
-		try{
-			if (_Protocol==null){
-				_Protocol=getStringProperty("protocol");
-				return _Protocol;
-			}else {
-				return _Protocol;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for protocol.
-	 * @param v Value to Set.
-	 */
-	public void setProtocol(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/protocol",v);
-		_Protocol=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatExperimentdataShareId=null;
-
-	/**
-	 * @return Returns the xnat_experimentData_share_id.
-	 */
-	public Integer getXnatExperimentdataShareId() {
-		try{
-			if (_XnatExperimentdataShareId==null){
-				_XnatExperimentdataShareId=getIntegerProperty("xnat_experimentData_share_id");
-				return _XnatExperimentdataShareId;
-			}else {
-				return _XnatExperimentdataShareId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_experimentData_share_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatExperimentdataShareId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_experimentData_share_id",v);
-		_XnatExperimentdataShareId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdataShare> getAllXnatExperimentdataShares(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdataShare> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdataShare>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdataShare> getXnatExperimentdataSharesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdataShare> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdataShare>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatExperimentdataShare> getXnatExperimentdataSharesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatExperimentdataShare> al = new ArrayList<org.nrg.xdat.om.XnatExperimentdataShare>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatExperimentdataShare getXnatExperimentdataSharesByXnatExperimentdataShareId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:experimentData_share/xnat_experimentData_share_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatExperimentdataShare) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroup.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroup.java
deleted file mode 100644
index 3b9334c8..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroup.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatFielddefinitiongroup extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatFielddefinitiongroupI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatFielddefinitiongroup.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:fieldDefinitionGroup";
-
-	public AutoXnatFielddefinitiongroup(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatFielddefinitiongroup(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatFielddefinitiongroup(UserI user)
-	 **/
-	public AutoXnatFielddefinitiongroup(){}
-
-	public AutoXnatFielddefinitiongroup(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:fieldDefinitionGroup";
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> _Fields_field =null;
-
-	/**
-	 * fields/field
-	 * @return Returns an List of org.nrg.xdat.om.XnatFielddefinitiongroupField
-	 */
-	public <A extends org.nrg.xdat.model.XnatFielddefinitiongroupFieldI> List<A> getFields_field() {
-		try{
-			if (_Fields_field==null){
-				_Fields_field=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("fields/field"));
-			}
-			return (List<A>) _Fields_field;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField>();}
-	}
-
-	/**
-	 * Sets the value for fields/field.
-	 * @param v Value to Set.
-	 */
-	public void setFields_field(ItemI v) throws Exception{
-		_Fields_field =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * fields/field
-	 * Adds org.nrg.xdat.model.XnatFielddefinitiongroupFieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatFielddefinitiongroupFieldI> void addFields_field(A item) throws Exception{
-	setFields_field((ItemI)item);
-	}
-
-	/**
-	 * Removes the fields/field of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeFields_field(int index) throws java.lang.IndexOutOfBoundsException {
-		_Fields_field =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/fields/field",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _DataType=null;
-
-	/**
-	 * @return Returns the data-type.
-	 */
-	public String getDataType(){
-		try{
-			if (_DataType==null){
-				_DataType=getStringProperty("data-type");
-				return _DataType;
-			}else {
-				return _DataType;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for data-type.
-	 * @param v Value to Set.
-	 */
-	public void setDataType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/data-type",v);
-		_DataType=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Shareable=null;
-
-	/**
-	 * @return Returns the shareable.
-	 */
-	public Boolean getShareable() {
-		try{
-			if (_Shareable==null){
-				_Shareable=getBooleanProperty("shareable");
-				return _Shareable;
-			}else {
-				return _Shareable;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for shareable.
-	 * @param v Value to Set.
-	 */
-	public void setShareable(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/shareable",v);
-		_Shareable=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _ProjectSpecific=null;
-
-	/**
-	 * @return Returns the project-specific.
-	 */
-	public Boolean getProjectSpecific() {
-		try{
-			if (_ProjectSpecific==null){
-				_ProjectSpecific=getBooleanProperty("project-specific");
-				return _ProjectSpecific;
-			}else {
-				return _ProjectSpecific;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for project-specific.
-	 * @param v Value to Set.
-	 */
-	public void setProjectSpecific(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/project-specific",v);
-		_ProjectSpecific=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatFielddefinitiongroupId=null;
-
-	/**
-	 * @return Returns the xnat_fieldDefinitionGroup_id.
-	 */
-	public Integer getXnatFielddefinitiongroupId() {
-		try{
-			if (_XnatFielddefinitiongroupId==null){
-				_XnatFielddefinitiongroupId=getIntegerProperty("xnat_fieldDefinitionGroup_id");
-				return _XnatFielddefinitiongroupId;
-			}else {
-				return _XnatFielddefinitiongroupId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_fieldDefinitionGroup_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatFielddefinitiongroupId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_fieldDefinitionGroup_id",v);
-		_XnatFielddefinitiongroupId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup> getAllXnatFielddefinitiongroups(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup> getXnatFielddefinitiongroupsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup> getXnatFielddefinitiongroupsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroup>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatFielddefinitiongroup getXnatFielddefinitiongroupsByXnatFielddefinitiongroupId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:fieldDefinitionGroup/xnat_fieldDefinitionGroup_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatFielddefinitiongroup) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //fields/field
-	        for(org.nrg.xdat.model.XnatFielddefinitiongroupFieldI childFields_field : this.getFields_field()){
-	            if (childFields_field!=null){
-	              for(ResourceFile rf: ((XnatFielddefinitiongroupField)childFields_field).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("fields/field[" + ((XnatFielddefinitiongroupField)childFields_field).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("fields/field/" + ((XnatFielddefinitiongroupField)childFields_field).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroupField.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroupField.java
deleted file mode 100644
index 68922777..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroupField.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatFielddefinitiongroupField extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatFielddefinitiongroupFieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatFielddefinitiongroupField.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:fieldDefinitionGroup_field";
-
-	public AutoXnatFielddefinitiongroupField(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatFielddefinitiongroupField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatFielddefinitiongroupField(UserI user)
-	 **/
-	public AutoXnatFielddefinitiongroupField(){}
-
-	public AutoXnatFielddefinitiongroupField(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:fieldDefinitionGroup_field";
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue> _Possiblevalues_possiblevalue =null;
-
-	/**
-	 * possibleValues/possibleValue
-	 * @return Returns an List of org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue
-	 */
-	public <A extends org.nrg.xdat.model.XnatFielddefinitiongroupFieldPossiblevalueI> List<A> getPossiblevalues_possiblevalue() {
-		try{
-			if (_Possiblevalues_possiblevalue==null){
-				_Possiblevalues_possiblevalue=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("possibleValues/possibleValue"));
-			}
-			return (List<A>) _Possiblevalues_possiblevalue;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue>();}
-	}
-
-	/**
-	 * Sets the value for possibleValues/possibleValue.
-	 * @param v Value to Set.
-	 */
-	public void setPossiblevalues_possiblevalue(ItemI v) throws Exception{
-		_Possiblevalues_possiblevalue =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/possibleValues/possibleValue",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/possibleValues/possibleValue",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * possibleValues/possibleValue
-	 * Adds org.nrg.xdat.model.XnatFielddefinitiongroupFieldPossiblevalueI
-	 */
-	public <A extends org.nrg.xdat.model.XnatFielddefinitiongroupFieldPossiblevalueI> void addPossiblevalues_possiblevalue(A item) throws Exception{
-	setPossiblevalues_possiblevalue((ItemI)item);
-	}
-
-	/**
-	 * Removes the possibleValues/possibleValue of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removePossiblevalues_possiblevalue(int index) throws java.lang.IndexOutOfBoundsException {
-		_Possiblevalues_possiblevalue =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/possibleValues/possibleValue",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Type=null;
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType(){
-		try{
-			if (_Type==null){
-				_Type=getStringProperty("type");
-				return _Type;
-			}else {
-				return _Type;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for type.
-	 * @param v Value to Set.
-	 */
-	public void setType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/type",v);
-		_Type=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Datatype=null;
-
-	/**
-	 * @return Returns the datatype.
-	 */
-	public String getDatatype(){
-		try{
-			if (_Datatype==null){
-				_Datatype=getStringProperty("datatype");
-				return _Datatype;
-			}else {
-				return _Datatype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for datatype.
-	 * @param v Value to Set.
-	 */
-	public void setDatatype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/datatype",v);
-		_Datatype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Required=null;
-
-	/**
-	 * @return Returns the required.
-	 */
-	public Boolean getRequired() {
-		try{
-			if (_Required==null){
-				_Required=getBooleanProperty("required");
-				return _Required;
-			}else {
-				return _Required;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for required.
-	 * @param v Value to Set.
-	 */
-	public void setRequired(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/required",v);
-		_Required=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Sequence=null;
-
-	/**
-	 * @return Returns the sequence.
-	 */
-	public Integer getSequence() {
-		try{
-			if (_Sequence==null){
-				_Sequence=getIntegerProperty("sequence");
-				return _Sequence;
-			}else {
-				return _Sequence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for sequence.
-	 * @param v Value to Set.
-	 */
-	public void setSequence(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/sequence",v);
-		_Sequence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Xmlpath=null;
-
-	/**
-	 * @return Returns the xmlPath.
-	 */
-	public String getXmlpath(){
-		try{
-			if (_Xmlpath==null){
-				_Xmlpath=getStringProperty("xmlPath");
-				return _Xmlpath;
-			}else {
-				return _Xmlpath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xmlPath.
-	 * @param v Value to Set.
-	 */
-	public void setXmlpath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xmlPath",v);
-		_Xmlpath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Group=null;
-
-	/**
-	 * @return Returns the group.
-	 */
-	public String getGroup(){
-		try{
-			if (_Group==null){
-				_Group=getStringProperty("group");
-				return _Group;
-			}else {
-				return _Group;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for group.
-	 * @param v Value to Set.
-	 */
-	public void setGroup(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/group",v);
-		_Group=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatFielddefinitiongroupFieldId=null;
-
-	/**
-	 * @return Returns the xnat_fieldDefinitionGroup_field_id.
-	 */
-	public Integer getXnatFielddefinitiongroupFieldId() {
-		try{
-			if (_XnatFielddefinitiongroupFieldId==null){
-				_XnatFielddefinitiongroupFieldId=getIntegerProperty("xnat_fieldDefinitionGroup_field_id");
-				return _XnatFielddefinitiongroupFieldId;
-			}else {
-				return _XnatFielddefinitiongroupFieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_fieldDefinitionGroup_field_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatFielddefinitiongroupFieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_fieldDefinitionGroup_field_id",v);
-		_XnatFielddefinitiongroupFieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> getAllXnatFielddefinitiongroupFields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> getXnatFielddefinitiongroupFieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> getXnatFielddefinitiongroupFieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatFielddefinitiongroupField getXnatFielddefinitiongroupFieldsByXnatFielddefinitiongroupFieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:fieldDefinitionGroup_field/xnat_fieldDefinitionGroup_field_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatFielddefinitiongroupField) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //possibleValues/possibleValue
-	        for(org.nrg.xdat.model.XnatFielddefinitiongroupFieldPossiblevalueI childPossiblevalues_possiblevalue : this.getPossiblevalues_possiblevalue()){
-	            if (childPossiblevalues_possiblevalue!=null){
-	              for(ResourceFile rf: ((XnatFielddefinitiongroupFieldPossiblevalue)childPossiblevalues_possiblevalue).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("possibleValues/possibleValue[" + ((XnatFielddefinitiongroupFieldPossiblevalue)childPossiblevalues_possiblevalue).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("possibleValues/possibleValue/" + ((XnatFielddefinitiongroupFieldPossiblevalue)childPossiblevalues_possiblevalue).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroupFieldPossiblevalue.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroupFieldPossiblevalue.java
deleted file mode 100644
index 5b5078ca..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatFielddefinitiongroupFieldPossiblevalue.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatFielddefinitiongroupFieldPossiblevalue extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatFielddefinitiongroupFieldPossiblevalueI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatFielddefinitiongroupFieldPossiblevalue.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:fieldDefinitionGroup_field_possibleValue";
-
-	public AutoXnatFielddefinitiongroupFieldPossiblevalue(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatFielddefinitiongroupFieldPossiblevalue(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatFielddefinitiongroupFieldPossiblevalue(UserI user)
-	 **/
-	public AutoXnatFielddefinitiongroupFieldPossiblevalue(){}
-
-	public AutoXnatFielddefinitiongroupFieldPossiblevalue(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:fieldDefinitionGroup_field_possibleValue";
-	}
-
-	//FIELD
-
-	private String _Possiblevalue=null;
-
-	/**
-	 * @return Returns the possibleValue.
-	 */
-	public String getPossiblevalue(){
-		try{
-			if (_Possiblevalue==null){
-				_Possiblevalue=getStringProperty("possibleValue");
-				return _Possiblevalue;
-			}else {
-				return _Possiblevalue;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for possibleValue.
-	 * @param v Value to Set.
-	 */
-	public void setPossiblevalue(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/possibleValue",v);
-		_Possiblevalue=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Display=null;
-
-	/**
-	 * @return Returns the display.
-	 */
-	public String getDisplay(){
-		try{
-			if (_Display==null){
-				_Display=getStringProperty("display");
-				return _Display;
-			}else {
-				return _Display;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for display.
-	 * @param v Value to Set.
-	 */
-	public void setDisplay(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/display",v);
-		_Display=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatFielddefinitiongroupFieldPossiblevalueId=null;
-
-	/**
-	 * @return Returns the xnat_fieldDefinitionGroup_field_possibleValue_id.
-	 */
-	public Integer getXnatFielddefinitiongroupFieldPossiblevalueId() {
-		try{
-			if (_XnatFielddefinitiongroupFieldPossiblevalueId==null){
-				_XnatFielddefinitiongroupFieldPossiblevalueId=getIntegerProperty("xnat_fieldDefinitionGroup_field_possibleValue_id");
-				return _XnatFielddefinitiongroupFieldPossiblevalueId;
-			}else {
-				return _XnatFielddefinitiongroupFieldPossiblevalueId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_fieldDefinitionGroup_field_possibleValue_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatFielddefinitiongroupFieldPossiblevalueId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_fieldDefinitionGroup_field_possibleValue_id",v);
-		_XnatFielddefinitiongroupFieldPossiblevalueId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue> getAllXnatFielddefinitiongroupFieldPossiblevalues(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue> getXnatFielddefinitiongroupFieldPossiblevaluesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue> getXnatFielddefinitiongroupFieldPossiblevaluesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue> al = new ArrayList<org.nrg.xdat.om.XnatFielddefinitiongroupFieldPossiblevalue>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatFielddefinitiongroupFieldPossiblevalue getXnatFielddefinitiongroupFieldPossiblevaluesByXnatFielddefinitiongroupFieldPossiblevalueId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:fieldDefinitionGroup_field_possibleValue/xnat_fieldDefinitionGroup_field_possibleValue_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatFielddefinitiongroupFieldPossiblevalue) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGenericdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGenericdata.java
deleted file mode 100644
index 23ed4593..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGenericdata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatGenericdata extends XnatExperimentdata implements org.nrg.xdat.model.XnatGenericdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatGenericdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:genericData";
-
-	public AutoXnatGenericdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatGenericdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatGenericdata(UserI user)
-	 **/
-	public AutoXnatGenericdata(){}
-
-	public AutoXnatGenericdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:genericData";
-	}
-	 private org.nrg.xdat.om.XnatExperimentdata _Experimentdata =null;
-
-	/**
-	 * experimentData
-	 * @return org.nrg.xdat.om.XnatExperimentdata
-	 */
-	public org.nrg.xdat.om.XnatExperimentdata getExperimentdata() {
-		try{
-			if (_Experimentdata==null){
-				_Experimentdata=((XnatExperimentdata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("experimentData")));
-				return _Experimentdata;
-			}else {
-				return _Experimentdata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for experimentData.
-	 * @param v Value to Set.
-	 */
-	public void setExperimentdata(ItemI v) throws Exception{
-		_Experimentdata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/experimentData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/experimentData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * experimentData
-	 * set org.nrg.xdat.model.XnatExperimentdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatExperimentdataI> void setExperimentdata(A item) throws Exception{
-	setExperimentdata((ItemI)item);
-	}
-
-	/**
-	 * Removes the experimentData.
-	 * */
-	public void removeExperimentdata() {
-		_Experimentdata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/experimentData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGenericdata> getAllXnatGenericdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGenericdata> al = new ArrayList<org.nrg.xdat.om.XnatGenericdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGenericdata> getXnatGenericdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGenericdata> al = new ArrayList<org.nrg.xdat.om.XnatGenericdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGenericdata> getXnatGenericdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGenericdata> al = new ArrayList<org.nrg.xdat.om.XnatGenericdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatGenericdata getXnatGenericdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:genericData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatGenericdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //experimentData
-	        XnatExperimentdata childExperimentdata = (XnatExperimentdata)this.getExperimentdata();
-	            if (childExperimentdata!=null){
-	              for(ResourceFile rf: ((XnatExperimentdata)childExperimentdata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("experimentData[" + ((XnatExperimentdata)childExperimentdata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("experimentData/" + ((XnatExperimentdata)childExperimentdata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmscandata.java
deleted file mode 100644
index 8fc4add6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatGmscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatGmscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatGmscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:gmScanData";
-
-	public AutoXnatGmscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatGmscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatGmscandata(UserI user)
-	 **/
-	public AutoXnatGmscandata(){}
-
-	public AutoXnatGmscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:gmScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmscandata> getAllXnatGmscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmscandata> al = new ArrayList<org.nrg.xdat.om.XnatGmscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmscandata> getXnatGmscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmscandata> al = new ArrayList<org.nrg.xdat.om.XnatGmscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmscandata> getXnatGmscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmscandata> al = new ArrayList<org.nrg.xdat.om.XnatGmscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatGmscandata getXnatGmscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:gmScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatGmscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmsessiondata.java
deleted file mode 100644
index cf3520a0..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatGmsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatGmsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatGmsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:gmSessionData";
-
-	public AutoXnatGmsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatGmsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatGmsessiondata(UserI user)
-	 **/
-	public AutoXnatGmsessiondata(){}
-
-	public AutoXnatGmsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:gmSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmsessiondata> getAllXnatGmsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatGmsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmsessiondata> getXnatGmsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatGmsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmsessiondata> getXnatGmsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatGmsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatGmsessiondata getXnatGmsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:gmSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatGmsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmvscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmvscandata.java
deleted file mode 100644
index 9356cd5d..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmvscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatGmvscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatGmvscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatGmvscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:gmvScanData";
-
-	public AutoXnatGmvscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatGmvscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatGmvscandata(UserI user)
-	 **/
-	public AutoXnatGmvscandata(){}
-
-	public AutoXnatGmvscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:gmvScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmvscandata> getAllXnatGmvscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmvscandata> al = new ArrayList<org.nrg.xdat.om.XnatGmvscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmvscandata> getXnatGmvscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmvscandata> al = new ArrayList<org.nrg.xdat.om.XnatGmvscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmvscandata> getXnatGmvscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmvscandata> al = new ArrayList<org.nrg.xdat.om.XnatGmvscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatGmvscandata getXnatGmvscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:gmvScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatGmvscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmvsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmvsessiondata.java
deleted file mode 100644
index c9db3f3b..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatGmvsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatGmvsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatGmvsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatGmvsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:gmvSessionData";
-
-	public AutoXnatGmvsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatGmvsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatGmvsessiondata(UserI user)
-	 **/
-	public AutoXnatGmvsessiondata(){}
-
-	public AutoXnatGmvsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:gmvSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmvsessiondata> getAllXnatGmvsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatGmvsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmvsessiondata> getXnatGmvsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatGmvsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatGmvsessiondata> getXnatGmvsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatGmvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatGmvsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatGmvsessiondata getXnatGmvsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:gmvSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatGmvsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatHdscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatHdscandata.java
deleted file mode 100644
index c789519f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatHdscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatHdscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatHdscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatHdscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:hdScanData";
-
-	public AutoXnatHdscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatHdscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatHdscandata(UserI user)
-	 **/
-	public AutoXnatHdscandata(){}
-
-	public AutoXnatHdscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:hdScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatHdscandata> getAllXnatHdscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatHdscandata> al = new ArrayList<org.nrg.xdat.om.XnatHdscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatHdscandata> getXnatHdscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatHdscandata> al = new ArrayList<org.nrg.xdat.om.XnatHdscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatHdscandata> getXnatHdscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatHdscandata> al = new ArrayList<org.nrg.xdat.om.XnatHdscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatHdscandata getXnatHdscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:hdScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatHdscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatHdsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatHdsessiondata.java
deleted file mode 100644
index f04612fa..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatHdsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatHdsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatHdsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatHdsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:hdSessionData";
-
-	public AutoXnatHdsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatHdsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatHdsessiondata(UserI user)
-	 **/
-	public AutoXnatHdsessiondata(){}
-
-	public AutoXnatHdsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:hdSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatHdsessiondata> getAllXnatHdsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatHdsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatHdsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatHdsessiondata> getXnatHdsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatHdsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatHdsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatHdsessiondata> getXnatHdsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatHdsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatHdsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatHdsessiondata getXnatHdsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:hdSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatHdsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageassessordata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageassessordata.java
deleted file mode 100644
index 43065b12..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageassessordata.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatImageassessordata extends XnatDeriveddata implements org.nrg.xdat.model.XnatImageassessordataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatImageassessordata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:imageAssessorData";
-
-	public AutoXnatImageassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatImageassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatImageassessordata(UserI user)
-	 **/
-	public AutoXnatImageassessordata(){}
-
-	public AutoXnatImageassessordata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:imageAssessorData";
-	}
-	 private org.nrg.xdat.om.XnatDeriveddata _Deriveddata =null;
-
-	/**
-	 * derivedData
-	 * @return org.nrg.xdat.om.XnatDeriveddata
-	 */
-	public org.nrg.xdat.om.XnatDeriveddata getDeriveddata() {
-		try{
-			if (_Deriveddata==null){
-				_Deriveddata=((XnatDeriveddata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("derivedData")));
-				return _Deriveddata;
-			}else {
-				return _Deriveddata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for derivedData.
-	 * @param v Value to Set.
-	 */
-	public void setDeriveddata(ItemI v) throws Exception{
-		_Deriveddata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/derivedData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/derivedData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * derivedData
-	 * set org.nrg.xdat.model.XnatDeriveddataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatDeriveddataI> void setDeriveddata(A item) throws Exception{
-	setDeriveddata((ItemI)item);
-	}
-
-	/**
-	 * Removes the derivedData.
-	 * */
-	public void removeDeriveddata() {
-		_Deriveddata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/derivedData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresource> _In_file =null;
-
-	/**
-	 * in/file
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> List<A> getIn_file() {
-		try{
-			if (_In_file==null){
-				_In_file=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("in/file"));
-			}
-			return (List<A>) _In_file;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();}
-	}
-
-	/**
-	 * Sets the value for in/file.
-	 * @param v Value to Set.
-	 */
-	public void setIn_file(ItemI v) throws Exception{
-		_In_file =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/in/file",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/in/file",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * in/file
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void addIn_file(A item) throws Exception{
-	setIn_file((ItemI)item);
-	}
-
-	/**
-	 * Removes the in/file of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeIn_file(int index) throws java.lang.IndexOutOfBoundsException {
-		_In_file =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/in/file",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresource> _Out_file =null;
-
-	/**
-	 * out/file
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> List<A> getOut_file() {
-		try{
-			if (_Out_file==null){
-				_Out_file=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("out/file"));
-			}
-			return (List<A>) _Out_file;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();}
-	}
-
-	/**
-	 * Sets the value for out/file.
-	 * @param v Value to Set.
-	 */
-	public void setOut_file(ItemI v) throws Exception{
-		_Out_file =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/out/file",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/out/file",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * out/file
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void addOut_file(A item) throws Exception{
-	setOut_file((ItemI)item);
-	}
-
-	/**
-	 * Removes the out/file of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeOut_file(int index) throws java.lang.IndexOutOfBoundsException {
-		_Out_file =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/out/file",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _ImagesessionId=null;
-
-	/**
-	 * @return Returns the imageSession_ID.
-	 */
-	public String getImagesessionId(){
-		try{
-			if (_ImagesessionId==null){
-				_ImagesessionId=getStringProperty("imageSession_ID");
-				return _ImagesessionId;
-			}else {
-				return _ImagesessionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for imageSession_ID.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessionId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/imageSession_ID",v);
-		_ImagesessionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAddfield> _Parameters_addparam =null;
-
-	/**
-	 * parameters/addParam
-	 * @return Returns an List of org.nrg.xdat.om.XnatAddfield
-	 */
-	public <A extends org.nrg.xdat.model.XnatAddfieldI> List<A> getParameters_addparam() {
-		try{
-			if (_Parameters_addparam==null){
-				_Parameters_addparam=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/addParam"));
-			}
-			return (List<A>) _Parameters_addparam;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAddfield>();}
-	}
-
-	/**
-	 * Sets the value for parameters/addParam.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_addparam(ItemI v) throws Exception{
-		_Parameters_addparam =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/addParam
-	 * Adds org.nrg.xdat.model.XnatAddfieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAddfieldI> void addParameters_addparam(A item) throws Exception{
-	setParameters_addparam((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/addParam of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_addparam(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_addparam =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageassessordata> getAllXnatImageassessordatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageassessordata> al = new ArrayList<org.nrg.xdat.om.XnatImageassessordata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageassessordata> getXnatImageassessordatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageassessordata> al = new ArrayList<org.nrg.xdat.om.XnatImageassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageassessordata> getXnatImageassessordatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageassessordata> al = new ArrayList<org.nrg.xdat.om.XnatImageassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatImageassessordata getXnatImageassessordatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:imageAssessorData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatImageassessordata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //derivedData
-	        XnatDeriveddata childDeriveddata = (XnatDeriveddata)this.getDeriveddata();
-	            if (childDeriveddata!=null){
-	              for(ResourceFile rf: ((XnatDeriveddata)childDeriveddata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("derivedData[" + ((XnatDeriveddata)childDeriveddata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("derivedData/" + ((XnatDeriveddata)childDeriveddata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //in/file
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childIn_file : this.getIn_file()){
-	            if (childIn_file!=null){
-	              int counterIn_file=0;
-	              for(java.io.File f: ((XnatAbstractresource)childIn_file).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("in/file[xnat_abstractresource_id=" + ((XnatAbstractresource)childIn_file).getXnatAbstractresourceId() + "]/file/" + counterIn_file +"");
-	                 rf.setXdatPath("in/file/" + ((XnatAbstractresource)childIn_file).getXnatAbstractresourceId() + "/" + counterIn_file++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //out/file
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childOut_file : this.getOut_file()){
-	            if (childOut_file!=null){
-	              int counterOut_file=0;
-	              for(java.io.File f: ((XnatAbstractresource)childOut_file).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("out/file[xnat_abstractresource_id=" + ((XnatAbstractresource)childOut_file).getXnatAbstractresourceId() + "]/file/" + counterOut_file +"");
-	                 rf.setXdatPath("out/file/" + ((XnatAbstractresource)childOut_file).getXnatAbstractresourceId() + "/" + counterOut_file++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/addParam
-	        for(org.nrg.xdat.model.XnatAddfieldI childParameters_addparam : this.getParameters_addparam()){
-	            if (childParameters_addparam!=null){
-	              for(ResourceFile rf: ((XnatAddfield)childParameters_addparam).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/addParam[" + ((XnatAddfield)childParameters_addparam).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/addParam/" + ((XnatAddfield)childParameters_addparam).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageresource.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageresource.java
deleted file mode 100644
index 0398b4d5..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageresource.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatImageresource extends XnatResource implements org.nrg.xdat.model.XnatImageresourceI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatImageresource.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:imageResource";
-
-	public AutoXnatImageresource(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatImageresource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatImageresource(UserI user)
-	 **/
-	public AutoXnatImageresource(){}
-
-	public AutoXnatImageresource(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:imageResource";
-	}
-	 private org.nrg.xdat.om.XnatResource _Resource =null;
-
-	/**
-	 * resource
-	 * @return org.nrg.xdat.om.XnatResource
-	 */
-	public org.nrg.xdat.om.XnatResource getResource() {
-		try{
-			if (_Resource==null){
-				_Resource=((XnatResource)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("resource")));
-				return _Resource;
-			}else {
-				return _Resource;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for resource.
-	 * @param v Value to Set.
-	 */
-	public void setResource(ItemI v) throws Exception{
-		_Resource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * resource
-	 * set org.nrg.xdat.model.XnatResourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatResourceI> void setResource(A item) throws Exception{
-	setResource((ItemI)item);
-	}
-
-	/**
-	 * Removes the resource.
-	 * */
-	public void removeResource() {
-		_Resource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/resource",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_x=null;
-
-	/**
-	 * @return Returns the dimensions/x.
-	 */
-	public Integer getDimensions_x() {
-		try{
-			if (_Dimensions_x==null){
-				_Dimensions_x=getIntegerProperty("dimensions/x");
-				return _Dimensions_x;
-			}else {
-				return _Dimensions_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/x.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/x",v);
-		_Dimensions_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_y=null;
-
-	/**
-	 * @return Returns the dimensions/y.
-	 */
-	public Integer getDimensions_y() {
-		try{
-			if (_Dimensions_y==null){
-				_Dimensions_y=getIntegerProperty("dimensions/y");
-				return _Dimensions_y;
-			}else {
-				return _Dimensions_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/y.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/y",v);
-		_Dimensions_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_z=null;
-
-	/**
-	 * @return Returns the dimensions/z.
-	 */
-	public Integer getDimensions_z() {
-		try{
-			if (_Dimensions_z==null){
-				_Dimensions_z=getIntegerProperty("dimensions/z");
-				return _Dimensions_z;
-			}else {
-				return _Dimensions_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/z.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_z(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/z",v);
-		_Dimensions_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_volumes=null;
-
-	/**
-	 * @return Returns the dimensions/volumes.
-	 */
-	public Integer getDimensions_volumes() {
-		try{
-			if (_Dimensions_volumes==null){
-				_Dimensions_volumes=getIntegerProperty("dimensions/volumes");
-				return _Dimensions_volumes;
-			}else {
-				return _Dimensions_volumes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/volumes.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_volumes(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/volumes",v);
-		_Dimensions_volumes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_x=null;
-
-	/**
-	 * @return Returns the voxelRes/x.
-	 */
-	public Double getVoxelres_x() {
-		try{
-			if (_Voxelres_x==null){
-				_Voxelres_x=getDoubleProperty("voxelRes/x");
-				return _Voxelres_x;
-			}else {
-				return _Voxelres_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/x.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/x",v);
-		_Voxelres_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_y=null;
-
-	/**
-	 * @return Returns the voxelRes/y.
-	 */
-	public Double getVoxelres_y() {
-		try{
-			if (_Voxelres_y==null){
-				_Voxelres_y=getDoubleProperty("voxelRes/y");
-				return _Voxelres_y;
-			}else {
-				return _Voxelres_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/y.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/y",v);
-		_Voxelres_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_z=null;
-
-	/**
-	 * @return Returns the voxelRes/z.
-	 */
-	public Double getVoxelres_z() {
-		try{
-			if (_Voxelres_z==null){
-				_Voxelres_z=getDoubleProperty("voxelRes/z");
-				return _Voxelres_z;
-			}else {
-				return _Voxelres_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/z.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/z",v);
-		_Voxelres_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Voxelres_units=null;
-
-	/**
-	 * @return Returns the voxelRes/units.
-	 */
-	public String getVoxelres_units(){
-		try{
-			if (_Voxelres_units==null){
-				_Voxelres_units=getStringProperty("voxelRes/units");
-				return _Voxelres_units;
-			}else {
-				return _Voxelres_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/units.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/units",v);
-		_Voxelres_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Orientation=null;
-
-	/**
-	 * @return Returns the orientation.
-	 */
-	public String getOrientation(){
-		try{
-			if (_Orientation==null){
-				_Orientation=getStringProperty("orientation");
-				return _Orientation;
-			}else {
-				return _Orientation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for orientation.
-	 * @param v Value to Set.
-	 */
-	public void setOrientation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/orientation",v);
-		_Orientation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageresource> getAllXnatImageresources(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageresource> al = new ArrayList<org.nrg.xdat.om.XnatImageresource>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageresource> getXnatImageresourcesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageresource> al = new ArrayList<org.nrg.xdat.om.XnatImageresource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageresource> getXnatImageresourcesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageresource> al = new ArrayList<org.nrg.xdat.om.XnatImageresource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatImageresource getXnatImageresourcesByXnatAbstractresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:imageResource/xnat_abstractresource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatImageresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	              int counter=0;
-	              for(java.io.File f: this.getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file/" + counter +"");
-	                 rf.setXdatPath((counter++) +"");
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageresourceseries.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageresourceseries.java
deleted file mode 100644
index 19671f3e..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImageresourceseries.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatImageresourceseries extends XnatResourceseries implements org.nrg.xdat.model.XnatImageresourceseriesI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatImageresourceseries.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:imageResourceSeries";
-
-	public AutoXnatImageresourceseries(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatImageresourceseries(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatImageresourceseries(UserI user)
-	 **/
-	public AutoXnatImageresourceseries(){}
-
-	public AutoXnatImageresourceseries(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:imageResourceSeries";
-	}
-	 private org.nrg.xdat.om.XnatResourceseries _Resourceseries =null;
-
-	/**
-	 * resourceSeries
-	 * @return org.nrg.xdat.om.XnatResourceseries
-	 */
-	public org.nrg.xdat.om.XnatResourceseries getResourceseries() {
-		try{
-			if (_Resourceseries==null){
-				_Resourceseries=((XnatResourceseries)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("resourceSeries")));
-				return _Resourceseries;
-			}else {
-				return _Resourceseries;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for resourceSeries.
-	 * @param v Value to Set.
-	 */
-	public void setResourceseries(ItemI v) throws Exception{
-		_Resourceseries =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resourceSeries",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resourceSeries",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * resourceSeries
-	 * set org.nrg.xdat.model.XnatResourceseriesI
-	 */
-	public <A extends org.nrg.xdat.model.XnatResourceseriesI> void setResourceseries(A item) throws Exception{
-	setResourceseries((ItemI)item);
-	}
-
-	/**
-	 * Removes the resourceSeries.
-	 * */
-	public void removeResourceseries() {
-		_Resourceseries =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/resourceSeries",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_x=null;
-
-	/**
-	 * @return Returns the dimensions/x.
-	 */
-	public Integer getDimensions_x() {
-		try{
-			if (_Dimensions_x==null){
-				_Dimensions_x=getIntegerProperty("dimensions/x");
-				return _Dimensions_x;
-			}else {
-				return _Dimensions_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/x.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/x",v);
-		_Dimensions_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_y=null;
-
-	/**
-	 * @return Returns the dimensions/y.
-	 */
-	public Integer getDimensions_y() {
-		try{
-			if (_Dimensions_y==null){
-				_Dimensions_y=getIntegerProperty("dimensions/y");
-				return _Dimensions_y;
-			}else {
-				return _Dimensions_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/y.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/y",v);
-		_Dimensions_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_z=null;
-
-	/**
-	 * @return Returns the dimensions/z.
-	 */
-	public Integer getDimensions_z() {
-		try{
-			if (_Dimensions_z==null){
-				_Dimensions_z=getIntegerProperty("dimensions/z");
-				return _Dimensions_z;
-			}else {
-				return _Dimensions_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/z.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_z(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/z",v);
-		_Dimensions_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Dimensions_volumes=null;
-
-	/**
-	 * @return Returns the dimensions/volumes.
-	 */
-	public Integer getDimensions_volumes() {
-		try{
-			if (_Dimensions_volumes==null){
-				_Dimensions_volumes=getIntegerProperty("dimensions/volumes");
-				return _Dimensions_volumes;
-			}else {
-				return _Dimensions_volumes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dimensions/volumes.
-	 * @param v Value to Set.
-	 */
-	public void setDimensions_volumes(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dimensions/volumes",v);
-		_Dimensions_volumes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_x=null;
-
-	/**
-	 * @return Returns the voxelRes/x.
-	 */
-	public Double getVoxelres_x() {
-		try{
-			if (_Voxelres_x==null){
-				_Voxelres_x=getDoubleProperty("voxelRes/x");
-				return _Voxelres_x;
-			}else {
-				return _Voxelres_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/x.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/x",v);
-		_Voxelres_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_y=null;
-
-	/**
-	 * @return Returns the voxelRes/y.
-	 */
-	public Double getVoxelres_y() {
-		try{
-			if (_Voxelres_y==null){
-				_Voxelres_y=getDoubleProperty("voxelRes/y");
-				return _Voxelres_y;
-			}else {
-				return _Voxelres_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/y.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/y",v);
-		_Voxelres_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxelres_z=null;
-
-	/**
-	 * @return Returns the voxelRes/z.
-	 */
-	public Double getVoxelres_z() {
-		try{
-			if (_Voxelres_z==null){
-				_Voxelres_z=getDoubleProperty("voxelRes/z");
-				return _Voxelres_z;
-			}else {
-				return _Voxelres_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/z.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/z",v);
-		_Voxelres_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Voxelres_units=null;
-
-	/**
-	 * @return Returns the voxelRes/units.
-	 */
-	public String getVoxelres_units(){
-		try{
-			if (_Voxelres_units==null){
-				_Voxelres_units=getStringProperty("voxelRes/units");
-				return _Voxelres_units;
-			}else {
-				return _Voxelres_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxelRes/units.
-	 * @param v Value to Set.
-	 */
-	public void setVoxelres_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxelRes/units",v);
-		_Voxelres_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Orientation=null;
-
-	/**
-	 * @return Returns the orientation.
-	 */
-	public String getOrientation(){
-		try{
-			if (_Orientation==null){
-				_Orientation=getStringProperty("orientation");
-				return _Orientation;
-			}else {
-				return _Orientation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for orientation.
-	 * @param v Value to Set.
-	 */
-	public void setOrientation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/orientation",v);
-		_Orientation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageresourceseries> getAllXnatImageresourceseriess(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageresourceseries> al = new ArrayList<org.nrg.xdat.om.XnatImageresourceseries>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageresourceseries> getXnatImageresourceseriessByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageresourceseries> al = new ArrayList<org.nrg.xdat.om.XnatImageresourceseries>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImageresourceseries> getXnatImageresourceseriessByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImageresourceseries> al = new ArrayList<org.nrg.xdat.om.XnatImageresourceseries>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatImageresourceseries getXnatImageresourceseriessByXnatAbstractresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:imageResourceSeries/xnat_abstractresource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatImageresourceseries) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	              int counter=0;
-	              for(java.io.File f: this.getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file/" + counter +"");
-	                 rf.setXdatPath((counter++) +"");
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagescandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagescandata.java
deleted file mode 100644
index c50d3f5b..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagescandata.java
+++ /dev/null
@@ -1,870 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatImagescandata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatImagescandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatImagescandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:imageScanData";
-
-	public AutoXnatImagescandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatImagescandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatImagescandata(UserI user)
-	 **/
-	public AutoXnatImagescandata(){}
-
-	public AutoXnatImagescandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:imageScanData";
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatImagescandataShare> _Sharing_share =null;
-
-	/**
-	 * sharing/share
-	 * @return Returns an List of org.nrg.xdat.om.XnatImagescandataShare
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataShareI> List<A> getSharing_share() {
-		try{
-			if (_Sharing_share==null){
-				_Sharing_share=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("sharing/share"));
-			}
-			return (List<A>) _Sharing_share;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatImagescandataShare>();}
-	}
-
-	/**
-	 * Sets the value for sharing/share.
-	 * @param v Value to Set.
-	 */
-	public void setSharing_share(ItemI v) throws Exception{
-		_Sharing_share =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sharing/share",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sharing/share",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * sharing/share
-	 * Adds org.nrg.xdat.model.XnatImagescandataShareI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataShareI> void addSharing_share(A item) throws Exception{
-	setSharing_share((ItemI)item);
-	}
-
-	/**
-	 * Removes the sharing/share of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSharing_share(int index) throws java.lang.IndexOutOfBoundsException {
-		_Sharing_share =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/sharing/share",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _ImageSessionId=null;
-
-	/**
-	 * @return Returns the image_session_ID.
-	 */
-	public String getImageSessionId(){
-		try{
-			if (_ImageSessionId==null){
-				_ImageSessionId=getStringProperty("image_session_ID");
-				return _ImageSessionId;
-			}else {
-				return _ImageSessionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for image_session_ID.
-	 * @param v Value to Set.
-	 */
-	public void setImageSessionId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/image_session_ID",v);
-		_ImageSessionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Note=null;
-
-	/**
-	 * @return Returns the note.
-	 */
-	public String getNote(){
-		try{
-			if (_Note==null){
-				_Note=getStringProperty("note");
-				return _Note;
-			}else {
-				return _Note;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for note.
-	 * @param v Value to Set.
-	 */
-	public void setNote(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/note",v);
-		_Note=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Quality=null;
-
-	/**
-	 * @return Returns the quality.
-	 */
-	public String getQuality(){
-		try{
-			if (_Quality==null){
-				_Quality=getStringProperty("quality");
-				return _Quality;
-			}else {
-				return _Quality;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for quality.
-	 * @param v Value to Set.
-	 */
-	public void setQuality(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/quality",v);
-		_Quality=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Condition=null;
-
-	/**
-	 * @return Returns the condition.
-	 */
-	public String getCondition(){
-		try{
-			if (_Condition==null){
-				_Condition=getStringProperty("condition");
-				return _Condition;
-			}else {
-				return _Condition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for condition.
-	 * @param v Value to Set.
-	 */
-	public void setCondition(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/condition",v);
-		_Condition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SeriesDescription=null;
-
-	/**
-	 * @return Returns the series_description.
-	 */
-	public String getSeriesDescription(){
-		try{
-			if (_SeriesDescription==null){
-				_SeriesDescription=getStringProperty("series_description");
-				return _SeriesDescription;
-			}else {
-				return _SeriesDescription;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for series_description.
-	 * @param v Value to Set.
-	 */
-	public void setSeriesDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/series_description",v);
-		_SeriesDescription=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Documentation=null;
-
-	/**
-	 * @return Returns the documentation.
-	 */
-	public String getDocumentation(){
-		try{
-			if (_Documentation==null){
-				_Documentation=getStringProperty("documentation");
-				return _Documentation;
-			}else {
-				return _Documentation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for documentation.
-	 * @param v Value to Set.
-	 */
-	public void setDocumentation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/documentation",v);
-		_Documentation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Scanner=null;
-
-	/**
-	 * @return Returns the scanner.
-	 */
-	public String getScanner(){
-		try{
-			if (_Scanner==null){
-				_Scanner=getStringProperty("scanner");
-				return _Scanner;
-			}else {
-				return _Scanner;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for scanner.
-	 * @param v Value to Set.
-	 */
-	public void setScanner(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scanner",v);
-		_Scanner=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Scanner_manufacturer=null;
-
-	/**
-	 * @return Returns the scanner/manufacturer.
-	 */
-	public String getScanner_manufacturer(){
-		try{
-			if (_Scanner_manufacturer==null){
-				_Scanner_manufacturer=getStringProperty("scanner/manufacturer");
-				return _Scanner_manufacturer;
-			}else {
-				return _Scanner_manufacturer;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for scanner/manufacturer.
-	 * @param v Value to Set.
-	 */
-	public void setScanner_manufacturer(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scanner/manufacturer",v);
-		_Scanner_manufacturer=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Scanner_model=null;
-
-	/**
-	 * @return Returns the scanner/model.
-	 */
-	public String getScanner_model(){
-		try{
-			if (_Scanner_model==null){
-				_Scanner_model=getStringProperty("scanner/model");
-				return _Scanner_model;
-			}else {
-				return _Scanner_model;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for scanner/model.
-	 * @param v Value to Set.
-	 */
-	public void setScanner_model(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scanner/model",v);
-		_Scanner_model=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Modality=null;
-
-	/**
-	 * @return Returns the modality.
-	 */
-	public String getModality(){
-		try{
-			if (_Modality==null){
-				_Modality=getStringProperty("modality");
-				return _Modality;
-			}else {
-				return _Modality;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for modality.
-	 * @param v Value to Set.
-	 */
-	public void setModality(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/modality",v);
-		_Modality=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Frames=null;
-
-	/**
-	 * @return Returns the frames.
-	 */
-	public Integer getFrames() {
-		try{
-			if (_Frames==null){
-				_Frames=getIntegerProperty("frames");
-				return _Frames;
-			}else {
-				return _Frames;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for frames.
-	 * @param v Value to Set.
-	 */
-	public void setFrames(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/frames",v);
-		_Frames=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Operator=null;
-
-	/**
-	 * @return Returns the operator.
-	 */
-	public String getOperator(){
-		try{
-			if (_Operator==null){
-				_Operator=getStringProperty("operator");
-				return _Operator;
-			}else {
-				return _Operator;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for operator.
-	 * @param v Value to Set.
-	 */
-	public void setOperator(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/operator",v);
-		_Operator=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresource> _File =null;
-
-	/**
-	 * file
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> List<A> getFile() {
-		try{
-			if (_File==null){
-				_File=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("file"));
-			}
-			return (List<A>) _File;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();}
-	}
-
-	/**
-	 * Sets the value for file.
-	 * @param v Value to Set.
-	 */
-	public void setFile(ItemI v) throws Exception{
-		_File =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/file",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/file",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * file
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void addFile(A item) throws Exception{
-	setFile((ItemI)item);
-	}
-
-	/**
-	 * Removes the file of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeFile(int index) throws java.lang.IndexOutOfBoundsException {
-		_File =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/file",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatValidationdata _Validation =null;
-
-	/**
-	 * validation
-	 * @return org.nrg.xdat.om.XnatValidationdata
-	 */
-	public org.nrg.xdat.om.XnatValidationdata getValidation() {
-		try{
-			if (_Validation==null){
-				_Validation=((XnatValidationdata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("validation")));
-				return _Validation;
-			}else {
-				return _Validation;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for validation.
-	 * @param v Value to Set.
-	 */
-	public void setValidation(ItemI v) throws Exception{
-		_Validation =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/validation",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/validation",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * validation
-	 * set org.nrg.xdat.model.XnatValidationdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatValidationdataI> void setValidation(A item) throws Exception{
-	setValidation((ItemI)item);
-	}
-
-	/**
-	 * Removes the validation.
-	 * */
-	public void removeValidation() {
-		_Validation =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/validation",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ValidationFK=null;
-
-	/**
-	 * @return Returns the xnat:imageScanData/validation_xnat_validationdata_id.
-	 */
-	public Integer getValidationFK(){
-		try{
-			if (_ValidationFK==null){
-				_ValidationFK=getIntegerProperty("xnat:imageScanData/validation_xnat_validationdata_id");
-				return _ValidationFK;
-			}else {
-				return _ValidationFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:imageScanData/validation_xnat_validationdata_id.
-	 * @param v Value to Set.
-	 */
-	public void setValidationFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/validation_xnat_validationdata_id",v);
-		_ValidationFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Starttime=null;
-
-	/**
-	 * @return Returns the startTime.
-	 */
-	public Object getStarttime(){
-		try{
-			if (_Starttime==null){
-				_Starttime=getProperty("startTime");
-				return _Starttime;
-			}else {
-				return _Starttime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for startTime.
-	 * @param v Value to Set.
-	 */
-	public void setStarttime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/startTime",v);
-		_Starttime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Type=null;
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType(){
-		try{
-			if (_Type==null){
-				_Type=getStringProperty("type");
-				return _Type;
-			}else {
-				return _Type;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for type.
-	 * @param v Value to Set.
-	 */
-	public void setType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/type",v);
-		_Type=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Uid=null;
-
-	/**
-	 * @return Returns the UID.
-	 */
-	public String getUid(){
-		try{
-			if (_Uid==null){
-				_Uid=getStringProperty("UID");
-				return _Uid;
-			}else {
-				return _Uid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for UID.
-	 * @param v Value to Set.
-	 */
-	public void setUid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/UID",v);
-		_Uid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Project=null;
-
-	/**
-	 * @return Returns the project.
-	 */
-	public String getProject(){
-		try{
-			if (_Project==null){
-				_Project=getStringProperty("project");
-				return _Project;
-			}else {
-				return _Project;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for project.
-	 * @param v Value to Set.
-	 */
-	public void setProject(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/project",v);
-		_Project=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatImagescandataId=null;
-
-	/**
-	 * @return Returns the xnat_imageScanData_id.
-	 */
-	public Integer getXnatImagescandataId() {
-		try{
-			if (_XnatImagescandataId==null){
-				_XnatImagescandataId=getIntegerProperty("xnat_imageScanData_id");
-				return _XnatImagescandataId;
-			}else {
-				return _XnatImagescandataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_imageScanData_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatImagescandataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_imageScanData_id",v);
-		_XnatImagescandataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagescandata> getAllXnatImagescandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagescandata> al = new ArrayList<org.nrg.xdat.om.XnatImagescandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagescandata> getXnatImagescandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagescandata> al = new ArrayList<org.nrg.xdat.om.XnatImagescandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagescandata> getXnatImagescandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagescandata> al = new ArrayList<org.nrg.xdat.om.XnatImagescandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatImagescandata getXnatImagescandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:imageScanData/xnat_imageScanData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatImagescandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //sharing/share
-	        for(org.nrg.xdat.model.XnatImagescandataShareI childSharing_share : this.getSharing_share()){
-	            if (childSharing_share!=null){
-	              for(ResourceFile rf: ((XnatImagescandataShare)childSharing_share).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("sharing/share[" + ((XnatImagescandataShare)childSharing_share).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("sharing/share/" + ((XnatImagescandataShare)childSharing_share).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //file
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childFile : this.getFile()){
-	            if (childFile!=null){
-	              int counterFile=0;
-	              for(java.io.File f: ((XnatAbstractresource)childFile).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file[xnat_abstractresource_id=" + ((XnatAbstractresource)childFile).getXnatAbstractresourceId() + "]/file/" + counterFile +"");
-	                 rf.setXdatPath("file/" + ((XnatAbstractresource)childFile).getXnatAbstractresourceId() + "/" + counterFile++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //validation
-	        XnatValidationdata childValidation = (XnatValidationdata)this.getValidation();
-	            if (childValidation!=null){
-	              for(ResourceFile rf: ((XnatValidationdata)childValidation).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("validation[" + ((XnatValidationdata)childValidation).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("validation/" + ((XnatValidationdata)childValidation).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagescandataShare.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagescandataShare.java
deleted file mode 100644
index 02d92493..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagescandataShare.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatImagescandataShare extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatImagescandataShareI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatImagescandataShare.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:imageScanData_share";
-
-	public AutoXnatImagescandataShare(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatImagescandataShare(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatImagescandataShare(UserI user)
-	 **/
-	public AutoXnatImagescandataShare(){}
-
-	public AutoXnatImagescandataShare(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:imageScanData_share";
-	}
-
-	//FIELD
-
-	private String _Share=null;
-
-	/**
-	 * @return Returns the share.
-	 */
-	public String getShare(){
-		try{
-			if (_Share==null){
-				_Share=getStringProperty("share");
-				return _Share;
-			}else {
-				return _Share;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for share.
-	 * @param v Value to Set.
-	 */
-	public void setShare(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/share",v);
-		_Share=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Label=null;
-
-	/**
-	 * @return Returns the label.
-	 */
-	public String getLabel(){
-		try{
-			if (_Label==null){
-				_Label=getStringProperty("label");
-				return _Label;
-			}else {
-				return _Label;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for label.
-	 * @param v Value to Set.
-	 */
-	public void setLabel(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/label",v);
-		_Label=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Project=null;
-
-	/**
-	 * @return Returns the project.
-	 */
-	public String getProject(){
-		try{
-			if (_Project==null){
-				_Project=getStringProperty("project");
-				return _Project;
-			}else {
-				return _Project;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for project.
-	 * @param v Value to Set.
-	 */
-	public void setProject(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/project",v);
-		_Project=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatImagescandataShareId=null;
-
-	/**
-	 * @return Returns the xnat_imageScanData_share_id.
-	 */
-	public Integer getXnatImagescandataShareId() {
-		try{
-			if (_XnatImagescandataShareId==null){
-				_XnatImagescandataShareId=getIntegerProperty("xnat_imageScanData_share_id");
-				return _XnatImagescandataShareId;
-			}else {
-				return _XnatImagescandataShareId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_imageScanData_share_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatImagescandataShareId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_imageScanData_share_id",v);
-		_XnatImagescandataShareId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagescandataShare> getAllXnatImagescandataShares(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagescandataShare> al = new ArrayList<org.nrg.xdat.om.XnatImagescandataShare>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagescandataShare> getXnatImagescandataSharesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagescandataShare> al = new ArrayList<org.nrg.xdat.om.XnatImagescandataShare>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagescandataShare> getXnatImagescandataSharesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagescandataShare> al = new ArrayList<org.nrg.xdat.om.XnatImagescandataShare>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatImagescandataShare getXnatImagescandataSharesByXnatImagescandataShareId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:imageScanData_share/xnat_imageScanData_share_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatImagescandataShare) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagesessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagesessiondata.java
deleted file mode 100644
index 8f35c71c..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatImagesessiondata.java
+++ /dev/null
@@ -1,794 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatImagesessiondata extends XnatSubjectassessordata implements org.nrg.xdat.model.XnatImagesessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatImagesessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:imageSessionData";
-
-	public AutoXnatImagesessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatImagesessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatImagesessiondata(UserI user)
-	 **/
-	public AutoXnatImagesessiondata(){}
-
-	public AutoXnatImagesessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:imageSessionData";
-	}
-	 private org.nrg.xdat.om.XnatSubjectassessordata _Subjectassessordata =null;
-
-	/**
-	 * subjectAssessorData
-	 * @return org.nrg.xdat.om.XnatSubjectassessordata
-	 */
-	public org.nrg.xdat.om.XnatSubjectassessordata getSubjectassessordata() {
-		try{
-			if (_Subjectassessordata==null){
-				_Subjectassessordata=((XnatSubjectassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("subjectAssessorData")));
-				return _Subjectassessordata;
-			}else {
-				return _Subjectassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for subjectAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectassessordata(ItemI v) throws Exception{
-		_Subjectassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectAssessorData
-	 * set org.nrg.xdat.model.XnatSubjectassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> void setSubjectassessordata(A item) throws Exception{
-	setSubjectassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectAssessorData.
-	 * */
-	public void removeSubjectassessordata() {
-		_Subjectassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatRegionresource> _Regions_region =null;
-
-	/**
-	 * regions/region
-	 * @return Returns an List of org.nrg.xdat.om.XnatRegionresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatRegionresourceI> List<A> getRegions_region() {
-		try{
-			if (_Regions_region==null){
-				_Regions_region=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("regions/region"));
-			}
-			return (List<A>) _Regions_region;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatRegionresource>();}
-	}
-
-	/**
-	 * Sets the value for regions/region.
-	 * @param v Value to Set.
-	 */
-	public void setRegions_region(ItemI v) throws Exception{
-		_Regions_region =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/regions/region",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/regions/region",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * regions/region
-	 * Adds org.nrg.xdat.model.XnatRegionresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatRegionresourceI> void addRegions_region(A item) throws Exception{
-	setRegions_region((ItemI)item);
-	}
-
-	/**
-	 * Removes the regions/region of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeRegions_region(int index) throws java.lang.IndexOutOfBoundsException {
-		_Regions_region =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/regions/region",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Scanner=null;
-
-	/**
-	 * @return Returns the scanner.
-	 */
-	public String getScanner(){
-		try{
-			if (_Scanner==null){
-				_Scanner=getStringProperty("scanner");
-				return _Scanner;
-			}else {
-				return _Scanner;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for scanner.
-	 * @param v Value to Set.
-	 */
-	public void setScanner(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scanner",v);
-		_Scanner=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Scanner_manufacturer=null;
-
-	/**
-	 * @return Returns the scanner/manufacturer.
-	 */
-	public String getScanner_manufacturer(){
-		try{
-			if (_Scanner_manufacturer==null){
-				_Scanner_manufacturer=getStringProperty("scanner/manufacturer");
-				return _Scanner_manufacturer;
-			}else {
-				return _Scanner_manufacturer;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for scanner/manufacturer.
-	 * @param v Value to Set.
-	 */
-	public void setScanner_manufacturer(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scanner/manufacturer",v);
-		_Scanner_manufacturer=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Scanner_model=null;
-
-	/**
-	 * @return Returns the scanner/model.
-	 */
-	public String getScanner_model(){
-		try{
-			if (_Scanner_model==null){
-				_Scanner_model=getStringProperty("scanner/model");
-				return _Scanner_model;
-			}else {
-				return _Scanner_model;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for scanner/model.
-	 * @param v Value to Set.
-	 */
-	public void setScanner_model(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scanner/model",v);
-		_Scanner_model=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Operator=null;
-
-	/**
-	 * @return Returns the operator.
-	 */
-	public String getOperator(){
-		try{
-			if (_Operator==null){
-				_Operator=getStringProperty("operator");
-				return _Operator;
-			}else {
-				return _Operator;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for operator.
-	 * @param v Value to Set.
-	 */
-	public void setOperator(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/operator",v);
-		_Operator=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Prearchivepath=null;
-
-	/**
-	 * @return Returns the prearchivePath.
-	 */
-	public String getPrearchivepath(){
-		try{
-			if (_Prearchivepath==null){
-				_Prearchivepath=getStringProperty("prearchivePath");
-				return _Prearchivepath;
-			}else {
-				return _Prearchivepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for prearchivePath.
-	 * @param v Value to Set.
-	 */
-	public void setPrearchivepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/prearchivePath",v);
-		_Prearchivepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatImagescandata> _Scans_scan =null;
-
-	/**
-	 * scans/scan
-	 * @return Returns an List of org.nrg.xdat.om.XnatImagescandata
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> List<A> getScans_scan() {
-		try{
-			if (_Scans_scan==null){
-				_Scans_scan=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("scans/scan"));
-			}
-			return (List<A>) _Scans_scan;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatImagescandata>();}
-	}
-
-	/**
-	 * Sets the value for scans/scan.
-	 * @param v Value to Set.
-	 */
-	public void setScans_scan(ItemI v) throws Exception{
-		_Scans_scan =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * scans/scan
-	 * Adds org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void addScans_scan(A item) throws Exception{
-	setScans_scan((ItemI)item);
-	}
-
-	/**
-	 * Removes the scans/scan of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeScans_scan(int index) throws java.lang.IndexOutOfBoundsException {
-		_Scans_scan =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/scans/scan",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata> _Reconstructions_reconstructedimage =null;
-
-	/**
-	 * reconstructions/reconstructedImage
-	 * @return Returns an List of org.nrg.xdat.om.XnatReconstructedimagedata
-	 */
-	public <A extends org.nrg.xdat.model.XnatReconstructedimagedataI> List<A> getReconstructions_reconstructedimage() {
-		try{
-			if (_Reconstructions_reconstructedimage==null){
-				_Reconstructions_reconstructedimage=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("reconstructions/reconstructedImage"));
-			}
-			return (List<A>) _Reconstructions_reconstructedimage;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata>();}
-	}
-
-	/**
-	 * Sets the value for reconstructions/reconstructedImage.
-	 * @param v Value to Set.
-	 */
-	public void setReconstructions_reconstructedimage(ItemI v) throws Exception{
-		_Reconstructions_reconstructedimage =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/reconstructions/reconstructedImage",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/reconstructions/reconstructedImage",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * reconstructions/reconstructedImage
-	 * Adds org.nrg.xdat.model.XnatReconstructedimagedataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatReconstructedimagedataI> void addReconstructions_reconstructedimage(A item) throws Exception{
-	setReconstructions_reconstructedimage((ItemI)item);
-	}
-
-	/**
-	 * Removes the reconstructions/reconstructedImage of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeReconstructions_reconstructedimage(int index) throws java.lang.IndexOutOfBoundsException {
-		_Reconstructions_reconstructedimage =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/reconstructions/reconstructedImage",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatImageassessordata> _Assessors_assessor =null;
-
-	/**
-	 * assessors/assessor
-	 * @return Returns an List of org.nrg.xdat.om.XnatImageassessordata
-	 */
-	public <A extends org.nrg.xdat.model.XnatImageassessordataI> List<A> getAssessors_assessor() {
-		try{
-			if (_Assessors_assessor==null){
-				_Assessors_assessor=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("assessors/assessor"));
-			}
-			return (List<A>) _Assessors_assessor;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatImageassessordata>();}
-	}
-
-	/**
-	 * Sets the value for assessors/assessor.
-	 * @param v Value to Set.
-	 */
-	public void setAssessors_assessor(ItemI v) throws Exception{
-		_Assessors_assessor =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/assessors/assessor",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/assessors/assessor",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * assessors/assessor
-	 * Adds org.nrg.xdat.model.XnatImageassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImageassessordataI> void addAssessors_assessor(A item) throws Exception{
-	setAssessors_assessor((ItemI)item);
-	}
-
-	/**
-	 * Removes the assessors/assessor of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeAssessors_assessor(int index) throws java.lang.IndexOutOfBoundsException {
-		_Assessors_assessor =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/assessors/assessor",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcmaccessionnumber=null;
-
-	/**
-	 * @return Returns the dcmAccessionNumber.
-	 */
-	public String getDcmaccessionnumber(){
-		try{
-			if (_Dcmaccessionnumber==null){
-				_Dcmaccessionnumber=getStringProperty("dcmAccessionNumber");
-				return _Dcmaccessionnumber;
-			}else {
-				return _Dcmaccessionnumber;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmAccessionNumber.
-	 * @param v Value to Set.
-	 */
-	public void setDcmaccessionnumber(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcmAccessionNumber",v);
-		_Dcmaccessionnumber=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcmpatientid=null;
-
-	/**
-	 * @return Returns the dcmPatientId.
-	 */
-	public String getDcmpatientid(){
-		try{
-			if (_Dcmpatientid==null){
-				_Dcmpatientid=getStringProperty("dcmPatientId");
-				return _Dcmpatientid;
-			}else {
-				return _Dcmpatientid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmPatientId.
-	 * @param v Value to Set.
-	 */
-	public void setDcmpatientid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcmPatientId",v);
-		_Dcmpatientid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcmpatientname=null;
-
-	/**
-	 * @return Returns the dcmPatientName.
-	 */
-	public String getDcmpatientname(){
-		try{
-			if (_Dcmpatientname==null){
-				_Dcmpatientname=getStringProperty("dcmPatientName");
-				return _Dcmpatientname;
-			}else {
-				return _Dcmpatientname;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmPatientName.
-	 * @param v Value to Set.
-	 */
-	public void setDcmpatientname(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcmPatientName",v);
-		_Dcmpatientname=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Dcmpatientbirthdate=null;
-
-	/**
-	 * @return Returns the dcmPatientBirthDate.
-	 */
-	public Object getDcmpatientbirthdate(){
-		try{
-			if (_Dcmpatientbirthdate==null){
-				_Dcmpatientbirthdate=getProperty("dcmPatientBirthDate");
-				return _Dcmpatientbirthdate;
-			}else {
-				return _Dcmpatientbirthdate;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmPatientBirthDate.
-	 * @param v Value to Set.
-	 */
-	public void setDcmpatientbirthdate(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcmPatientBirthDate",v);
-		_Dcmpatientbirthdate=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SessionType=null;
-
-	/**
-	 * @return Returns the session_type.
-	 */
-	public String getSessionType(){
-		try{
-			if (_SessionType==null){
-				_SessionType=getStringProperty("session_type");
-				return _SessionType;
-			}else {
-				return _SessionType;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for session_type.
-	 * @param v Value to Set.
-	 */
-	public void setSessionType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/session_type",v);
-		_SessionType=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Modality=null;
-
-	/**
-	 * @return Returns the modality.
-	 */
-	public String getModality(){
-		try{
-			if (_Modality==null){
-				_Modality=getStringProperty("modality");
-				return _Modality;
-			}else {
-				return _Modality;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for modality.
-	 * @param v Value to Set.
-	 */
-	public void setModality(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/modality",v);
-		_Modality=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Uid=null;
-
-	/**
-	 * @return Returns the UID.
-	 */
-	public String getUid(){
-		try{
-			if (_Uid==null){
-				_Uid=getStringProperty("UID");
-				return _Uid;
-			}else {
-				return _Uid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for UID.
-	 * @param v Value to Set.
-	 */
-	public void setUid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/UID",v);
-		_Uid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagesessiondata> getAllXnatImagesessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagesessiondata> al = new ArrayList<org.nrg.xdat.om.XnatImagesessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagesessiondata> getXnatImagesessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagesessiondata> al = new ArrayList<org.nrg.xdat.om.XnatImagesessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatImagesessiondata> getXnatImagesessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatImagesessiondata> al = new ArrayList<org.nrg.xdat.om.XnatImagesessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatImagesessiondata getXnatImagesessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:imageSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatImagesessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //subjectAssessorData
-	        XnatSubjectassessordata childSubjectassessordata = (XnatSubjectassessordata)this.getSubjectassessordata();
-	            if (childSubjectassessordata!=null){
-	              for(ResourceFile rf: ((XnatSubjectassessordata)childSubjectassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectAssessorData[" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectAssessorData/" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //regions/region
-	        for(org.nrg.xdat.model.XnatRegionresourceI childRegions_region : this.getRegions_region()){
-	            if (childRegions_region!=null){
-	              for(ResourceFile rf: ((XnatRegionresource)childRegions_region).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("regions/region[" + ((XnatRegionresource)childRegions_region).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("regions/region/" + ((XnatRegionresource)childRegions_region).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //scans/scan
-	        for(org.nrg.xdat.model.XnatImagescandataI childScans_scan : this.getScans_scan()){
-	            if (childScans_scan!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childScans_scan).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("scans/scan[" + ((XnatImagescandata)childScans_scan).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("scans/scan/" + ((XnatImagescandata)childScans_scan).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //reconstructions/reconstructedImage
-	        for(org.nrg.xdat.model.XnatReconstructedimagedataI childReconstructions_reconstructedimage : this.getReconstructions_reconstructedimage()){
-	            if (childReconstructions_reconstructedimage!=null){
-	              for(ResourceFile rf: ((XnatReconstructedimagedata)childReconstructions_reconstructedimage).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("reconstructions/reconstructedImage[" + ((XnatReconstructedimagedata)childReconstructions_reconstructedimage).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("reconstructions/reconstructedImage/" + ((XnatReconstructedimagedata)childReconstructions_reconstructedimage).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //assessors/assessor
-	        for(org.nrg.xdat.model.XnatImageassessordataI childAssessors_assessor : this.getAssessors_assessor()){
-	            if (childAssessors_assessor!=null){
-	              for(ResourceFile rf: ((XnatImageassessordata)childAssessors_assessor).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("assessors/assessor[" + ((XnatImageassessordata)childAssessors_assessor).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("assessors/assessor/" + ((XnatImageassessordata)childAssessors_assessor).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatInvestigatordata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatInvestigatordata.java
deleted file mode 100644
index c652ad7d..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatInvestigatordata.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatInvestigatordata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatInvestigatordataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatInvestigatordata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:investigatorData";
-
-	public AutoXnatInvestigatordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatInvestigatordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatInvestigatordata(UserI user)
-	 **/
-	public AutoXnatInvestigatordata(){}
-
-	public AutoXnatInvestigatordata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:investigatorData";
-	}
-
-	//FIELD
-
-	private String _Title=null;
-
-	/**
-	 * @return Returns the title.
-	 */
-	public String getTitle(){
-		try{
-			if (_Title==null){
-				_Title=getStringProperty("title");
-				return _Title;
-			}else {
-				return _Title;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for title.
-	 * @param v Value to Set.
-	 */
-	public void setTitle(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/title",v);
-		_Title=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Firstname=null;
-
-	/**
-	 * @return Returns the firstname.
-	 */
-	public String getFirstname(){
-		try{
-			if (_Firstname==null){
-				_Firstname=getStringProperty("firstname");
-				return _Firstname;
-			}else {
-				return _Firstname;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for firstname.
-	 * @param v Value to Set.
-	 */
-	public void setFirstname(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/firstname",v);
-		_Firstname=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Lastname=null;
-
-	/**
-	 * @return Returns the lastname.
-	 */
-	public String getLastname(){
-		try{
-			if (_Lastname==null){
-				_Lastname=getStringProperty("lastname");
-				return _Lastname;
-			}else {
-				return _Lastname;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for lastname.
-	 * @param v Value to Set.
-	 */
-	public void setLastname(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/lastname",v);
-		_Lastname=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Institution=null;
-
-	/**
-	 * @return Returns the institution.
-	 */
-	public String getInstitution(){
-		try{
-			if (_Institution==null){
-				_Institution=getStringProperty("institution");
-				return _Institution;
-			}else {
-				return _Institution;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for institution.
-	 * @param v Value to Set.
-	 */
-	public void setInstitution(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/institution",v);
-		_Institution=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Department=null;
-
-	/**
-	 * @return Returns the department.
-	 */
-	public String getDepartment(){
-		try{
-			if (_Department==null){
-				_Department=getStringProperty("department");
-				return _Department;
-			}else {
-				return _Department;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for department.
-	 * @param v Value to Set.
-	 */
-	public void setDepartment(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/department",v);
-		_Department=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Email=null;
-
-	/**
-	 * @return Returns the email.
-	 */
-	public String getEmail(){
-		try{
-			if (_Email==null){
-				_Email=getStringProperty("email");
-				return _Email;
-			}else {
-				return _Email;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for email.
-	 * @param v Value to Set.
-	 */
-	public void setEmail(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/email",v);
-		_Email=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Phone=null;
-
-	/**
-	 * @return Returns the phone.
-	 */
-	public String getPhone(){
-		try{
-			if (_Phone==null){
-				_Phone=getStringProperty("phone");
-				return _Phone;
-			}else {
-				return _Phone;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for phone.
-	 * @param v Value to Set.
-	 */
-	public void setPhone(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/phone",v);
-		_Phone=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatInvestigatordataId=null;
-
-	/**
-	 * @return Returns the xnat_investigatorData_id.
-	 */
-	public Integer getXnatInvestigatordataId() {
-		try{
-			if (_XnatInvestigatordataId==null){
-				_XnatInvestigatordataId=getIntegerProperty("xnat_investigatorData_id");
-				return _XnatInvestigatordataId;
-			}else {
-				return _XnatInvestigatordataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_investigatorData_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatInvestigatordataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_investigatorData_id",v);
-		_XnatInvestigatordataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatInvestigatordata> getAllXnatInvestigatordatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatInvestigatordata> al = new ArrayList<org.nrg.xdat.om.XnatInvestigatordata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatInvestigatordata> getXnatInvestigatordatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatInvestigatordata> al = new ArrayList<org.nrg.xdat.om.XnatInvestigatordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatInvestigatordata> getXnatInvestigatordatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatInvestigatordata> al = new ArrayList<org.nrg.xdat.om.XnatInvestigatordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatInvestigatordata getXnatInvestigatordatasByXnatInvestigatordataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:investigatorData/xnat_investigatorData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatInvestigatordata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatIoscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatIoscandata.java
deleted file mode 100644
index f240ce5f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatIoscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatIoscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatIoscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatIoscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:ioScanData";
-
-	public AutoXnatIoscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatIoscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatIoscandata(UserI user)
-	 **/
-	public AutoXnatIoscandata(){}
-
-	public AutoXnatIoscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:ioScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatIoscandata> getAllXnatIoscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatIoscandata> al = new ArrayList<org.nrg.xdat.om.XnatIoscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatIoscandata> getXnatIoscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatIoscandata> al = new ArrayList<org.nrg.xdat.om.XnatIoscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatIoscandata> getXnatIoscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatIoscandata> al = new ArrayList<org.nrg.xdat.om.XnatIoscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatIoscandata getXnatIoscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:ioScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatIoscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatIosessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatIosessiondata.java
deleted file mode 100644
index 990326a0..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatIosessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatIosessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatIosessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatIosessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:ioSessionData";
-
-	public AutoXnatIosessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatIosessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatIosessiondata(UserI user)
-	 **/
-	public AutoXnatIosessiondata(){}
-
-	public AutoXnatIosessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:ioSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatIosessiondata> getAllXnatIosessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatIosessiondata> al = new ArrayList<org.nrg.xdat.om.XnatIosessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatIosessiondata> getXnatIosessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatIosessiondata> al = new ArrayList<org.nrg.xdat.om.XnatIosessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatIosessiondata> getXnatIosessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatIosessiondata> al = new ArrayList<org.nrg.xdat.om.XnatIosessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatIosessiondata getXnatIosessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:ioSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatIosessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMegscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMegscandata.java
deleted file mode 100644
index 2015e7f0..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMegscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMegscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatMegscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMegscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:megScanData";
-
-	public AutoXnatMegscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMegscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMegscandata(UserI user)
-	 **/
-	public AutoXnatMegscandata(){}
-
-	public AutoXnatMegscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:megScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMegscandata> getAllXnatMegscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMegscandata> al = new ArrayList<org.nrg.xdat.om.XnatMegscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMegscandata> getXnatMegscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMegscandata> al = new ArrayList<org.nrg.xdat.om.XnatMegscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMegscandata> getXnatMegscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMegscandata> al = new ArrayList<org.nrg.xdat.om.XnatMegscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMegscandata getXnatMegscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:megScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMegscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMegsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMegsessiondata.java
deleted file mode 100644
index 3f69a970..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMegsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMegsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatMegsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMegsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:megSessionData";
-
-	public AutoXnatMegsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMegsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMegsessiondata(UserI user)
-	 **/
-	public AutoXnatMegsessiondata(){}
-
-	public AutoXnatMegsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:megSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMegsessiondata> getAllXnatMegsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMegsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMegsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMegsessiondata> getXnatMegsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMegsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMegsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMegsessiondata> getXnatMegsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMegsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMegsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMegsessiondata getXnatMegsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:megSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMegsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMgscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMgscandata.java
deleted file mode 100644
index e61be8c1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMgscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMgscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatMgscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMgscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:mgScanData";
-
-	public AutoXnatMgscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMgscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMgscandata(UserI user)
-	 **/
-	public AutoXnatMgscandata(){}
-
-	public AutoXnatMgscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:mgScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMgscandata> getAllXnatMgscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMgscandata> al = new ArrayList<org.nrg.xdat.om.XnatMgscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMgscandata> getXnatMgscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMgscandata> al = new ArrayList<org.nrg.xdat.om.XnatMgscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMgscandata> getXnatMgscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMgscandata> al = new ArrayList<org.nrg.xdat.om.XnatMgscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMgscandata getXnatMgscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:mgScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMgscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMgsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMgsessiondata.java
deleted file mode 100644
index 4a6faec3..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMgsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMgsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatMgsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMgsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:mgSessionData";
-
-	public AutoXnatMgsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMgsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMgsessiondata(UserI user)
-	 **/
-	public AutoXnatMgsessiondata(){}
-
-	public AutoXnatMgsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:mgSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMgsessiondata> getAllXnatMgsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMgsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMgsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMgsessiondata> getXnatMgsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMgsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMgsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMgsessiondata> getXnatMgsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMgsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMgsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMgsessiondata getXnatMgsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:mgSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMgsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrassessordata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrassessordata.java
deleted file mode 100644
index bf9ae415..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrassessordata.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMrassessordata extends XnatImageassessordata implements org.nrg.xdat.model.XnatMrassessordataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMrassessordata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:mrAssessorData";
-
-	public AutoXnatMrassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMrassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMrassessordata(UserI user)
-	 **/
-	public AutoXnatMrassessordata(){}
-
-	public AutoXnatMrassessordata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:mrAssessorData";
-	}
-	 private org.nrg.xdat.om.XnatImageassessordata _Imageassessordata =null;
-
-	/**
-	 * imageAssessorData
-	 * @return org.nrg.xdat.om.XnatImageassessordata
-	 */
-	public org.nrg.xdat.om.XnatImageassessordata getImageassessordata() {
-		try{
-			if (_Imageassessordata==null){
-				_Imageassessordata=((XnatImageassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageAssessorData")));
-				return _Imageassessordata;
-			}else {
-				return _Imageassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setImageassessordata(ItemI v) throws Exception{
-		_Imageassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageAssessorData
-	 * set org.nrg.xdat.model.XnatImageassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImageassessordataI> void setImageassessordata(A item) throws Exception{
-	setImageassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageAssessorData.
-	 * */
-	public void removeImageassessordata() {
-		_Imageassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrassessordata> getAllXnatMrassessordatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrassessordata> al = new ArrayList<org.nrg.xdat.om.XnatMrassessordata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrassessordata> getXnatMrassessordatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrassessordata> al = new ArrayList<org.nrg.xdat.om.XnatMrassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrassessordata> getXnatMrassessordatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrassessordata> al = new ArrayList<org.nrg.xdat.om.XnatMrassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMrassessordata getXnatMrassessordatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:mrAssessorData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMrassessordata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		XFTItem mr = org.nrg.xft.search.ItemSearch.GetItem("xnat:mrSessionData.ID",getItem().getProperty("xnat:mrAssessorData.imageSession_ID"),getItem().getUser(),false);
-		al.add(mr);
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",mr.getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageAssessorData
-	        XnatImageassessordata childImageassessordata = (XnatImageassessordata)this.getImageassessordata();
-	            if (childImageassessordata!=null){
-	              for(ResourceFile rf: ((XnatImageassessordata)childImageassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageAssessorData[" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageAssessorData/" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrqcscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrqcscandata.java
deleted file mode 100644
index 234fb567..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrqcscandata.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMrqcscandata extends XnatQcscandata implements org.nrg.xdat.model.XnatMrqcscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMrqcscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:mrQcScanData";
-
-	public AutoXnatMrqcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMrqcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMrqcscandata(UserI user)
-	 **/
-	public AutoXnatMrqcscandata(){}
-
-	public AutoXnatMrqcscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:mrQcScanData";
-	}
-	 private org.nrg.xdat.om.XnatQcscandata _Qcscandata =null;
-
-	/**
-	 * qcScanData
-	 * @return org.nrg.xdat.om.XnatQcscandata
-	 */
-	public org.nrg.xdat.om.XnatQcscandata getQcscandata() {
-		try{
-			if (_Qcscandata==null){
-				_Qcscandata=((XnatQcscandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("qcScanData")));
-				return _Qcscandata;
-			}else {
-				return _Qcscandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for qcScanData.
-	 * @param v Value to Set.
-	 */
-	public void setQcscandata(ItemI v) throws Exception{
-		_Qcscandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/qcScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/qcScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * qcScanData
-	 * set org.nrg.xdat.model.XnatQcscandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcscandataI> void setQcscandata(A item) throws Exception{
-	setQcscandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the qcScanData.
-	 * */
-	public void removeQcscandata() {
-		_Qcscandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/qcScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Blurring=null;
-
-	/**
-	 * @return Returns the blurring.
-	 */
-	public String getBlurring(){
-		try{
-			if (_Blurring==null){
-				_Blurring=getStringProperty("blurring");
-				return _Blurring;
-			}else {
-				return _Blurring;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for blurring.
-	 * @param v Value to Set.
-	 */
-	public void setBlurring(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/blurring",v);
-		_Blurring=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Flow=null;
-
-	/**
-	 * @return Returns the flow.
-	 */
-	public String getFlow(){
-		try{
-			if (_Flow==null){
-				_Flow=getStringProperty("flow");
-				return _Flow;
-			}else {
-				return _Flow;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for flow.
-	 * @param v Value to Set.
-	 */
-	public void setFlow(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/flow",v);
-		_Flow=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Imagecontrast=null;
-
-	/**
-	 * @return Returns the imageContrast.
-	 */
-	public String getImagecontrast(){
-		try{
-			if (_Imagecontrast==null){
-				_Imagecontrast=getStringProperty("imageContrast");
-				return _Imagecontrast;
-			}else {
-				return _Imagecontrast;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for imageContrast.
-	 * @param v Value to Set.
-	 */
-	public void setImagecontrast(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/imageContrast",v);
-		_Imagecontrast=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Inhomogeneity=null;
-
-	/**
-	 * @return Returns the inhomogeneity.
-	 */
-	public String getInhomogeneity(){
-		try{
-			if (_Inhomogeneity==null){
-				_Inhomogeneity=getStringProperty("inhomogeneity");
-				return _Inhomogeneity;
-			}else {
-				return _Inhomogeneity;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for inhomogeneity.
-	 * @param v Value to Set.
-	 */
-	public void setInhomogeneity(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/inhomogeneity",v);
-		_Inhomogeneity=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Wrap=null;
-
-	/**
-	 * @return Returns the wrap.
-	 */
-	public String getWrap(){
-		try{
-			if (_Wrap==null){
-				_Wrap=getStringProperty("wrap");
-				return _Wrap;
-			}else {
-				return _Wrap;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for wrap.
-	 * @param v Value to Set.
-	 */
-	public void setWrap(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/wrap",v);
-		_Wrap=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Susceptibility=null;
-
-	/**
-	 * @return Returns the susceptibility.
-	 */
-	public String getSusceptibility(){
-		try{
-			if (_Susceptibility==null){
-				_Susceptibility=getStringProperty("susceptibility");
-				return _Susceptibility;
-			}else {
-				return _Susceptibility;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for susceptibility.
-	 * @param v Value to Set.
-	 */
-	public void setSusceptibility(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/susceptibility",v);
-		_Susceptibility=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Interpacmotion=null;
-
-	/**
-	 * @return Returns the interpacMotion.
-	 */
-	public String getInterpacmotion(){
-		try{
-			if (_Interpacmotion==null){
-				_Interpacmotion=getStringProperty("interpacMotion");
-				return _Interpacmotion;
-			}else {
-				return _Interpacmotion;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for interpacMotion.
-	 * @param v Value to Set.
-	 */
-	public void setInterpacmotion(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/interpacMotion",v);
-		_Interpacmotion=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrqcscandata> getAllXnatMrqcscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrqcscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrqcscandata> getXnatMrqcscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrqcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrqcscandata> getXnatMrqcscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrqcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMrqcscandata getXnatMrqcscandatasByXnatQcscandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:mrQcScanData/xnat_qcscandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMrqcscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //qcScanData
-	        XnatQcscandata childQcscandata = (XnatQcscandata)this.getQcscandata();
-	            if (childQcscandata!=null){
-	              for(ResourceFile rf: ((XnatQcscandata)childQcscandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("qcScanData[" + ((XnatQcscandata)childQcscandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("qcScanData/" + ((XnatQcscandata)childQcscandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrscandata.java
deleted file mode 100644
index 8e8eb1f2..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrscandata.java
+++ /dev/null
@@ -1,1237 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMrscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatMrscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMrscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:mrScanData";
-
-	public AutoXnatMrscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMrscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMrscandata(UserI user)
-	 **/
-	public AutoXnatMrscandata(){}
-
-	public AutoXnatMrscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:mrScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Coil=null;
-
-	/**
-	 * @return Returns the coil.
-	 */
-	public String getCoil(){
-		try{
-			if (_Coil==null){
-				_Coil=getStringProperty("coil");
-				return _Coil;
-			}else {
-				return _Coil;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for coil.
-	 * @param v Value to Set.
-	 */
-	public void setCoil(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/coil",v);
-		_Coil=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Fieldstrength=null;
-
-	/**
-	 * @return Returns the fieldStrength.
-	 */
-	public String getFieldstrength(){
-		try{
-			if (_Fieldstrength==null){
-				_Fieldstrength=getStringProperty("fieldStrength");
-				return _Fieldstrength;
-			}else {
-				return _Fieldstrength;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for fieldStrength.
-	 * @param v Value to Set.
-	 */
-	public void setFieldstrength(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/fieldStrength",v);
-		_Fieldstrength=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Marker=null;
-
-	/**
-	 * @return Returns the marker.
-	 */
-	public String getMarker(){
-		try{
-			if (_Marker==null){
-				_Marker=getStringProperty("marker");
-				return _Marker;
-			}else {
-				return _Marker;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for marker.
-	 * @param v Value to Set.
-	 */
-	public void setMarker(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/marker",v);
-		_Marker=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Stabilization=null;
-
-	/**
-	 * @return Returns the stabilization.
-	 */
-	public String getStabilization(){
-		try{
-			if (_Stabilization==null){
-				_Stabilization=getStringProperty("stabilization");
-				return _Stabilization;
-			}else {
-				return _Stabilization;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stabilization.
-	 * @param v Value to Set.
-	 */
-	public void setStabilization(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stabilization",v);
-		_Stabilization=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_voxelres_units=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/units.
-	 */
-	public String getParameters_voxelres_units(){
-		try{
-			if (_Parameters_voxelres_units==null){
-				_Parameters_voxelres_units=getStringProperty("parameters/voxelRes/units");
-				return _Parameters_voxelres_units;
-			}else {
-				return _Parameters_voxelres_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/units.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/units",v);
-		_Parameters_voxelres_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_x=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/x.
-	 */
-	public Double getParameters_voxelres_x() {
-		try{
-			if (_Parameters_voxelres_x==null){
-				_Parameters_voxelres_x=getDoubleProperty("parameters/voxelRes/x");
-				return _Parameters_voxelres_x;
-			}else {
-				return _Parameters_voxelres_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/x",v);
-		_Parameters_voxelres_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_y=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/y.
-	 */
-	public Double getParameters_voxelres_y() {
-		try{
-			if (_Parameters_voxelres_y==null){
-				_Parameters_voxelres_y=getDoubleProperty("parameters/voxelRes/y");
-				return _Parameters_voxelres_y;
-			}else {
-				return _Parameters_voxelres_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/y",v);
-		_Parameters_voxelres_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_z=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/z.
-	 */
-	public Double getParameters_voxelres_z() {
-		try{
-			if (_Parameters_voxelres_z==null){
-				_Parameters_voxelres_z=getDoubleProperty("parameters/voxelRes/z");
-				return _Parameters_voxelres_z;
-			}else {
-				return _Parameters_voxelres_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/z.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/z",v);
-		_Parameters_voxelres_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_orientation=null;
-
-	/**
-	 * @return Returns the parameters/orientation.
-	 */
-	public String getParameters_orientation(){
-		try{
-			if (_Parameters_orientation==null){
-				_Parameters_orientation=getStringProperty("parameters/orientation");
-				return _Parameters_orientation;
-			}else {
-				return _Parameters_orientation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/orientation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_orientation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/orientation",v);
-		_Parameters_orientation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_fov_x=null;
-
-	/**
-	 * @return Returns the parameters/fov/x.
-	 */
-	public Integer getParameters_fov_x() {
-		try{
-			if (_Parameters_fov_x==null){
-				_Parameters_fov_x=getIntegerProperty("parameters/fov/x");
-				return _Parameters_fov_x;
-			}else {
-				return _Parameters_fov_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fov/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_fov_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fov/x",v);
-		_Parameters_fov_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_fov_y=null;
-
-	/**
-	 * @return Returns the parameters/fov/y.
-	 */
-	public Integer getParameters_fov_y() {
-		try{
-			if (_Parameters_fov_y==null){
-				_Parameters_fov_y=getIntegerProperty("parameters/fov/y");
-				return _Parameters_fov_y;
-			}else {
-				return _Parameters_fov_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fov/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_fov_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fov/y",v);
-		_Parameters_fov_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_matrix_x=null;
-
-	/**
-	 * @return Returns the parameters/matrix/x.
-	 */
-	public Integer getParameters_matrix_x() {
-		try{
-			if (_Parameters_matrix_x==null){
-				_Parameters_matrix_x=getIntegerProperty("parameters/matrix/x");
-				return _Parameters_matrix_x;
-			}else {
-				return _Parameters_matrix_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/matrix/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_matrix_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/matrix/x",v);
-		_Parameters_matrix_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_matrix_y=null;
-
-	/**
-	 * @return Returns the parameters/matrix/y.
-	 */
-	public Integer getParameters_matrix_y() {
-		try{
-			if (_Parameters_matrix_y==null){
-				_Parameters_matrix_y=getIntegerProperty("parameters/matrix/y");
-				return _Parameters_matrix_y;
-			}else {
-				return _Parameters_matrix_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/matrix/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_matrix_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/matrix/y",v);
-		_Parameters_matrix_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_partitions=null;
-
-	/**
-	 * @return Returns the parameters/partitions.
-	 */
-	public Integer getParameters_partitions() {
-		try{
-			if (_Parameters_partitions==null){
-				_Parameters_partitions=getIntegerProperty("parameters/partitions");
-				return _Parameters_partitions;
-			}else {
-				return _Parameters_partitions;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/partitions.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_partitions(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/partitions",v);
-		_Parameters_partitions=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_tr=null;
-
-	/**
-	 * @return Returns the parameters/tr.
-	 */
-	public Double getParameters_tr() {
-		try{
-			if (_Parameters_tr==null){
-				_Parameters_tr=getDoubleProperty("parameters/tr");
-				return _Parameters_tr;
-			}else {
-				return _Parameters_tr;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/tr.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_tr(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/tr",v);
-		_Parameters_tr=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_te=null;
-
-	/**
-	 * @return Returns the parameters/te.
-	 */
-	public Double getParameters_te() {
-		try{
-			if (_Parameters_te==null){
-				_Parameters_te=getDoubleProperty("parameters/te");
-				return _Parameters_te;
-			}else {
-				return _Parameters_te;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/te.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_te(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/te",v);
-		_Parameters_te=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_ti=null;
-
-	/**
-	 * @return Returns the parameters/ti.
-	 */
-	public Double getParameters_ti() {
-		try{
-			if (_Parameters_ti==null){
-				_Parameters_ti=getDoubleProperty("parameters/ti");
-				return _Parameters_ti;
-			}else {
-				return _Parameters_ti;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/ti.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_ti(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/ti",v);
-		_Parameters_ti=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_flip=null;
-
-	/**
-	 * @return Returns the parameters/flip.
-	 */
-	public Integer getParameters_flip() {
-		try{
-			if (_Parameters_flip==null){
-				_Parameters_flip=getIntegerProperty("parameters/flip");
-				return _Parameters_flip;
-			}else {
-				return _Parameters_flip;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/flip.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_flip(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/flip",v);
-		_Parameters_flip=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_sequence=null;
-
-	/**
-	 * @return Returns the parameters/sequence.
-	 */
-	public String getParameters_sequence(){
-		try{
-			if (_Parameters_sequence==null){
-				_Parameters_sequence=getStringProperty("parameters/sequence");
-				return _Parameters_sequence;
-			}else {
-				return _Parameters_sequence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/sequence.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_sequence(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/sequence",v);
-		_Parameters_sequence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_origin=null;
-
-	/**
-	 * @return Returns the parameters/origin.
-	 */
-	public String getParameters_origin(){
-		try{
-			if (_Parameters_origin==null){
-				_Parameters_origin=getStringProperty("parameters/origin");
-				return _Parameters_origin;
-			}else {
-				return _Parameters_origin;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/origin.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_origin(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/origin",v);
-		_Parameters_origin=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_imagetype=null;
-
-	/**
-	 * @return Returns the parameters/imageType.
-	 */
-	public String getParameters_imagetype(){
-		try{
-			if (_Parameters_imagetype==null){
-				_Parameters_imagetype=getStringProperty("parameters/imageType");
-				return _Parameters_imagetype;
-			}else {
-				return _Parameters_imagetype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/imageType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_imagetype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/imageType",v);
-		_Parameters_imagetype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_scansequence=null;
-
-	/**
-	 * @return Returns the parameters/scanSequence.
-	 */
-	public String getParameters_scansequence(){
-		try{
-			if (_Parameters_scansequence==null){
-				_Parameters_scansequence=getStringProperty("parameters/scanSequence");
-				return _Parameters_scansequence;
-			}else {
-				return _Parameters_scansequence;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/scanSequence.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_scansequence(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/scanSequence",v);
-		_Parameters_scansequence=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_seqvariant=null;
-
-	/**
-	 * @return Returns the parameters/seqVariant.
-	 */
-	public String getParameters_seqvariant(){
-		try{
-			if (_Parameters_seqvariant==null){
-				_Parameters_seqvariant=getStringProperty("parameters/seqVariant");
-				return _Parameters_seqvariant;
-			}else {
-				return _Parameters_seqvariant;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/seqVariant.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_seqvariant(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/seqVariant",v);
-		_Parameters_seqvariant=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_scanoptions=null;
-
-	/**
-	 * @return Returns the parameters/scanOptions.
-	 */
-	public String getParameters_scanoptions(){
-		try{
-			if (_Parameters_scanoptions==null){
-				_Parameters_scanoptions=getStringProperty("parameters/scanOptions");
-				return _Parameters_scanoptions;
-			}else {
-				return _Parameters_scanoptions;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/scanOptions.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_scanoptions(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/scanOptions",v);
-		_Parameters_scanoptions=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_acqtype=null;
-
-	/**
-	 * @return Returns the parameters/acqType.
-	 */
-	public String getParameters_acqtype(){
-		try{
-			if (_Parameters_acqtype==null){
-				_Parameters_acqtype=getStringProperty("parameters/acqType");
-				return _Parameters_acqtype;
-			}else {
-				return _Parameters_acqtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/acqType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_acqtype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/acqType",v);
-		_Parameters_acqtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_coil=null;
-
-	/**
-	 * @return Returns the parameters/coil.
-	 */
-	public String getParameters_coil(){
-		try{
-			if (_Parameters_coil==null){
-				_Parameters_coil=getStringProperty("parameters/coil");
-				return _Parameters_coil;
-			}else {
-				return _Parameters_coil;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/coil.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_coil(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/coil",v);
-		_Parameters_coil=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_dtiacqcount=null;
-
-	/**
-	 * @return Returns the parameters/dtiAcqCount.
-	 */
-	public Integer getParameters_dtiacqcount() {
-		try{
-			if (_Parameters_dtiacqcount==null){
-				_Parameters_dtiacqcount=getIntegerProperty("parameters/dtiAcqCount");
-				return _Parameters_dtiacqcount;
-			}else {
-				return _Parameters_dtiacqcount;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/dtiAcqCount.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_dtiacqcount(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/dtiAcqCount",v);
-		_Parameters_dtiacqcount=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_pixelbandwidth=null;
-
-	/**
-	 * @return Returns the parameters/pixelBandwidth.
-	 */
-	public Double getParameters_pixelbandwidth() {
-		try{
-			if (_Parameters_pixelbandwidth==null){
-				_Parameters_pixelbandwidth=getDoubleProperty("parameters/pixelBandwidth");
-				return _Parameters_pixelbandwidth;
-			}else {
-				return _Parameters_pixelbandwidth;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/pixelBandwidth.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_pixelbandwidth(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/pixelBandwidth",v);
-		_Parameters_pixelbandwidth=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_diffusion_bvalues=null;
-
-	/**
-	 * @return Returns the parameters/diffusion/bValues.
-	 */
-	public String getParameters_diffusion_bvalues(){
-		try{
-			if (_Parameters_diffusion_bvalues==null){
-				_Parameters_diffusion_bvalues=getStringProperty("parameters/diffusion/bValues");
-				return _Parameters_diffusion_bvalues;
-			}else {
-				return _Parameters_diffusion_bvalues;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/diffusion/bValues.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_diffusion_bvalues(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/diffusion/bValues",v);
-		_Parameters_diffusion_bvalues=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_diffusion_directionality=null;
-
-	/**
-	 * @return Returns the parameters/diffusion/directionality.
-	 */
-	public String getParameters_diffusion_directionality(){
-		try{
-			if (_Parameters_diffusion_directionality==null){
-				_Parameters_diffusion_directionality=getStringProperty("parameters/diffusion/directionality");
-				return _Parameters_diffusion_directionality;
-			}else {
-				return _Parameters_diffusion_directionality;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/diffusion/directionality.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_diffusion_directionality(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/diffusion/directionality",v);
-		_Parameters_diffusion_directionality=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_diffusion_orientations=null;
-
-	/**
-	 * @return Returns the parameters/diffusion/orientations.
-	 */
-	public String getParameters_diffusion_orientations(){
-		try{
-			if (_Parameters_diffusion_orientations==null){
-				_Parameters_diffusion_orientations=getStringProperty("parameters/diffusion/orientations");
-				return _Parameters_diffusion_orientations;
-			}else {
-				return _Parameters_diffusion_orientations;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/diffusion/orientations.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_diffusion_orientations(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/diffusion/orientations",v);
-		_Parameters_diffusion_orientations=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_diffusion_anisotropytype=null;
-
-	/**
-	 * @return Returns the parameters/diffusion/anisotropyType.
-	 */
-	public String getParameters_diffusion_anisotropytype(){
-		try{
-			if (_Parameters_diffusion_anisotropytype==null){
-				_Parameters_diffusion_anisotropytype=getStringProperty("parameters/diffusion/anisotropyType");
-				return _Parameters_diffusion_anisotropytype;
-			}else {
-				return _Parameters_diffusion_anisotropytype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/diffusion/anisotropyType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_diffusion_anisotropytype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/diffusion/anisotropyType",v);
-		_Parameters_diffusion_anisotropytype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAddfield> _Parameters_addparam =null;
-
-	/**
-	 * parameters/addParam
-	 * @return Returns an List of org.nrg.xdat.om.XnatAddfield
-	 */
-	public <A extends org.nrg.xdat.model.XnatAddfieldI> List<A> getParameters_addparam() {
-		try{
-			if (_Parameters_addparam==null){
-				_Parameters_addparam=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/addParam"));
-			}
-			return (List<A>) _Parameters_addparam;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAddfield>();}
-	}
-
-	/**
-	 * Sets the value for parameters/addParam.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_addparam(ItemI v) throws Exception{
-		_Parameters_addparam =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/addParam
-	 * Adds org.nrg.xdat.model.XnatAddfieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAddfieldI> void addParameters_addparam(A item) throws Exception{
-	setParameters_addparam((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/addParam of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_addparam(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_addparam =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcmvalidation=null;
-
-	/**
-	 * @return Returns the dcmValidation.
-	 */
-	public String getDcmvalidation(){
-		try{
-			if (_Dcmvalidation==null){
-				_Dcmvalidation=getStringProperty("dcmValidation");
-				return _Dcmvalidation;
-			}else {
-				return _Dcmvalidation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmValidation.
-	 * @param v Value to Set.
-	 */
-	public void setDcmvalidation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcmValidation",v);
-		_Dcmvalidation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Dcmvalidation_status=null;
-
-	/**
-	 * @return Returns the dcmValidation/status.
-	 */
-	public Boolean getDcmvalidation_status() {
-		try{
-			if (_Dcmvalidation_status==null){
-				_Dcmvalidation_status=getBooleanProperty("dcmValidation/status");
-				return _Dcmvalidation_status;
-			}else {
-				return _Dcmvalidation_status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmValidation/status.
-	 * @param v Value to Set.
-	 */
-	public void setDcmvalidation_status(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/dcmValidation/status",v);
-		_Dcmvalidation_status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrscandata> getAllXnatMrscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrscandata> getXnatMrscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrscandata> getXnatMrscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMrscandata getXnatMrscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:mrScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMrscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/addParam
-	        for(org.nrg.xdat.model.XnatAddfieldI childParameters_addparam : this.getParameters_addparam()){
-	            if (childParameters_addparam!=null){
-	              for(ResourceFile rf: ((XnatAddfield)childParameters_addparam).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/addParam[" + ((XnatAddfield)childParameters_addparam).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/addParam/" + ((XnatAddfield)childParameters_addparam).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrsessiondata.java
deleted file mode 100644
index 2d3e91f8..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrsessiondata.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMrsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatMrsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMrsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:mrSessionData";
-
-	public AutoXnatMrsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMrsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMrsessiondata(UserI user)
-	 **/
-	public AutoXnatMrsessiondata(){}
-
-	public AutoXnatMrsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:mrSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Coil=null;
-
-	/**
-	 * @return Returns the coil.
-	 */
-	public String getCoil(){
-		try{
-			if (_Coil==null){
-				_Coil=getStringProperty("coil");
-				return _Coil;
-			}else {
-				return _Coil;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for coil.
-	 * @param v Value to Set.
-	 */
-	public void setCoil(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/coil",v);
-		_Coil=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Fieldstrength=null;
-
-	/**
-	 * @return Returns the fieldStrength.
-	 */
-	public String getFieldstrength(){
-		try{
-			if (_Fieldstrength==null){
-				_Fieldstrength=getStringProperty("fieldStrength");
-				return _Fieldstrength;
-			}else {
-				return _Fieldstrength;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for fieldStrength.
-	 * @param v Value to Set.
-	 */
-	public void setFieldstrength(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/fieldStrength",v);
-		_Fieldstrength=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Marker=null;
-
-	/**
-	 * @return Returns the marker.
-	 */
-	public String getMarker(){
-		try{
-			if (_Marker==null){
-				_Marker=getStringProperty("marker");
-				return _Marker;
-			}else {
-				return _Marker;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for marker.
-	 * @param v Value to Set.
-	 */
-	public void setMarker(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/marker",v);
-		_Marker=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Stabilization=null;
-
-	/**
-	 * @return Returns the stabilization.
-	 */
-	public String getStabilization(){
-		try{
-			if (_Stabilization==null){
-				_Stabilization=getStringProperty("stabilization");
-				return _Stabilization;
-			}else {
-				return _Stabilization;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stabilization.
-	 * @param v Value to Set.
-	 */
-	public void setStabilization(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stabilization",v);
-		_Stabilization=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrsessiondata> getAllXnatMrsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMrsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrsessiondata> getXnatMrsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMrsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrsessiondata> getXnatMrsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatMrsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMrsessiondata getXnatMrsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:mrSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMrsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrsscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrsscandata.java
deleted file mode 100644
index 8f56a8be..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatMrsscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatMrsscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatMrsscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatMrsscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:mrsScanData";
-
-	public AutoXnatMrsscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatMrsscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatMrsscandata(UserI user)
-	 **/
-	public AutoXnatMrsscandata(){}
-
-	public AutoXnatMrsscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:mrsScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrsscandata> getAllXnatMrsscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrsscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrsscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrsscandata> getXnatMrsscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrsscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrsscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatMrsscandata> getXnatMrsscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatMrsscandata> al = new ArrayList<org.nrg.xdat.om.XnatMrsscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatMrsscandata getXnatMrsscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:mrsScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatMrsscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatNmscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatNmscandata.java
deleted file mode 100644
index 84448d8b..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatNmscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:07 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatNmscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatNmscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatNmscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:nmScanData";
-
-	public AutoXnatNmscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatNmscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatNmscandata(UserI user)
-	 **/
-	public AutoXnatNmscandata(){}
-
-	public AutoXnatNmscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:nmScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatNmscandata> getAllXnatNmscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatNmscandata> al = new ArrayList<org.nrg.xdat.om.XnatNmscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatNmscandata> getXnatNmscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatNmscandata> al = new ArrayList<org.nrg.xdat.om.XnatNmscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatNmscandata> getXnatNmscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatNmscandata> al = new ArrayList<org.nrg.xdat.om.XnatNmscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatNmscandata getXnatNmscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:nmScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatNmscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatNmsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatNmsessiondata.java
deleted file mode 100644
index 47b6b0aa..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatNmsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:07 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatNmsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatNmsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatNmsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:nmSessionData";
-
-	public AutoXnatNmsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatNmsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatNmsessiondata(UserI user)
-	 **/
-	public AutoXnatNmsessiondata(){}
-
-	public AutoXnatNmsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:nmSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatNmsessiondata> getAllXnatNmsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatNmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatNmsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatNmsessiondata> getXnatNmsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatNmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatNmsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatNmsessiondata> getXnatNmsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatNmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatNmsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatNmsessiondata getXnatNmsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:nmSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatNmsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOpscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOpscandata.java
deleted file mode 100644
index 5d198edc..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOpscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatOpscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatOpscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatOpscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:opScanData";
-
-	public AutoXnatOpscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatOpscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatOpscandata(UserI user)
-	 **/
-	public AutoXnatOpscandata(){}
-
-	public AutoXnatOpscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:opScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOpscandata> getAllXnatOpscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOpscandata> al = new ArrayList<org.nrg.xdat.om.XnatOpscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOpscandata> getXnatOpscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOpscandata> al = new ArrayList<org.nrg.xdat.om.XnatOpscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOpscandata> getXnatOpscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOpscandata> al = new ArrayList<org.nrg.xdat.om.XnatOpscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatOpscandata getXnatOpscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:opScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatOpscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOpsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOpsessiondata.java
deleted file mode 100644
index 6780e1ec..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOpsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatOpsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatOpsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatOpsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:opSessionData";
-
-	public AutoXnatOpsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatOpsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatOpsessiondata(UserI user)
-	 **/
-	public AutoXnatOpsessiondata(){}
-
-	public AutoXnatOpsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:opSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOpsessiondata> getAllXnatOpsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOpsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOpsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOpsessiondata> getXnatOpsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOpsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOpsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOpsessiondata> getXnatOpsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOpsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOpsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatOpsessiondata getXnatOpsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:opSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatOpsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOptscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOptscandata.java
deleted file mode 100644
index 3d921888..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOptscandata.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatOptscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatOptscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatOptscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:optScanData";
-
-	public AutoXnatOptscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatOptscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatOptscandata(UserI user)
-	 **/
-	public AutoXnatOptscandata(){}
-
-	public AutoXnatOptscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:optScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_voxelres_units=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/units.
-	 */
-	public String getParameters_voxelres_units(){
-		try{
-			if (_Parameters_voxelres_units==null){
-				_Parameters_voxelres_units=getStringProperty("parameters/voxelRes/units");
-				return _Parameters_voxelres_units;
-			}else {
-				return _Parameters_voxelres_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/units.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/units",v);
-		_Parameters_voxelres_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_x=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/x.
-	 */
-	public Double getParameters_voxelres_x() {
-		try{
-			if (_Parameters_voxelres_x==null){
-				_Parameters_voxelres_x=getDoubleProperty("parameters/voxelRes/x");
-				return _Parameters_voxelres_x;
-			}else {
-				return _Parameters_voxelres_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/x",v);
-		_Parameters_voxelres_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_y=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/y.
-	 */
-	public Double getParameters_voxelres_y() {
-		try{
-			if (_Parameters_voxelres_y==null){
-				_Parameters_voxelres_y=getDoubleProperty("parameters/voxelRes/y");
-				return _Parameters_voxelres_y;
-			}else {
-				return _Parameters_voxelres_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/y",v);
-		_Parameters_voxelres_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_voxelres_z=null;
-
-	/**
-	 * @return Returns the parameters/voxelRes/z.
-	 */
-	public Double getParameters_voxelres_z() {
-		try{
-			if (_Parameters_voxelres_z==null){
-				_Parameters_voxelres_z=getDoubleProperty("parameters/voxelRes/z");
-				return _Parameters_voxelres_z;
-			}else {
-				return _Parameters_voxelres_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/voxelRes/z.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_voxelres_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/voxelRes/z",v);
-		_Parameters_voxelres_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_fov_x=null;
-
-	/**
-	 * @return Returns the parameters/fov/x.
-	 */
-	public Integer getParameters_fov_x() {
-		try{
-			if (_Parameters_fov_x==null){
-				_Parameters_fov_x=getIntegerProperty("parameters/fov/x");
-				return _Parameters_fov_x;
-			}else {
-				return _Parameters_fov_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fov/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_fov_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fov/x",v);
-		_Parameters_fov_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_fov_y=null;
-
-	/**
-	 * @return Returns the parameters/fov/y.
-	 */
-	public Integer getParameters_fov_y() {
-		try{
-			if (_Parameters_fov_y==null){
-				_Parameters_fov_y=getIntegerProperty("parameters/fov/y");
-				return _Parameters_fov_y;
-			}else {
-				return _Parameters_fov_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fov/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_fov_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fov/y",v);
-		_Parameters_fov_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_laterality=null;
-
-	/**
-	 * @return Returns the parameters/laterality.
-	 */
-	public String getParameters_laterality(){
-		try{
-			if (_Parameters_laterality==null){
-				_Parameters_laterality=getStringProperty("parameters/laterality");
-				return _Parameters_laterality;
-			}else {
-				return _Parameters_laterality;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/laterality.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_laterality(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/laterality",v);
-		_Parameters_laterality=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_illuminationWavelength=null;
-
-	/**
-	 * @return Returns the parameters/illumination_wavelength.
-	 */
-	public String getParameters_illuminationWavelength(){
-		try{
-			if (_Parameters_illuminationWavelength==null){
-				_Parameters_illuminationWavelength=getStringProperty("parameters/illumination_wavelength");
-				return _Parameters_illuminationWavelength;
-			}else {
-				return _Parameters_illuminationWavelength;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/illumination_wavelength.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_illuminationWavelength(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/illumination_wavelength",v);
-		_Parameters_illuminationWavelength=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_illuminationPower=null;
-
-	/**
-	 * @return Returns the parameters/illumination_power.
-	 */
-	public String getParameters_illuminationPower(){
-		try{
-			if (_Parameters_illuminationPower==null){
-				_Parameters_illuminationPower=getStringProperty("parameters/illumination_power");
-				return _Parameters_illuminationPower;
-			}else {
-				return _Parameters_illuminationPower;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/illumination_power.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_illuminationPower(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/illumination_power",v);
-		_Parameters_illuminationPower=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_imagetype=null;
-
-	/**
-	 * @return Returns the parameters/imageType.
-	 */
-	public String getParameters_imagetype(){
-		try{
-			if (_Parameters_imagetype==null){
-				_Parameters_imagetype=getStringProperty("parameters/imageType");
-				return _Parameters_imagetype;
-			}else {
-				return _Parameters_imagetype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/imageType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_imagetype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/imageType",v);
-		_Parameters_imagetype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Dcmvalidation=null;
-
-	/**
-	 * @return Returns the dcmValidation.
-	 */
-	public String getDcmvalidation(){
-		try{
-			if (_Dcmvalidation==null){
-				_Dcmvalidation=getStringProperty("dcmValidation");
-				return _Dcmvalidation;
-			}else {
-				return _Dcmvalidation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmValidation.
-	 * @param v Value to Set.
-	 */
-	public void setDcmvalidation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/dcmValidation",v);
-		_Dcmvalidation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Dcmvalidation_status=null;
-
-	/**
-	 * @return Returns the dcmValidation/status.
-	 */
-	public Boolean getDcmvalidation_status() {
-		try{
-			if (_Dcmvalidation_status==null){
-				_Dcmvalidation_status=getBooleanProperty("dcmValidation/status");
-				return _Dcmvalidation_status;
-			}else {
-				return _Dcmvalidation_status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for dcmValidation/status.
-	 * @param v Value to Set.
-	 */
-	public void setDcmvalidation_status(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/dcmValidation/status",v);
-		_Dcmvalidation_status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOptscandata> getAllXnatOptscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOptscandata> al = new ArrayList<org.nrg.xdat.om.XnatOptscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOptscandata> getXnatOptscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOptscandata> al = new ArrayList<org.nrg.xdat.om.XnatOptscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOptscandata> getXnatOptscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOptscandata> al = new ArrayList<org.nrg.xdat.om.XnatOptscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatOptscandata getXnatOptscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:optScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatOptscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOptsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOptsessiondata.java
deleted file mode 100644
index 1565ad16..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOptsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatOptsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatOptsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatOptsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:optSessionData";
-
-	public AutoXnatOptsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatOptsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatOptsessiondata(UserI user)
-	 **/
-	public AutoXnatOptsessiondata(){}
-
-	public AutoXnatOptsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:optSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOptsessiondata> getAllXnatOptsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOptsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOptsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOptsessiondata> getXnatOptsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOptsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOptsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOptsessiondata> getXnatOptsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOptsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOptsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatOptsessiondata getXnatOptsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:optSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatOptsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherdicomscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherdicomscandata.java
deleted file mode 100644
index 875c7014..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherdicomscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatOtherdicomscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatOtherdicomscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatOtherdicomscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:otherDicomScanData";
-
-	public AutoXnatOtherdicomscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatOtherdicomscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatOtherdicomscandata(UserI user)
-	 **/
-	public AutoXnatOtherdicomscandata(){}
-
-	public AutoXnatOtherdicomscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:otherDicomScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata> getAllXnatOtherdicomscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata> al = new ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata> getXnatOtherdicomscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata> al = new ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata> getXnatOtherdicomscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata> al = new ArrayList<org.nrg.xdat.om.XnatOtherdicomscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatOtherdicomscandata getXnatOtherdicomscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:otherDicomScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatOtherdicomscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherdicomsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherdicomsessiondata.java
deleted file mode 100644
index 74c07114..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherdicomsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatOtherdicomsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatOtherdicomsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatOtherdicomsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:otherDicomSessionData";
-
-	public AutoXnatOtherdicomsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatOtherdicomsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatOtherdicomsessiondata(UserI user)
-	 **/
-	public AutoXnatOtherdicomsessiondata(){}
-
-	public AutoXnatOtherdicomsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:otherDicomSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata> getAllXnatOtherdicomsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata> getXnatOtherdicomsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata> getXnatOtherdicomsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatOtherdicomsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatOtherdicomsessiondata getXnatOtherdicomsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:otherDicomSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatOtherdicomsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherqcscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherqcscandata.java
deleted file mode 100644
index 268dad06..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatOtherqcscandata.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatOtherqcscandata extends XnatQcscandata implements org.nrg.xdat.model.XnatOtherqcscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatOtherqcscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:otherQcScanData";
-
-	public AutoXnatOtherqcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatOtherqcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatOtherqcscandata(UserI user)
-	 **/
-	public AutoXnatOtherqcscandata(){}
-
-	public AutoXnatOtherqcscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:otherQcScanData";
-	}
-	 private org.nrg.xdat.om.XnatQcscandata _Qcscandata =null;
-
-	/**
-	 * qcScanData
-	 * @return org.nrg.xdat.om.XnatQcscandata
-	 */
-	public org.nrg.xdat.om.XnatQcscandata getQcscandata() {
-		try{
-			if (_Qcscandata==null){
-				_Qcscandata=((XnatQcscandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("qcScanData")));
-				return _Qcscandata;
-			}else {
-				return _Qcscandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for qcScanData.
-	 * @param v Value to Set.
-	 */
-	public void setQcscandata(ItemI v) throws Exception{
-		_Qcscandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/qcScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/qcScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * qcScanData
-	 * set org.nrg.xdat.model.XnatQcscandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcscandataI> void setQcscandata(A item) throws Exception{
-	setQcscandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the qcScanData.
-	 * */
-	public void removeQcscandata() {
-		_Qcscandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/qcScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Other=null;
-
-	/**
-	 * @return Returns the other.
-	 */
-	public String getOther(){
-		try{
-			if (_Other==null){
-				_Other=getStringProperty("other");
-				return _Other;
-			}else {
-				return _Other;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for other.
-	 * @param v Value to Set.
-	 */
-	public void setOther(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/other",v);
-		_Other=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherqcscandata> getAllXnatOtherqcscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatOtherqcscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherqcscandata> getXnatOtherqcscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatOtherqcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatOtherqcscandata> getXnatOtherqcscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatOtherqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatOtherqcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatOtherqcscandata getXnatOtherqcscandatasByXnatQcscandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:otherQcScanData/xnat_qcscandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatOtherqcscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //qcScanData
-	        XnatQcscandata childQcscandata = (XnatQcscandata)this.getQcscandata();
-	            if (childQcscandata!=null){
-	              for(ResourceFile rf: ((XnatQcscandata)childQcscandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("qcScanData[" + ((XnatQcscandata)childQcscandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("qcScanData/" + ((XnatQcscandata)childQcscandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetassessordata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetassessordata.java
deleted file mode 100644
index 550eecd2..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetassessordata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPetassessordata extends XnatImageassessordata implements org.nrg.xdat.model.XnatPetassessordataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPetassessordata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:petAssessorData";
-
-	public AutoXnatPetassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPetassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPetassessordata(UserI user)
-	 **/
-	public AutoXnatPetassessordata(){}
-
-	public AutoXnatPetassessordata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:petAssessorData";
-	}
-	 private org.nrg.xdat.om.XnatImageassessordata _Imageassessordata =null;
-
-	/**
-	 * imageAssessorData
-	 * @return org.nrg.xdat.om.XnatImageassessordata
-	 */
-	public org.nrg.xdat.om.XnatImageassessordata getImageassessordata() {
-		try{
-			if (_Imageassessordata==null){
-				_Imageassessordata=((XnatImageassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageAssessorData")));
-				return _Imageassessordata;
-			}else {
-				return _Imageassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setImageassessordata(ItemI v) throws Exception{
-		_Imageassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageAssessorData
-	 * set org.nrg.xdat.model.XnatImageassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImageassessordataI> void setImageassessordata(A item) throws Exception{
-	setImageassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageAssessorData.
-	 * */
-	public void removeImageassessordata() {
-		_Imageassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetassessordata> getAllXnatPetassessordatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetassessordata> al = new ArrayList<org.nrg.xdat.om.XnatPetassessordata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetassessordata> getXnatPetassessordatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetassessordata> al = new ArrayList<org.nrg.xdat.om.XnatPetassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetassessordata> getXnatPetassessordatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetassessordata> al = new ArrayList<org.nrg.xdat.om.XnatPetassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPetassessordata getXnatPetassessordatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:petAssessorData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPetassessordata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageAssessorData
-	        XnatImageassessordata childImageassessordata = (XnatImageassessordata)this.getImageassessordata();
-	            if (childImageassessordata!=null){
-	              for(ResourceFile rf: ((XnatImageassessordata)childImageassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageAssessorData[" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageAssessorData/" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetmrsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetmrsessiondata.java
deleted file mode 100644
index bd51975b..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetmrsessiondata.java
+++ /dev/null
@@ -1,952 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPetmrsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatPetmrsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPetmrsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:petmrSessionData";
-
-	public AutoXnatPetmrsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPetmrsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPetmrsessiondata(UserI user)
-	 **/
-	public AutoXnatPetmrsessiondata(){}
-
-	public AutoXnatPetmrsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:petmrSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Coil=null;
-
-	/**
-	 * @return Returns the coil.
-	 */
-	public String getCoil(){
-		try{
-			if (_Coil==null){
-				_Coil=getStringProperty("coil");
-				return _Coil;
-			}else {
-				return _Coil;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for coil.
-	 * @param v Value to Set.
-	 */
-	public void setCoil(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/coil",v);
-		_Coil=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Fieldstrength=null;
-
-	/**
-	 * @return Returns the fieldStrength.
-	 */
-	public String getFieldstrength(){
-		try{
-			if (_Fieldstrength==null){
-				_Fieldstrength=getStringProperty("fieldStrength");
-				return _Fieldstrength;
-			}else {
-				return _Fieldstrength;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for fieldStrength.
-	 * @param v Value to Set.
-	 */
-	public void setFieldstrength(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/fieldStrength",v);
-		_Fieldstrength=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Marker=null;
-
-	/**
-	 * @return Returns the marker.
-	 */
-	public String getMarker(){
-		try{
-			if (_Marker==null){
-				_Marker=getStringProperty("marker");
-				return _Marker;
-			}else {
-				return _Marker;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for marker.
-	 * @param v Value to Set.
-	 */
-	public void setMarker(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/marker",v);
-		_Marker=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Stabilization=null;
-
-	/**
-	 * @return Returns the stabilization.
-	 */
-	public String getStabilization(){
-		try{
-			if (_Stabilization==null){
-				_Stabilization=getStringProperty("stabilization");
-				return _Stabilization;
-			}else {
-				return _Stabilization;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stabilization.
-	 * @param v Value to Set.
-	 */
-	public void setStabilization(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stabilization",v);
-		_Stabilization=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Studytype=null;
-
-	/**
-	 * @return Returns the studyType.
-	 */
-	public String getStudytype(){
-		try{
-			if (_Studytype==null){
-				_Studytype=getStringProperty("studyType");
-				return _Studytype;
-			}else {
-				return _Studytype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for studyType.
-	 * @param v Value to Set.
-	 */
-	public void setStudytype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/studyType",v);
-		_Studytype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Patientid=null;
-
-	/**
-	 * @return Returns the patientID.
-	 */
-	public String getPatientid(){
-		try{
-			if (_Patientid==null){
-				_Patientid=getStringProperty("patientID");
-				return _Patientid;
-			}else {
-				return _Patientid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for patientID.
-	 * @param v Value to Set.
-	 */
-	public void setPatientid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/patientID",v);
-		_Patientid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Patientname=null;
-
-	/**
-	 * @return Returns the patientName.
-	 */
-	public String getPatientname(){
-		try{
-			if (_Patientname==null){
-				_Patientname=getStringProperty("patientName");
-				return _Patientname;
-			}else {
-				return _Patientname;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for patientName.
-	 * @param v Value to Set.
-	 */
-	public void setPatientname(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/patientName",v);
-		_Patientname=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_dose_units=null;
-
-	/**
-	 * @return Returns the tracer/dose/units.
-	 */
-	public String getTracer_dose_units(){
-		try{
-			if (_Tracer_dose_units==null){
-				_Tracer_dose_units=getStringProperty("tracer/dose/units");
-				return _Tracer_dose_units;
-			}else {
-				return _Tracer_dose_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/dose/units.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_dose_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/dose/units",v);
-		_Tracer_dose_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_dose=null;
-
-	/**
-	 * @return Returns the tracer/dose.
-	 */
-	public Double getTracer_dose() {
-		try{
-			if (_Tracer_dose==null){
-				_Tracer_dose=getDoubleProperty("tracer/dose");
-				return _Tracer_dose;
-			}else {
-				return _Tracer_dose;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/dose.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_dose(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/dose",v);
-		_Tracer_dose=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_specificactivity=null;
-
-	/**
-	 * @return Returns the tracer/specificActivity.
-	 */
-	public Double getTracer_specificactivity() {
-		try{
-			if (_Tracer_specificactivity==null){
-				_Tracer_specificactivity=getDoubleProperty("tracer/specificActivity");
-				return _Tracer_specificactivity;
-			}else {
-				return _Tracer_specificactivity;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/specificActivity.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_specificactivity(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/specificActivity",v);
-		_Tracer_specificactivity=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_totalmass_units=null;
-
-	/**
-	 * @return Returns the tracer/totalMass/units.
-	 */
-	public String getTracer_totalmass_units(){
-		try{
-			if (_Tracer_totalmass_units==null){
-				_Tracer_totalmass_units=getStringProperty("tracer/totalMass/units");
-				return _Tracer_totalmass_units;
-			}else {
-				return _Tracer_totalmass_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/totalMass/units.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_totalmass_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/totalMass/units",v);
-		_Tracer_totalmass_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_totalmass=null;
-
-	/**
-	 * @return Returns the tracer/totalMass.
-	 */
-	public Double getTracer_totalmass() {
-		try{
-			if (_Tracer_totalmass==null){
-				_Tracer_totalmass=getDoubleProperty("tracer/totalMass");
-				return _Tracer_totalmass;
-			}else {
-				return _Tracer_totalmass;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/totalMass.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_totalmass(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/totalMass",v);
-		_Tracer_totalmass=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_intermediate_units=null;
-
-	/**
-	 * @return Returns the tracer/intermediate/units.
-	 */
-	public String getTracer_intermediate_units(){
-		try{
-			if (_Tracer_intermediate_units==null){
-				_Tracer_intermediate_units=getStringProperty("tracer/intermediate/units");
-				return _Tracer_intermediate_units;
-			}else {
-				return _Tracer_intermediate_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/intermediate/units.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_intermediate_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/intermediate/units",v);
-		_Tracer_intermediate_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_intermediate=null;
-
-	/**
-	 * @return Returns the tracer/intermediate.
-	 */
-	public Double getTracer_intermediate() {
-		try{
-			if (_Tracer_intermediate==null){
-				_Tracer_intermediate=getDoubleProperty("tracer/intermediate");
-				return _Tracer_intermediate;
-			}else {
-				return _Tracer_intermediate;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/intermediate.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_intermediate(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/intermediate",v);
-		_Tracer_intermediate=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_isotope_halfLife=null;
-
-	/**
-	 * @return Returns the tracer/isotope/half-life.
-	 */
-	public Double getTracer_isotope_halfLife() {
-		try{
-			if (_Tracer_isotope_halfLife==null){
-				_Tracer_isotope_halfLife=getDoubleProperty("tracer/isotope/half-life");
-				return _Tracer_isotope_halfLife;
-			}else {
-				return _Tracer_isotope_halfLife;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/isotope/half-life.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_isotope_halfLife(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/isotope/half-life",v);
-		_Tracer_isotope_halfLife=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_isotope=null;
-
-	/**
-	 * @return Returns the tracer/isotope.
-	 */
-	public String getTracer_isotope(){
-		try{
-			if (_Tracer_isotope==null){
-				_Tracer_isotope=getStringProperty("tracer/isotope");
-				return _Tracer_isotope;
-			}else {
-				return _Tracer_isotope;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/isotope.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_isotope(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/isotope",v);
-		_Tracer_isotope=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Tracer_transmissions=null;
-
-	/**
-	 * @return Returns the tracer/transmissions.
-	 */
-	public Integer getTracer_transmissions() {
-		try{
-			if (_Tracer_transmissions==null){
-				_Tracer_transmissions=getIntegerProperty("tracer/transmissions");
-				return _Tracer_transmissions;
-			}else {
-				return _Tracer_transmissions;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/transmissions.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_transmissions(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/transmissions",v);
-		_Tracer_transmissions=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Tracer_transmissionsStarttime=null;
-
-	/**
-	 * @return Returns the tracer/transmissions_starttime.
-	 */
-	public Object getTracer_transmissionsStarttime(){
-		try{
-			if (_Tracer_transmissionsStarttime==null){
-				_Tracer_transmissionsStarttime=getProperty("tracer/transmissions_starttime");
-				return _Tracer_transmissionsStarttime;
-			}else {
-				return _Tracer_transmissionsStarttime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/transmissions_starttime.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_transmissionsStarttime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/transmissions_starttime",v);
-		_Tracer_transmissionsStarttime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_name=null;
-
-	/**
-	 * @return Returns the tracer/name.
-	 */
-	public String getTracer_name(){
-		try{
-			if (_Tracer_name==null){
-				_Tracer_name=getStringProperty("tracer/name");
-				return _Tracer_name;
-			}else {
-				return _Tracer_name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/name.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_name(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/name",v);
-		_Tracer_name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Tracer_starttime=null;
-
-	/**
-	 * @return Returns the tracer/startTime.
-	 */
-	public Object getTracer_starttime(){
-		try{
-			if (_Tracer_starttime==null){
-				_Tracer_starttime=getProperty("tracer/startTime");
-				return _Tracer_starttime;
-			}else {
-				return _Tracer_starttime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/startTime.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_starttime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/startTime",v);
-		_Tracer_starttime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _StartTime=null;
-
-	/**
-	 * @return Returns the start_time.
-	 */
-	public Object getStartTime(){
-		try{
-			if (_StartTime==null){
-				_StartTime=getProperty("start_time");
-				return _StartTime;
-			}else {
-				return _StartTime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for start_time.
-	 * @param v Value to Set.
-	 */
-	public void setStartTime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/start_time",v);
-		_StartTime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _StartTimeScan=null;
-
-	/**
-	 * @return Returns the start_time_scan.
-	 */
-	public Object getStartTimeScan(){
-		try{
-			if (_StartTimeScan==null){
-				_StartTimeScan=getProperty("start_time_scan");
-				return _StartTimeScan;
-			}else {
-				return _StartTimeScan;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for start_time_scan.
-	 * @param v Value to Set.
-	 */
-	public void setStartTimeScan(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/start_time_scan",v);
-		_StartTimeScan=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _StartTimeInjection=null;
-
-	/**
-	 * @return Returns the start_time_injection.
-	 */
-	public Object getStartTimeInjection(){
-		try{
-			if (_StartTimeInjection==null){
-				_StartTimeInjection=getProperty("start_time_injection");
-				return _StartTimeInjection;
-			}else {
-				return _StartTimeInjection;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for start_time_injection.
-	 * @param v Value to Set.
-	 */
-	public void setStartTimeInjection(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/start_time_injection",v);
-		_StartTimeInjection=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _BloodGlucose=null;
-
-	/**
-	 * @return Returns the blood_glucose.
-	 */
-	public Double getBloodGlucose() {
-		try{
-			if (_BloodGlucose==null){
-				_BloodGlucose=getDoubleProperty("blood_glucose");
-				return _BloodGlucose;
-			}else {
-				return _BloodGlucose;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for blood_glucose.
-	 * @param v Value to Set.
-	 */
-	public void setBloodGlucose(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/blood_glucose",v);
-		_BloodGlucose=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _BloodGlucoseUnits=null;
-
-	/**
-	 * @return Returns the blood_glucose_units.
-	 */
-	public String getBloodGlucoseUnits(){
-		try{
-			if (_BloodGlucoseUnits==null){
-				_BloodGlucoseUnits=getStringProperty("blood_glucose_units");
-				return _BloodGlucoseUnits;
-			}else {
-				return _BloodGlucoseUnits;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for blood_glucose_units.
-	 * @param v Value to Set.
-	 */
-	public void setBloodGlucoseUnits(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/blood_glucose_units",v);
-		_BloodGlucoseUnits=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _BloodGlucoseTime=null;
-
-	/**
-	 * @return Returns the blood_glucose_time.
-	 */
-	public Object getBloodGlucoseTime(){
-		try{
-			if (_BloodGlucoseTime==null){
-				_BloodGlucoseTime=getProperty("blood_glucose_time");
-				return _BloodGlucoseTime;
-			}else {
-				return _BloodGlucoseTime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for blood_glucose_time.
-	 * @param v Value to Set.
-	 */
-	public void setBloodGlucoseTime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/blood_glucose_time",v);
-		_BloodGlucoseTime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata> getAllXnatPetmrsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata> getXnatPetmrsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata> getXnatPetmrsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatPetmrsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPetmrsessiondata getXnatPetmrsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:petmrSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPetmrsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetqcscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetqcscandata.java
deleted file mode 100644
index fa985f6b..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetqcscandata.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPetqcscandata extends XnatQcscandata implements org.nrg.xdat.model.XnatPetqcscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPetqcscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:petQcScanData";
-
-	public AutoXnatPetqcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPetqcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPetqcscandata(UserI user)
-	 **/
-	public AutoXnatPetqcscandata(){}
-
-	public AutoXnatPetqcscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:petQcScanData";
-	}
-	 private org.nrg.xdat.om.XnatQcscandata _Qcscandata =null;
-
-	/**
-	 * qcScanData
-	 * @return org.nrg.xdat.om.XnatQcscandata
-	 */
-	public org.nrg.xdat.om.XnatQcscandata getQcscandata() {
-		try{
-			if (_Qcscandata==null){
-				_Qcscandata=((XnatQcscandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("qcScanData")));
-				return _Qcscandata;
-			}else {
-				return _Qcscandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for qcScanData.
-	 * @param v Value to Set.
-	 */
-	public void setQcscandata(ItemI v) throws Exception{
-		_Qcscandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/qcScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/qcScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * qcScanData
-	 * set org.nrg.xdat.model.XnatQcscandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcscandataI> void setQcscandata(A item) throws Exception{
-	setQcscandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the qcScanData.
-	 * */
-	public void removeQcscandata() {
-		_Qcscandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/qcScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Acquisition=null;
-
-	/**
-	 * @return Returns the acquisition.
-	 */
-	public String getAcquisition(){
-		try{
-			if (_Acquisition==null){
-				_Acquisition=getStringProperty("acquisition");
-				return _Acquisition;
-			}else {
-				return _Acquisition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for acquisition.
-	 * @param v Value to Set.
-	 */
-	public void setAcquisition(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/acquisition",v);
-		_Acquisition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Correctreconstructionalgorithm=null;
-
-	/**
-	 * @return Returns the correctReconstructionAlgorithm.
-	 */
-	public String getCorrectreconstructionalgorithm(){
-		try{
-			if (_Correctreconstructionalgorithm==null){
-				_Correctreconstructionalgorithm=getStringProperty("correctReconstructionAlgorithm");
-				return _Correctreconstructionalgorithm;
-			}else {
-				return _Correctreconstructionalgorithm;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for correctReconstructionAlgorithm.
-	 * @param v Value to Set.
-	 */
-	public void setCorrectreconstructionalgorithm(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/correctReconstructionAlgorithm",v);
-		_Correctreconstructionalgorithm=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Reconstructionalgorithmused=null;
-
-	/**
-	 * @return Returns the reconstructionAlgorithmUsed.
-	 */
-	public String getReconstructionalgorithmused(){
-		try{
-			if (_Reconstructionalgorithmused==null){
-				_Reconstructionalgorithmused=getStringProperty("reconstructionAlgorithmUsed");
-				return _Reconstructionalgorithmused;
-			}else {
-				return _Reconstructionalgorithmused;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for reconstructionAlgorithmUsed.
-	 * @param v Value to Set.
-	 */
-	public void setReconstructionalgorithmused(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/reconstructionAlgorithmUsed",v);
-		_Reconstructionalgorithmused=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Correctiterationsandsubsets=null;
-
-	/**
-	 * @return Returns the correctIterationsAndSubsets.
-	 */
-	public String getCorrectiterationsandsubsets(){
-		try{
-			if (_Correctiterationsandsubsets==null){
-				_Correctiterationsandsubsets=getStringProperty("correctIterationsAndSubsets");
-				return _Correctiterationsandsubsets;
-			}else {
-				return _Correctiterationsandsubsets;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for correctIterationsAndSubsets.
-	 * @param v Value to Set.
-	 */
-	public void setCorrectiterationsandsubsets(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/correctIterationsAndSubsets",v);
-		_Correctiterationsandsubsets=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Correctfilters=null;
-
-	/**
-	 * @return Returns the correctFilters.
-	 */
-	public String getCorrectfilters(){
-		try{
-			if (_Correctfilters==null){
-				_Correctfilters=getStringProperty("correctFilters");
-				return _Correctfilters;
-			}else {
-				return _Correctfilters;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for correctFilters.
-	 * @param v Value to Set.
-	 */
-	public void setCorrectfilters(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/correctFilters",v);
-		_Correctfilters=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Correctslicethickness=null;
-
-	/**
-	 * @return Returns the correctSliceThickness.
-	 */
-	public String getCorrectslicethickness(){
-		try{
-			if (_Correctslicethickness==null){
-				_Correctslicethickness=getStringProperty("correctSliceThickness");
-				return _Correctslicethickness;
-			}else {
-				return _Correctslicethickness;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for correctSliceThickness.
-	 * @param v Value to Set.
-	 */
-	public void setCorrectslicethickness(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/correctSliceThickness",v);
-		_Correctslicethickness=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Acceptablevoxelsize=null;
-
-	/**
-	 * @return Returns the acceptableVoxelSize.
-	 */
-	public String getAcceptablevoxelsize(){
-		try{
-			if (_Acceptablevoxelsize==null){
-				_Acceptablevoxelsize=getStringProperty("acceptableVoxelSize");
-				return _Acceptablevoxelsize;
-			}else {
-				return _Acceptablevoxelsize;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for acceptableVoxelSize.
-	 * @param v Value to Set.
-	 */
-	public void setAcceptablevoxelsize(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/acceptableVoxelSize",v);
-		_Acceptablevoxelsize=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Unacceptableframes=null;
-
-	/**
-	 * @return Returns the unacceptableFrames.
-	 */
-	public String getUnacceptableframes(){
-		try{
-			if (_Unacceptableframes==null){
-				_Unacceptableframes=getStringProperty("unacceptableFrames");
-				return _Unacceptableframes;
-			}else {
-				return _Unacceptableframes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for unacceptableFrames.
-	 * @param v Value to Set.
-	 */
-	public void setUnacceptableframes(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/unacceptableFrames",v);
-		_Unacceptableframes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Reasonframesunacceptable=null;
-
-	/**
-	 * @return Returns the reasonFramesUnacceptable.
-	 */
-	public String getReasonframesunacceptable(){
-		try{
-			if (_Reasonframesunacceptable==null){
-				_Reasonframesunacceptable=getStringProperty("reasonFramesUnacceptable");
-				return _Reasonframesunacceptable;
-			}else {
-				return _Reasonframesunacceptable;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for reasonFramesUnacceptable.
-	 * @param v Value to Set.
-	 */
-	public void setReasonframesunacceptable(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/reasonFramesUnacceptable",v);
-		_Reasonframesunacceptable=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror> _Processingerrors_processingerror =null;
-
-	/**
-	 * processingErrors/processingError
-	 * @return Returns an List of org.nrg.xdat.om.XnatPetqcscandataProcessingerror
-	 */
-	public <A extends org.nrg.xdat.model.XnatPetqcscandataProcessingerrorI> List<A> getProcessingerrors_processingerror() {
-		try{
-			if (_Processingerrors_processingerror==null){
-				_Processingerrors_processingerror=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("processingErrors/processingError"));
-			}
-			return (List<A>) _Processingerrors_processingerror;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror>();}
-	}
-
-	/**
-	 * Sets the value for processingErrors/processingError.
-	 * @param v Value to Set.
-	 */
-	public void setProcessingerrors_processingerror(ItemI v) throws Exception{
-		_Processingerrors_processingerror =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/processingErrors/processingError",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/processingErrors/processingError",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * processingErrors/processingError
-	 * Adds org.nrg.xdat.model.XnatPetqcscandataProcessingerrorI
-	 */
-	public <A extends org.nrg.xdat.model.XnatPetqcscandataProcessingerrorI> void addProcessingerrors_processingerror(A item) throws Exception{
-	setProcessingerrors_processingerror((ItemI)item);
-	}
-
-	/**
-	 * Removes the processingErrors/processingError of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeProcessingerrors_processingerror(int index) throws java.lang.IndexOutOfBoundsException {
-		_Processingerrors_processingerror =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/processingErrors/processingError",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Qcoutcome=null;
-
-	/**
-	 * @return Returns the qcOutcome.
-	 */
-	public String getQcoutcome(){
-		try{
-			if (_Qcoutcome==null){
-				_Qcoutcome=getStringProperty("qcOutcome");
-				return _Qcoutcome;
-			}else {
-				return _Qcoutcome;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for qcOutcome.
-	 * @param v Value to Set.
-	 */
-	public void setQcoutcome(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/qcOutcome",v);
-		_Qcoutcome=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Qcoutcomereason=null;
-
-	/**
-	 * @return Returns the qcOutcomeReason.
-	 */
-	public String getQcoutcomereason(){
-		try{
-			if (_Qcoutcomereason==null){
-				_Qcoutcomereason=getStringProperty("qcOutcomeReason");
-				return _Qcoutcomereason;
-			}else {
-				return _Qcoutcomereason;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for qcOutcomeReason.
-	 * @param v Value to Set.
-	 */
-	public void setQcoutcomereason(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/qcOutcomeReason",v);
-		_Qcoutcomereason=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Topcutoff=null;
-
-	/**
-	 * @return Returns the topCutoff.
-	 */
-	public String getTopcutoff(){
-		try{
-			if (_Topcutoff==null){
-				_Topcutoff=getStringProperty("topCutoff");
-				return _Topcutoff;
-			}else {
-				return _Topcutoff;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for topCutoff.
-	 * @param v Value to Set.
-	 */
-	public void setTopcutoff(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/topCutoff",v);
-		_Topcutoff=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Bottomcutoff=null;
-
-	/**
-	 * @return Returns the bottomCutoff.
-	 */
-	public String getBottomcutoff(){
-		try{
-			if (_Bottomcutoff==null){
-				_Bottomcutoff=getStringProperty("bottomCutoff");
-				return _Bottomcutoff;
-			}else {
-				return _Bottomcutoff;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for bottomCutoff.
-	 * @param v Value to Set.
-	 */
-	public void setBottomcutoff(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/bottomCutoff",v);
-		_Bottomcutoff=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetqcscandata> getAllXnatPetqcscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatPetqcscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetqcscandata> getXnatPetqcscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatPetqcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetqcscandata> getXnatPetqcscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetqcscandata> al = new ArrayList<org.nrg.xdat.om.XnatPetqcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPetqcscandata getXnatPetqcscandatasByXnatQcscandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:petQcScanData/xnat_qcscandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPetqcscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //qcScanData
-	        XnatQcscandata childQcscandata = (XnatQcscandata)this.getQcscandata();
-	            if (childQcscandata!=null){
-	              for(ResourceFile rf: ((XnatQcscandata)childQcscandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("qcScanData[" + ((XnatQcscandata)childQcscandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("qcScanData/" + ((XnatQcscandata)childQcscandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //processingErrors/processingError
-	        for(org.nrg.xdat.model.XnatPetqcscandataProcessingerrorI childProcessingerrors_processingerror : this.getProcessingerrors_processingerror()){
-	            if (childProcessingerrors_processingerror!=null){
-	              for(ResourceFile rf: ((XnatPetqcscandataProcessingerror)childProcessingerrors_processingerror).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("processingErrors/processingError[" + ((XnatPetqcscandataProcessingerror)childProcessingerrors_processingerror).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("processingErrors/processingError/" + ((XnatPetqcscandataProcessingerror)childProcessingerrors_processingerror).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetqcscandataProcessingerror.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetqcscandataProcessingerror.java
deleted file mode 100644
index 7b66cd06..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetqcscandataProcessingerror.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPetqcscandataProcessingerror extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatPetqcscandataProcessingerrorI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPetqcscandataProcessingerror.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:petQcScanData_processingError";
-
-	public AutoXnatPetqcscandataProcessingerror(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPetqcscandataProcessingerror(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPetqcscandataProcessingerror(UserI user)
-	 **/
-	public AutoXnatPetqcscandataProcessingerror(){}
-
-	public AutoXnatPetqcscandataProcessingerror(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:petQcScanData_processingError";
-	}
-
-	//FIELD
-
-	private String _Processingerror=null;
-
-	/**
-	 * @return Returns the processingError.
-	 */
-	public String getProcessingerror(){
-		try{
-			if (_Processingerror==null){
-				_Processingerror=getStringProperty("processingError");
-				return _Processingerror;
-			}else {
-				return _Processingerror;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for processingError.
-	 * @param v Value to Set.
-	 */
-	public void setProcessingerror(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/processingError",v);
-		_Processingerror=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatPetqcscandataProcessingerrorId=null;
-
-	/**
-	 * @return Returns the xnat_petQcScanData_processingError_id.
-	 */
-	public Integer getXnatPetqcscandataProcessingerrorId() {
-		try{
-			if (_XnatPetqcscandataProcessingerrorId==null){
-				_XnatPetqcscandataProcessingerrorId=getIntegerProperty("xnat_petQcScanData_processingError_id");
-				return _XnatPetqcscandataProcessingerrorId;
-			}else {
-				return _XnatPetqcscandataProcessingerrorId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_petQcScanData_processingError_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatPetqcscandataProcessingerrorId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_petQcScanData_processingError_id",v);
-		_XnatPetqcscandataProcessingerrorId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror> getAllXnatPetqcscandataProcessingerrors(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror> al = new ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror> getXnatPetqcscandataProcessingerrorsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror> al = new ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror> getXnatPetqcscandataProcessingerrorsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror> al = new ArrayList<org.nrg.xdat.om.XnatPetqcscandataProcessingerror>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPetqcscandataProcessingerror getXnatPetqcscandataProcessingerrorsByXnatPetqcscandataProcessingerrorId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:petQcScanData_processingError/xnat_petQcScanData_processingError_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPetqcscandataProcessingerror) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetscandata.java
deleted file mode 100644
index 8af288d8..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetscandata.java
+++ /dev/null
@@ -1,2169 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPetscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatPetscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPetscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:petScanData";
-
-	public AutoXnatPetscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPetscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPetscandata(UserI user)
-	 **/
-	public AutoXnatPetscandata(){}
-
-	public AutoXnatPetscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:petScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_orientation=null;
-
-	/**
-	 * @return Returns the parameters/orientation.
-	 */
-	public Integer getParameters_orientation() {
-		try{
-			if (_Parameters_orientation==null){
-				_Parameters_orientation=getIntegerProperty("parameters/orientation");
-				return _Parameters_orientation;
-			}else {
-				return _Parameters_orientation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/orientation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_orientation(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/orientation",v);
-		_Parameters_orientation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAddfield> _Parameters_addparam =null;
-
-	/**
-	 * parameters/addParam
-	 * @return Returns an List of org.nrg.xdat.om.XnatAddfield
-	 */
-	public <A extends org.nrg.xdat.model.XnatAddfieldI> List<A> getParameters_addparam() {
-		try{
-			if (_Parameters_addparam==null){
-				_Parameters_addparam=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/addParam"));
-			}
-			return (List<A>) _Parameters_addparam;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAddfield>();}
-	}
-
-	/**
-	 * Sets the value for parameters/addParam.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_addparam(ItemI v) throws Exception{
-		_Parameters_addparam =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/addParam
-	 * Adds org.nrg.xdat.model.XnatAddfieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAddfieldI> void addParameters_addparam(A item) throws Exception{
-	setParameters_addparam((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/addParam of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_addparam(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_addparam =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_originalfilename=null;
-
-	/**
-	 * @return Returns the parameters/originalFileName.
-	 */
-	public String getParameters_originalfilename(){
-		try{
-			if (_Parameters_originalfilename==null){
-				_Parameters_originalfilename=getStringProperty("parameters/originalFileName");
-				return _Parameters_originalfilename;
-			}else {
-				return _Parameters_originalfilename;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/originalFileName.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_originalfilename(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/originalFileName",v);
-		_Parameters_originalfilename=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_systemtype=null;
-
-	/**
-	 * @return Returns the parameters/systemType.
-	 */
-	public Integer getParameters_systemtype() {
-		try{
-			if (_Parameters_systemtype==null){
-				_Parameters_systemtype=getIntegerProperty("parameters/systemType");
-				return _Parameters_systemtype;
-			}else {
-				return _Parameters_systemtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/systemType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_systemtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/systemType",v);
-		_Parameters_systemtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_filetype=null;
-
-	/**
-	 * @return Returns the parameters/fileType.
-	 */
-	public Integer getParameters_filetype() {
-		try{
-			if (_Parameters_filetype==null){
-				_Parameters_filetype=getIntegerProperty("parameters/fileType");
-				return _Parameters_filetype;
-			}else {
-				return _Parameters_filetype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fileType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_filetype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fileType",v);
-		_Parameters_filetype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_transaxialfov=null;
-
-	/**
-	 * @return Returns the parameters/transaxialFOV.
-	 */
-	public Double getParameters_transaxialfov() {
-		try{
-			if (_Parameters_transaxialfov==null){
-				_Parameters_transaxialfov=getDoubleProperty("parameters/transaxialFOV");
-				return _Parameters_transaxialfov;
-			}else {
-				return _Parameters_transaxialfov;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/transaxialFOV.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_transaxialfov(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/transaxialFOV",v);
-		_Parameters_transaxialfov=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_acqtype=null;
-
-	/**
-	 * @return Returns the parameters/acqType.
-	 */
-	public Integer getParameters_acqtype() {
-		try{
-			if (_Parameters_acqtype==null){
-				_Parameters_acqtype=getIntegerProperty("parameters/acqType");
-				return _Parameters_acqtype;
-			}else {
-				return _Parameters_acqtype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/acqType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_acqtype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/acqType",v);
-		_Parameters_acqtype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_facility=null;
-
-	/**
-	 * @return Returns the parameters/facility.
-	 */
-	public String getParameters_facility(){
-		try{
-			if (_Parameters_facility==null){
-				_Parameters_facility=getStringProperty("parameters/facility");
-				return _Parameters_facility;
-			}else {
-				return _Parameters_facility;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/facility.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_facility(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/facility",v);
-		_Parameters_facility=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_numplanes=null;
-
-	/**
-	 * @return Returns the parameters/numPlanes.
-	 */
-	public Integer getParameters_numplanes() {
-		try{
-			if (_Parameters_numplanes==null){
-				_Parameters_numplanes=getIntegerProperty("parameters/numPlanes");
-				return _Parameters_numplanes;
-			}else {
-				return _Parameters_numplanes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/numPlanes.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_numplanes(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/numPlanes",v);
-		_Parameters_numplanes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatPetscandataFrame> _Parameters_frames_frame =null;
-
-	/**
-	 * parameters/frames/frame
-	 * @return Returns an List of org.nrg.xdat.om.XnatPetscandataFrame
-	 */
-	public <A extends org.nrg.xdat.model.XnatPetscandataFrameI> List<A> getParameters_frames_frame() {
-		try{
-			if (_Parameters_frames_frame==null){
-				_Parameters_frames_frame=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/frames/frame"));
-			}
-			return (List<A>) _Parameters_frames_frame;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatPetscandataFrame>();}
-	}
-
-	/**
-	 * Sets the value for parameters/frames/frame.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_frames_frame(ItemI v) throws Exception{
-		_Parameters_frames_frame =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/frames/frame",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/frames/frame",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/frames/frame
-	 * Adds org.nrg.xdat.model.XnatPetscandataFrameI
-	 */
-	public <A extends org.nrg.xdat.model.XnatPetscandataFrameI> void addParameters_frames_frame(A item) throws Exception{
-	setParameters_frames_frame((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/frames/frame of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_frames_frame(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_frames_frame =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/frames/frame",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Parameters_frames_numframes=null;
-
-	/**
-	 * @return Returns the parameters/frames/numFrames.
-	 */
-	public Object getParameters_frames_numframes(){
-		try{
-			if (_Parameters_frames_numframes==null){
-				_Parameters_frames_numframes=getProperty("parameters/frames/numFrames");
-				return _Parameters_frames_numframes;
-			}else {
-				return _Parameters_frames_numframes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/frames/numFrames.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_frames_numframes(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/frames/numFrames",v);
-		_Parameters_frames_numframes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_numgates=null;
-
-	/**
-	 * @return Returns the parameters/numGates.
-	 */
-	public Integer getParameters_numgates() {
-		try{
-			if (_Parameters_numgates==null){
-				_Parameters_numgates=getIntegerProperty("parameters/numGates");
-				return _Parameters_numgates;
-			}else {
-				return _Parameters_numgates;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/numGates.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_numgates(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/numGates",v);
-		_Parameters_numgates=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_planeseparation=null;
-
-	/**
-	 * @return Returns the parameters/planeSeparation.
-	 */
-	public Double getParameters_planeseparation() {
-		try{
-			if (_Parameters_planeseparation==null){
-				_Parameters_planeseparation=getDoubleProperty("parameters/planeSeparation");
-				return _Parameters_planeseparation;
-			}else {
-				return _Parameters_planeseparation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/planeSeparation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_planeseparation(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/planeSeparation",v);
-		_Parameters_planeseparation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_binsize=null;
-
-	/**
-	 * @return Returns the parameters/binSize.
-	 */
-	public Double getParameters_binsize() {
-		try{
-			if (_Parameters_binsize==null){
-				_Parameters_binsize=getDoubleProperty("parameters/binSize");
-				return _Parameters_binsize;
-			}else {
-				return _Parameters_binsize;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/binSize.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_binsize(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/binSize",v);
-		_Parameters_binsize=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_datatype=null;
-
-	/**
-	 * @return Returns the parameters/dataType.
-	 */
-	public Integer getParameters_datatype() {
-		try{
-			if (_Parameters_datatype==null){
-				_Parameters_datatype=getIntegerProperty("parameters/dataType");
-				return _Parameters_datatype;
-			}else {
-				return _Parameters_datatype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/dataType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_datatype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/dataType",v);
-		_Parameters_datatype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_dimensions_x=null;
-
-	/**
-	 * @return Returns the parameters/dimensions/x.
-	 */
-	public Integer getParameters_dimensions_x() {
-		try{
-			if (_Parameters_dimensions_x==null){
-				_Parameters_dimensions_x=getIntegerProperty("parameters/dimensions/x");
-				return _Parameters_dimensions_x;
-			}else {
-				return _Parameters_dimensions_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/dimensions/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_dimensions_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/dimensions/x",v);
-		_Parameters_dimensions_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_dimensions_y=null;
-
-	/**
-	 * @return Returns the parameters/dimensions/y.
-	 */
-	public Integer getParameters_dimensions_y() {
-		try{
-			if (_Parameters_dimensions_y==null){
-				_Parameters_dimensions_y=getIntegerProperty("parameters/dimensions/y");
-				return _Parameters_dimensions_y;
-			}else {
-				return _Parameters_dimensions_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/dimensions/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_dimensions_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/dimensions/y",v);
-		_Parameters_dimensions_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_dimensions_z=null;
-
-	/**
-	 * @return Returns the parameters/dimensions/z.
-	 */
-	public Integer getParameters_dimensions_z() {
-		try{
-			if (_Parameters_dimensions_z==null){
-				_Parameters_dimensions_z=getIntegerProperty("parameters/dimensions/z");
-				return _Parameters_dimensions_z;
-			}else {
-				return _Parameters_dimensions_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/dimensions/z.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_dimensions_z(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/dimensions/z",v);
-		_Parameters_dimensions_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_dimensions_num=null;
-
-	/**
-	 * @return Returns the parameters/dimensions/num.
-	 */
-	public Integer getParameters_dimensions_num() {
-		try{
-			if (_Parameters_dimensions_num==null){
-				_Parameters_dimensions_num=getIntegerProperty("parameters/dimensions/num");
-				return _Parameters_dimensions_num;
-			}else {
-				return _Parameters_dimensions_num;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/dimensions/num.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_dimensions_num(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/dimensions/num",v);
-		_Parameters_dimensions_num=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_offset_x=null;
-
-	/**
-	 * @return Returns the parameters/offset/x.
-	 */
-	public Double getParameters_offset_x() {
-		try{
-			if (_Parameters_offset_x==null){
-				_Parameters_offset_x=getDoubleProperty("parameters/offset/x");
-				return _Parameters_offset_x;
-			}else {
-				return _Parameters_offset_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/offset/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_offset_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/offset/x",v);
-		_Parameters_offset_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_offset_y=null;
-
-	/**
-	 * @return Returns the parameters/offset/y.
-	 */
-	public Double getParameters_offset_y() {
-		try{
-			if (_Parameters_offset_y==null){
-				_Parameters_offset_y=getDoubleProperty("parameters/offset/y");
-				return _Parameters_offset_y;
-			}else {
-				return _Parameters_offset_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/offset/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_offset_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/offset/y",v);
-		_Parameters_offset_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_offset_z=null;
-
-	/**
-	 * @return Returns the parameters/offset/z.
-	 */
-	public Double getParameters_offset_z() {
-		try{
-			if (_Parameters_offset_z==null){
-				_Parameters_offset_z=getDoubleProperty("parameters/offset/z");
-				return _Parameters_offset_z;
-			}else {
-				return _Parameters_offset_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/offset/z.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_offset_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/offset/z",v);
-		_Parameters_offset_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_reconzoom=null;
-
-	/**
-	 * @return Returns the parameters/reconZoom.
-	 */
-	public Double getParameters_reconzoom() {
-		try{
-			if (_Parameters_reconzoom==null){
-				_Parameters_reconzoom=getDoubleProperty("parameters/reconZoom");
-				return _Parameters_reconzoom;
-			}else {
-				return _Parameters_reconzoom;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/reconZoom.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_reconzoom(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/reconZoom",v);
-		_Parameters_reconzoom=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_pixelsize_x=null;
-
-	/**
-	 * @return Returns the parameters/pixelSize/x.
-	 */
-	public Double getParameters_pixelsize_x() {
-		try{
-			if (_Parameters_pixelsize_x==null){
-				_Parameters_pixelsize_x=getDoubleProperty("parameters/pixelSize/x");
-				return _Parameters_pixelsize_x;
-			}else {
-				return _Parameters_pixelsize_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/pixelSize/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_pixelsize_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/pixelSize/x",v);
-		_Parameters_pixelsize_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_pixelsize_y=null;
-
-	/**
-	 * @return Returns the parameters/pixelSize/y.
-	 */
-	public Double getParameters_pixelsize_y() {
-		try{
-			if (_Parameters_pixelsize_y==null){
-				_Parameters_pixelsize_y=getDoubleProperty("parameters/pixelSize/y");
-				return _Parameters_pixelsize_y;
-			}else {
-				return _Parameters_pixelsize_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/pixelSize/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_pixelsize_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/pixelSize/y",v);
-		_Parameters_pixelsize_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_pixelsize_z=null;
-
-	/**
-	 * @return Returns the parameters/pixelSize/z.
-	 */
-	public Double getParameters_pixelsize_z() {
-		try{
-			if (_Parameters_pixelsize_z==null){
-				_Parameters_pixelsize_z=getDoubleProperty("parameters/pixelSize/z");
-				return _Parameters_pixelsize_z;
-			}else {
-				return _Parameters_pixelsize_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/pixelSize/z.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_pixelsize_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/pixelSize/z",v);
-		_Parameters_pixelsize_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_filtercode=null;
-
-	/**
-	 * @return Returns the parameters/filterCode.
-	 */
-	public Integer getParameters_filtercode() {
-		try{
-			if (_Parameters_filtercode==null){
-				_Parameters_filtercode=getIntegerProperty("parameters/filterCode");
-				return _Parameters_filtercode;
-			}else {
-				return _Parameters_filtercode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/filterCode.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_filtercode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/filterCode",v);
-		_Parameters_filtercode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_resolution_x=null;
-
-	/**
-	 * @return Returns the parameters/resolution/x.
-	 */
-	public Double getParameters_resolution_x() {
-		try{
-			if (_Parameters_resolution_x==null){
-				_Parameters_resolution_x=getDoubleProperty("parameters/resolution/x");
-				return _Parameters_resolution_x;
-			}else {
-				return _Parameters_resolution_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/resolution/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_resolution_x(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/resolution/x",v);
-		_Parameters_resolution_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_resolution_y=null;
-
-	/**
-	 * @return Returns the parameters/resolution/y.
-	 */
-	public Double getParameters_resolution_y() {
-		try{
-			if (_Parameters_resolution_y==null){
-				_Parameters_resolution_y=getDoubleProperty("parameters/resolution/y");
-				return _Parameters_resolution_y;
-			}else {
-				return _Parameters_resolution_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/resolution/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_resolution_y(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/resolution/y",v);
-		_Parameters_resolution_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_resolution_z=null;
-
-	/**
-	 * @return Returns the parameters/resolution/z.
-	 */
-	public Double getParameters_resolution_z() {
-		try{
-			if (_Parameters_resolution_z==null){
-				_Parameters_resolution_z=getDoubleProperty("parameters/resolution/z");
-				return _Parameters_resolution_z;
-			}else {
-				return _Parameters_resolution_z;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/resolution/z.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_resolution_z(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/resolution/z",v);
-		_Parameters_resolution_z=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_numrelements=null;
-
-	/**
-	 * @return Returns the parameters/numRElements.
-	 */
-	public Double getParameters_numrelements() {
-		try{
-			if (_Parameters_numrelements==null){
-				_Parameters_numrelements=getDoubleProperty("parameters/numRElements");
-				return _Parameters_numrelements;
-			}else {
-				return _Parameters_numrelements;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/numRElements.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_numrelements(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/numRElements",v);
-		_Parameters_numrelements=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_numangles=null;
-
-	/**
-	 * @return Returns the parameters/numAngles.
-	 */
-	public Double getParameters_numangles() {
-		try{
-			if (_Parameters_numangles==null){
-				_Parameters_numangles=getDoubleProperty("parameters/numAngles");
-				return _Parameters_numangles;
-			}else {
-				return _Parameters_numangles;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/numAngles.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_numangles(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/numAngles",v);
-		_Parameters_numangles=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_zrotationangle=null;
-
-	/**
-	 * @return Returns the parameters/ZRotationAngle.
-	 */
-	public Double getParameters_zrotationangle() {
-		try{
-			if (_Parameters_zrotationangle==null){
-				_Parameters_zrotationangle=getDoubleProperty("parameters/ZRotationAngle");
-				return _Parameters_zrotationangle;
-			}else {
-				return _Parameters_zrotationangle;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/ZRotationAngle.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_zrotationangle(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/ZRotationAngle",v);
-		_Parameters_zrotationangle=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_processingcode=null;
-
-	/**
-	 * @return Returns the parameters/processingCode.
-	 */
-	public Integer getParameters_processingcode() {
-		try{
-			if (_Parameters_processingcode==null){
-				_Parameters_processingcode=getIntegerProperty("parameters/processingCode");
-				return _Parameters_processingcode;
-			}else {
-				return _Parameters_processingcode;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/processingCode.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_processingcode(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/processingCode",v);
-		_Parameters_processingcode=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_gateduration=null;
-
-	/**
-	 * @return Returns the parameters/gateDuration.
-	 */
-	public Integer getParameters_gateduration() {
-		try{
-			if (_Parameters_gateduration==null){
-				_Parameters_gateduration=getIntegerProperty("parameters/gateDuration");
-				return _Parameters_gateduration;
-			}else {
-				return _Parameters_gateduration;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/gateDuration.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_gateduration(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/gateDuration",v);
-		_Parameters_gateduration=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_rwaveoffset=null;
-
-	/**
-	 * @return Returns the parameters/rWaveOffset.
-	 */
-	public Integer getParameters_rwaveoffset() {
-		try{
-			if (_Parameters_rwaveoffset==null){
-				_Parameters_rwaveoffset=getIntegerProperty("parameters/rWaveOffset");
-				return _Parameters_rwaveoffset;
-			}else {
-				return _Parameters_rwaveoffset;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/rWaveOffset.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_rwaveoffset(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/rWaveOffset",v);
-		_Parameters_rwaveoffset=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_numacceptedbeats=null;
-
-	/**
-	 * @return Returns the parameters/numAcceptedBeats.
-	 */
-	public Integer getParameters_numacceptedbeats() {
-		try{
-			if (_Parameters_numacceptedbeats==null){
-				_Parameters_numacceptedbeats=getIntegerProperty("parameters/numAcceptedBeats");
-				return _Parameters_numacceptedbeats;
-			}else {
-				return _Parameters_numacceptedbeats;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/numAcceptedBeats.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_numacceptedbeats(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/numAcceptedBeats",v);
-		_Parameters_numacceptedbeats=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_filter_cutoff=null;
-
-	/**
-	 * @return Returns the parameters/filter/cutoff.
-	 */
-	public Double getParameters_filter_cutoff() {
-		try{
-			if (_Parameters_filter_cutoff==null){
-				_Parameters_filter_cutoff=getDoubleProperty("parameters/filter/cutoff");
-				return _Parameters_filter_cutoff;
-			}else {
-				return _Parameters_filter_cutoff;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/filter/cutoff.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_filter_cutoff(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/filter/cutoff",v);
-		_Parameters_filter_cutoff=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_annotation=null;
-
-	/**
-	 * @return Returns the parameters/annotation.
-	 */
-	public String getParameters_annotation(){
-		try{
-			if (_Parameters_annotation==null){
-				_Parameters_annotation=getStringProperty("parameters/annotation");
-				return _Parameters_annotation;
-			}else {
-				return _Parameters_annotation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/annotation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_annotation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/annotation",v);
-		_Parameters_annotation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt11=null;
-
-	/**
-	 * @return Returns the parameters/MT_1_1.
-	 */
-	public Double getParameters_mt11() {
-		try{
-			if (_Parameters_mt11==null){
-				_Parameters_mt11=getDoubleProperty("parameters/MT_1_1");
-				return _Parameters_mt11;
-			}else {
-				return _Parameters_mt11;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_1_1.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt11(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_1_1",v);
-		_Parameters_mt11=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt12=null;
-
-	/**
-	 * @return Returns the parameters/MT_1_2.
-	 */
-	public Double getParameters_mt12() {
-		try{
-			if (_Parameters_mt12==null){
-				_Parameters_mt12=getDoubleProperty("parameters/MT_1_2");
-				return _Parameters_mt12;
-			}else {
-				return _Parameters_mt12;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_1_2.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt12(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_1_2",v);
-		_Parameters_mt12=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt13=null;
-
-	/**
-	 * @return Returns the parameters/MT_1_3.
-	 */
-	public Double getParameters_mt13() {
-		try{
-			if (_Parameters_mt13==null){
-				_Parameters_mt13=getDoubleProperty("parameters/MT_1_3");
-				return _Parameters_mt13;
-			}else {
-				return _Parameters_mt13;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_1_3.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt13(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_1_3",v);
-		_Parameters_mt13=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt14=null;
-
-	/**
-	 * @return Returns the parameters/MT_1_4.
-	 */
-	public Double getParameters_mt14() {
-		try{
-			if (_Parameters_mt14==null){
-				_Parameters_mt14=getDoubleProperty("parameters/MT_1_4");
-				return _Parameters_mt14;
-			}else {
-				return _Parameters_mt14;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_1_4.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt14(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_1_4",v);
-		_Parameters_mt14=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt21=null;
-
-	/**
-	 * @return Returns the parameters/MT_2_1.
-	 */
-	public Double getParameters_mt21() {
-		try{
-			if (_Parameters_mt21==null){
-				_Parameters_mt21=getDoubleProperty("parameters/MT_2_1");
-				return _Parameters_mt21;
-			}else {
-				return _Parameters_mt21;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_2_1.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt21(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_2_1",v);
-		_Parameters_mt21=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt22=null;
-
-	/**
-	 * @return Returns the parameters/MT_2_2.
-	 */
-	public Double getParameters_mt22() {
-		try{
-			if (_Parameters_mt22==null){
-				_Parameters_mt22=getDoubleProperty("parameters/MT_2_2");
-				return _Parameters_mt22;
-			}else {
-				return _Parameters_mt22;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_2_2.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt22(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_2_2",v);
-		_Parameters_mt22=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt23=null;
-
-	/**
-	 * @return Returns the parameters/MT_2_3.
-	 */
-	public Double getParameters_mt23() {
-		try{
-			if (_Parameters_mt23==null){
-				_Parameters_mt23=getDoubleProperty("parameters/MT_2_3");
-				return _Parameters_mt23;
-			}else {
-				return _Parameters_mt23;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_2_3.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt23(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_2_3",v);
-		_Parameters_mt23=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt24=null;
-
-	/**
-	 * @return Returns the parameters/MT_2_4.
-	 */
-	public Double getParameters_mt24() {
-		try{
-			if (_Parameters_mt24==null){
-				_Parameters_mt24=getDoubleProperty("parameters/MT_2_4");
-				return _Parameters_mt24;
-			}else {
-				return _Parameters_mt24;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_2_4.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt24(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_2_4",v);
-		_Parameters_mt24=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt31=null;
-
-	/**
-	 * @return Returns the parameters/MT_3_1.
-	 */
-	public Double getParameters_mt31() {
-		try{
-			if (_Parameters_mt31==null){
-				_Parameters_mt31=getDoubleProperty("parameters/MT_3_1");
-				return _Parameters_mt31;
-			}else {
-				return _Parameters_mt31;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_3_1.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt31(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_3_1",v);
-		_Parameters_mt31=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt32=null;
-
-	/**
-	 * @return Returns the parameters/MT_3_2.
-	 */
-	public Double getParameters_mt32() {
-		try{
-			if (_Parameters_mt32==null){
-				_Parameters_mt32=getDoubleProperty("parameters/MT_3_2");
-				return _Parameters_mt32;
-			}else {
-				return _Parameters_mt32;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_3_2.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt32(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_3_2",v);
-		_Parameters_mt32=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt33=null;
-
-	/**
-	 * @return Returns the parameters/MT_3_3.
-	 */
-	public Double getParameters_mt33() {
-		try{
-			if (_Parameters_mt33==null){
-				_Parameters_mt33=getDoubleProperty("parameters/MT_3_3");
-				return _Parameters_mt33;
-			}else {
-				return _Parameters_mt33;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_3_3.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt33(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_3_3",v);
-		_Parameters_mt33=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_mt34=null;
-
-	/**
-	 * @return Returns the parameters/MT_3_4.
-	 */
-	public Double getParameters_mt34() {
-		try{
-			if (_Parameters_mt34==null){
-				_Parameters_mt34=getDoubleProperty("parameters/MT_3_4");
-				return _Parameters_mt34;
-			}else {
-				return _Parameters_mt34;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/MT_3_4.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_mt34(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/MT_3_4",v);
-		_Parameters_mt34=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_rfilter_cutoff=null;
-
-	/**
-	 * @return Returns the parameters/RFilter/cutoff.
-	 */
-	public Double getParameters_rfilter_cutoff() {
-		try{
-			if (_Parameters_rfilter_cutoff==null){
-				_Parameters_rfilter_cutoff=getDoubleProperty("parameters/RFilter/cutoff");
-				return _Parameters_rfilter_cutoff;
-			}else {
-				return _Parameters_rfilter_cutoff;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/RFilter/cutoff.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_rfilter_cutoff(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/RFilter/cutoff",v);
-		_Parameters_rfilter_cutoff=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_rfilter_resolution=null;
-
-	/**
-	 * @return Returns the parameters/RFilter/resolution.
-	 */
-	public Double getParameters_rfilter_resolution() {
-		try{
-			if (_Parameters_rfilter_resolution==null){
-				_Parameters_rfilter_resolution=getDoubleProperty("parameters/RFilter/resolution");
-				return _Parameters_rfilter_resolution;
-			}else {
-				return _Parameters_rfilter_resolution;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/RFilter/resolution.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_rfilter_resolution(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/RFilter/resolution",v);
-		_Parameters_rfilter_resolution=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_rfilter_code=null;
-
-	/**
-	 * @return Returns the parameters/RFilter/code.
-	 */
-	public Integer getParameters_rfilter_code() {
-		try{
-			if (_Parameters_rfilter_code==null){
-				_Parameters_rfilter_code=getIntegerProperty("parameters/RFilter/code");
-				return _Parameters_rfilter_code;
-			}else {
-				return _Parameters_rfilter_code;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/RFilter/code.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_rfilter_code(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/RFilter/code",v);
-		_Parameters_rfilter_code=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_rfilter_order=null;
-
-	/**
-	 * @return Returns the parameters/RFilter/order.
-	 */
-	public Integer getParameters_rfilter_order() {
-		try{
-			if (_Parameters_rfilter_order==null){
-				_Parameters_rfilter_order=getIntegerProperty("parameters/RFilter/order");
-				return _Parameters_rfilter_order;
-			}else {
-				return _Parameters_rfilter_order;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/RFilter/order.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_rfilter_order(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/RFilter/order",v);
-		_Parameters_rfilter_order=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_zfilter_cutoff=null;
-
-	/**
-	 * @return Returns the parameters/ZFilter/cutoff.
-	 */
-	public Double getParameters_zfilter_cutoff() {
-		try{
-			if (_Parameters_zfilter_cutoff==null){
-				_Parameters_zfilter_cutoff=getDoubleProperty("parameters/ZFilter/cutoff");
-				return _Parameters_zfilter_cutoff;
-			}else {
-				return _Parameters_zfilter_cutoff;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/ZFilter/cutoff.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_zfilter_cutoff(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/ZFilter/cutoff",v);
-		_Parameters_zfilter_cutoff=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_zfilter_resolution=null;
-
-	/**
-	 * @return Returns the parameters/ZFilter/resolution.
-	 */
-	public Double getParameters_zfilter_resolution() {
-		try{
-			if (_Parameters_zfilter_resolution==null){
-				_Parameters_zfilter_resolution=getDoubleProperty("parameters/ZFilter/resolution");
-				return _Parameters_zfilter_resolution;
-			}else {
-				return _Parameters_zfilter_resolution;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/ZFilter/resolution.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_zfilter_resolution(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/ZFilter/resolution",v);
-		_Parameters_zfilter_resolution=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_zfilter_code=null;
-
-	/**
-	 * @return Returns the parameters/ZFilter/code.
-	 */
-	public Integer getParameters_zfilter_code() {
-		try{
-			if (_Parameters_zfilter_code==null){
-				_Parameters_zfilter_code=getIntegerProperty("parameters/ZFilter/code");
-				return _Parameters_zfilter_code;
-			}else {
-				return _Parameters_zfilter_code;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/ZFilter/code.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_zfilter_code(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/ZFilter/code",v);
-		_Parameters_zfilter_code=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_zfilter_order=null;
-
-	/**
-	 * @return Returns the parameters/ZFilter/order.
-	 */
-	public Integer getParameters_zfilter_order() {
-		try{
-			if (_Parameters_zfilter_order==null){
-				_Parameters_zfilter_order=getIntegerProperty("parameters/ZFilter/order");
-				return _Parameters_zfilter_order;
-			}else {
-				return _Parameters_zfilter_order;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/ZFilter/order.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_zfilter_order(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/ZFilter/order",v);
-		_Parameters_zfilter_order=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_scattertype=null;
-
-	/**
-	 * @return Returns the parameters/scatterType.
-	 */
-	public Integer getParameters_scattertype() {
-		try{
-			if (_Parameters_scattertype==null){
-				_Parameters_scattertype=getIntegerProperty("parameters/scatterType");
-				return _Parameters_scattertype;
-			}else {
-				return _Parameters_scattertype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/scatterType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_scattertype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/scatterType",v);
-		_Parameters_scattertype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_recontype=null;
-
-	/**
-	 * @return Returns the parameters/reconType.
-	 */
-	public Integer getParameters_recontype() {
-		try{
-			if (_Parameters_recontype==null){
-				_Parameters_recontype=getIntegerProperty("parameters/reconType");
-				return _Parameters_recontype;
-			}else {
-				return _Parameters_recontype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/reconType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_recontype(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/reconType",v);
-		_Parameters_recontype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_reconviews=null;
-
-	/**
-	 * @return Returns the parameters/reconViews.
-	 */
-	public Integer getParameters_reconviews() {
-		try{
-			if (_Parameters_reconviews==null){
-				_Parameters_reconviews=getIntegerProperty("parameters/reconViews");
-				return _Parameters_reconviews;
-			}else {
-				return _Parameters_reconviews;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/reconViews.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_reconviews(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/reconViews",v);
-		_Parameters_reconviews=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_bedposition=null;
-
-	/**
-	 * @return Returns the parameters/bedPosition.
-	 */
-	public Double getParameters_bedposition() {
-		try{
-			if (_Parameters_bedposition==null){
-				_Parameters_bedposition=getDoubleProperty("parameters/bedPosition");
-				return _Parameters_bedposition;
-			}else {
-				return _Parameters_bedposition;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/bedPosition.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_bedposition(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/bedPosition",v);
-		_Parameters_bedposition=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Parameters_ecatcalibrationfactor=null;
-
-	/**
-	 * @return Returns the parameters/ecatCalibrationFactor.
-	 */
-	public Double getParameters_ecatcalibrationfactor() {
-		try{
-			if (_Parameters_ecatcalibrationfactor==null){
-				_Parameters_ecatcalibrationfactor=getDoubleProperty("parameters/ecatCalibrationFactor");
-				return _Parameters_ecatcalibrationfactor;
-			}else {
-				return _Parameters_ecatcalibrationfactor;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/ecatCalibrationFactor.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_ecatcalibrationfactor(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/ecatCalibrationFactor",v);
-		_Parameters_ecatcalibrationfactor=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Ecatvalidation=null;
-
-	/**
-	 * @return Returns the ecatValidation.
-	 */
-	public String getEcatvalidation(){
-		try{
-			if (_Ecatvalidation==null){
-				_Ecatvalidation=getStringProperty("ecatValidation");
-				return _Ecatvalidation;
-			}else {
-				return _Ecatvalidation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ecatValidation.
-	 * @param v Value to Set.
-	 */
-	public void setEcatvalidation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ecatValidation",v);
-		_Ecatvalidation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Ecatvalidation_status=null;
-
-	/**
-	 * @return Returns the ecatValidation/status.
-	 */
-	public Boolean getEcatvalidation_status() {
-		try{
-			if (_Ecatvalidation_status==null){
-				_Ecatvalidation_status=getBooleanProperty("ecatValidation/status");
-				return _Ecatvalidation_status;
-			}else {
-				return _Ecatvalidation_status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ecatValidation/status.
-	 * @param v Value to Set.
-	 */
-	public void setEcatvalidation_status(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/ecatValidation/status",v);
-		_Ecatvalidation_status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetscandata> getAllXnatPetscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetscandata> al = new ArrayList<org.nrg.xdat.om.XnatPetscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetscandata> getXnatPetscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetscandata> al = new ArrayList<org.nrg.xdat.om.XnatPetscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetscandata> getXnatPetscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetscandata> al = new ArrayList<org.nrg.xdat.om.XnatPetscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPetscandata getXnatPetscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:petScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPetscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/addParam
-	        for(org.nrg.xdat.model.XnatAddfieldI childParameters_addparam : this.getParameters_addparam()){
-	            if (childParameters_addparam!=null){
-	              for(ResourceFile rf: ((XnatAddfield)childParameters_addparam).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/addParam[" + ((XnatAddfield)childParameters_addparam).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/addParam/" + ((XnatAddfield)childParameters_addparam).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/frames/frame
-	        for(org.nrg.xdat.model.XnatPetscandataFrameI childParameters_frames_frame : this.getParameters_frames_frame()){
-	            if (childParameters_frames_frame!=null){
-	              for(ResourceFile rf: ((XnatPetscandataFrame)childParameters_frames_frame).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/frames/frame[" + ((XnatPetscandataFrame)childParameters_frames_frame).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/frames/frame/" + ((XnatPetscandataFrame)childParameters_frames_frame).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetscandataFrame.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetscandataFrame.java
deleted file mode 100644
index b83f06d7..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetscandataFrame.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPetscandataFrame extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatPetscandataFrameI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPetscandataFrame.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:petScanData_frame";
-
-	public AutoXnatPetscandataFrame(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPetscandataFrame(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPetscandataFrame(UserI user)
-	 **/
-	public AutoXnatPetscandataFrame(){}
-
-	public AutoXnatPetscandataFrame(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:petScanData_frame";
-	}
-
-	//FIELD
-
-	private Object _Number=null;
-
-	/**
-	 * @return Returns the number.
-	 */
-	public Object getNumber(){
-		try{
-			if (_Number==null){
-				_Number=getProperty("number");
-				return _Number;
-			}else {
-				return _Number;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for number.
-	 * @param v Value to Set.
-	 */
-	public void setNumber(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/number",v);
-		_Number=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Starttime=null;
-
-	/**
-	 * @return Returns the starttime.
-	 */
-	public Double getStarttime() {
-		try{
-			if (_Starttime==null){
-				_Starttime=getDoubleProperty("starttime");
-				return _Starttime;
-			}else {
-				return _Starttime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for starttime.
-	 * @param v Value to Set.
-	 */
-	public void setStarttime(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/starttime",v);
-		_Starttime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Length=null;
-
-	/**
-	 * @return Returns the length.
-	 */
-	public Double getLength() {
-		try{
-			if (_Length==null){
-				_Length=getDoubleProperty("length");
-				return _Length;
-			}else {
-				return _Length;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for length.
-	 * @param v Value to Set.
-	 */
-	public void setLength(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/length",v);
-		_Length=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Units=null;
-
-	/**
-	 * @return Returns the units.
-	 */
-	public String getUnits(){
-		try{
-			if (_Units==null){
-				_Units=getStringProperty("units");
-				return _Units;
-			}else {
-				return _Units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for units.
-	 * @param v Value to Set.
-	 */
-	public void setUnits(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/units",v);
-		_Units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatPetscandataFrameId=null;
-
-	/**
-	 * @return Returns the xnat_petScanData_frame_id.
-	 */
-	public Integer getXnatPetscandataFrameId() {
-		try{
-			if (_XnatPetscandataFrameId==null){
-				_XnatPetscandataFrameId=getIntegerProperty("xnat_petScanData_frame_id");
-				return _XnatPetscandataFrameId;
-			}else {
-				return _XnatPetscandataFrameId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_petScanData_frame_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatPetscandataFrameId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_petScanData_frame_id",v);
-		_XnatPetscandataFrameId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetscandataFrame> getAllXnatPetscandataFrames(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetscandataFrame> al = new ArrayList<org.nrg.xdat.om.XnatPetscandataFrame>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetscandataFrame> getXnatPetscandataFramesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetscandataFrame> al = new ArrayList<org.nrg.xdat.om.XnatPetscandataFrame>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetscandataFrame> getXnatPetscandataFramesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetscandataFrame> al = new ArrayList<org.nrg.xdat.om.XnatPetscandataFrame>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPetscandataFrame getXnatPetscandataFramesByXnatPetscandataFrameId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:petScanData_frame/xnat_petScanData_frame_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPetscandataFrame) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetsessiondata.java
deleted file mode 100644
index 63c33b7f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPetsessiondata.java
+++ /dev/null
@@ -1,865 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPetsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatPetsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPetsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:petSessionData";
-
-	public AutoXnatPetsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPetsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPetsessiondata(UserI user)
-	 **/
-	public AutoXnatPetsessiondata(){}
-
-	public AutoXnatPetsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:petSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Stabilization=null;
-
-	/**
-	 * @return Returns the stabilization.
-	 */
-	public String getStabilization(){
-		try{
-			if (_Stabilization==null){
-				_Stabilization=getStringProperty("stabilization");
-				return _Stabilization;
-			}else {
-				return _Stabilization;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stabilization.
-	 * @param v Value to Set.
-	 */
-	public void setStabilization(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stabilization",v);
-		_Stabilization=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Studytype=null;
-
-	/**
-	 * @return Returns the studyType.
-	 */
-	public String getStudytype(){
-		try{
-			if (_Studytype==null){
-				_Studytype=getStringProperty("studyType");
-				return _Studytype;
-			}else {
-				return _Studytype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for studyType.
-	 * @param v Value to Set.
-	 */
-	public void setStudytype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/studyType",v);
-		_Studytype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Patientid=null;
-
-	/**
-	 * @return Returns the patientID.
-	 */
-	public String getPatientid(){
-		try{
-			if (_Patientid==null){
-				_Patientid=getStringProperty("patientID");
-				return _Patientid;
-			}else {
-				return _Patientid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for patientID.
-	 * @param v Value to Set.
-	 */
-	public void setPatientid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/patientID",v);
-		_Patientid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Patientname=null;
-
-	/**
-	 * @return Returns the patientName.
-	 */
-	public String getPatientname(){
-		try{
-			if (_Patientname==null){
-				_Patientname=getStringProperty("patientName");
-				return _Patientname;
-			}else {
-				return _Patientname;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for patientName.
-	 * @param v Value to Set.
-	 */
-	public void setPatientname(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/patientName",v);
-		_Patientname=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_dose_units=null;
-
-	/**
-	 * @return Returns the tracer/dose/units.
-	 */
-	public String getTracer_dose_units(){
-		try{
-			if (_Tracer_dose_units==null){
-				_Tracer_dose_units=getStringProperty("tracer/dose/units");
-				return _Tracer_dose_units;
-			}else {
-				return _Tracer_dose_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/dose/units.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_dose_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/dose/units",v);
-		_Tracer_dose_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_dose=null;
-
-	/**
-	 * @return Returns the tracer/dose.
-	 */
-	public Double getTracer_dose() {
-		try{
-			if (_Tracer_dose==null){
-				_Tracer_dose=getDoubleProperty("tracer/dose");
-				return _Tracer_dose;
-			}else {
-				return _Tracer_dose;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/dose.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_dose(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/dose",v);
-		_Tracer_dose=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_specificactivity=null;
-
-	/**
-	 * @return Returns the tracer/specificActivity.
-	 */
-	public Double getTracer_specificactivity() {
-		try{
-			if (_Tracer_specificactivity==null){
-				_Tracer_specificactivity=getDoubleProperty("tracer/specificActivity");
-				return _Tracer_specificactivity;
-			}else {
-				return _Tracer_specificactivity;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/specificActivity.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_specificactivity(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/specificActivity",v);
-		_Tracer_specificactivity=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_totalmass_units=null;
-
-	/**
-	 * @return Returns the tracer/totalMass/units.
-	 */
-	public String getTracer_totalmass_units(){
-		try{
-			if (_Tracer_totalmass_units==null){
-				_Tracer_totalmass_units=getStringProperty("tracer/totalMass/units");
-				return _Tracer_totalmass_units;
-			}else {
-				return _Tracer_totalmass_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/totalMass/units.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_totalmass_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/totalMass/units",v);
-		_Tracer_totalmass_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_totalmass=null;
-
-	/**
-	 * @return Returns the tracer/totalMass.
-	 */
-	public Double getTracer_totalmass() {
-		try{
-			if (_Tracer_totalmass==null){
-				_Tracer_totalmass=getDoubleProperty("tracer/totalMass");
-				return _Tracer_totalmass;
-			}else {
-				return _Tracer_totalmass;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/totalMass.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_totalmass(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/totalMass",v);
-		_Tracer_totalmass=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_intermediate_units=null;
-
-	/**
-	 * @return Returns the tracer/intermediate/units.
-	 */
-	public String getTracer_intermediate_units(){
-		try{
-			if (_Tracer_intermediate_units==null){
-				_Tracer_intermediate_units=getStringProperty("tracer/intermediate/units");
-				return _Tracer_intermediate_units;
-			}else {
-				return _Tracer_intermediate_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/intermediate/units.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_intermediate_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/intermediate/units",v);
-		_Tracer_intermediate_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_intermediate=null;
-
-	/**
-	 * @return Returns the tracer/intermediate.
-	 */
-	public Double getTracer_intermediate() {
-		try{
-			if (_Tracer_intermediate==null){
-				_Tracer_intermediate=getDoubleProperty("tracer/intermediate");
-				return _Tracer_intermediate;
-			}else {
-				return _Tracer_intermediate;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/intermediate.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_intermediate(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/intermediate",v);
-		_Tracer_intermediate=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Tracer_isotope_halfLife=null;
-
-	/**
-	 * @return Returns the tracer/isotope/half-life.
-	 */
-	public Double getTracer_isotope_halfLife() {
-		try{
-			if (_Tracer_isotope_halfLife==null){
-				_Tracer_isotope_halfLife=getDoubleProperty("tracer/isotope/half-life");
-				return _Tracer_isotope_halfLife;
-			}else {
-				return _Tracer_isotope_halfLife;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/isotope/half-life.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_isotope_halfLife(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/isotope/half-life",v);
-		_Tracer_isotope_halfLife=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_isotope=null;
-
-	/**
-	 * @return Returns the tracer/isotope.
-	 */
-	public String getTracer_isotope(){
-		try{
-			if (_Tracer_isotope==null){
-				_Tracer_isotope=getStringProperty("tracer/isotope");
-				return _Tracer_isotope;
-			}else {
-				return _Tracer_isotope;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/isotope.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_isotope(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/isotope",v);
-		_Tracer_isotope=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Tracer_transmissions=null;
-
-	/**
-	 * @return Returns the tracer/transmissions.
-	 */
-	public Integer getTracer_transmissions() {
-		try{
-			if (_Tracer_transmissions==null){
-				_Tracer_transmissions=getIntegerProperty("tracer/transmissions");
-				return _Tracer_transmissions;
-			}else {
-				return _Tracer_transmissions;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/transmissions.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_transmissions(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/transmissions",v);
-		_Tracer_transmissions=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Tracer_transmissionsStarttime=null;
-
-	/**
-	 * @return Returns the tracer/transmissions_starttime.
-	 */
-	public Object getTracer_transmissionsStarttime(){
-		try{
-			if (_Tracer_transmissionsStarttime==null){
-				_Tracer_transmissionsStarttime=getProperty("tracer/transmissions_starttime");
-				return _Tracer_transmissionsStarttime;
-			}else {
-				return _Tracer_transmissionsStarttime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/transmissions_starttime.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_transmissionsStarttime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/transmissions_starttime",v);
-		_Tracer_transmissionsStarttime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Tracer_name=null;
-
-	/**
-	 * @return Returns the tracer/name.
-	 */
-	public String getTracer_name(){
-		try{
-			if (_Tracer_name==null){
-				_Tracer_name=getStringProperty("tracer/name");
-				return _Tracer_name;
-			}else {
-				return _Tracer_name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/name.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_name(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/name",v);
-		_Tracer_name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Tracer_starttime=null;
-
-	/**
-	 * @return Returns the tracer/startTime.
-	 */
-	public Object getTracer_starttime(){
-		try{
-			if (_Tracer_starttime==null){
-				_Tracer_starttime=getProperty("tracer/startTime");
-				return _Tracer_starttime;
-			}else {
-				return _Tracer_starttime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for tracer/startTime.
-	 * @param v Value to Set.
-	 */
-	public void setTracer_starttime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/tracer/startTime",v);
-		_Tracer_starttime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _StartTime=null;
-
-	/**
-	 * @return Returns the start_time.
-	 */
-	public Object getStartTime(){
-		try{
-			if (_StartTime==null){
-				_StartTime=getProperty("start_time");
-				return _StartTime;
-			}else {
-				return _StartTime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for start_time.
-	 * @param v Value to Set.
-	 */
-	public void setStartTime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/start_time",v);
-		_StartTime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _StartTimeScan=null;
-
-	/**
-	 * @return Returns the start_time_scan.
-	 */
-	public Object getStartTimeScan(){
-		try{
-			if (_StartTimeScan==null){
-				_StartTimeScan=getProperty("start_time_scan");
-				return _StartTimeScan;
-			}else {
-				return _StartTimeScan;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for start_time_scan.
-	 * @param v Value to Set.
-	 */
-	public void setStartTimeScan(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/start_time_scan",v);
-		_StartTimeScan=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _StartTimeInjection=null;
-
-	/**
-	 * @return Returns the start_time_injection.
-	 */
-	public Object getStartTimeInjection(){
-		try{
-			if (_StartTimeInjection==null){
-				_StartTimeInjection=getProperty("start_time_injection");
-				return _StartTimeInjection;
-			}else {
-				return _StartTimeInjection;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for start_time_injection.
-	 * @param v Value to Set.
-	 */
-	public void setStartTimeInjection(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/start_time_injection",v);
-		_StartTimeInjection=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _BloodGlucose=null;
-
-	/**
-	 * @return Returns the blood_glucose.
-	 */
-	public Double getBloodGlucose() {
-		try{
-			if (_BloodGlucose==null){
-				_BloodGlucose=getDoubleProperty("blood_glucose");
-				return _BloodGlucose;
-			}else {
-				return _BloodGlucose;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for blood_glucose.
-	 * @param v Value to Set.
-	 */
-	public void setBloodGlucose(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/blood_glucose",v);
-		_BloodGlucose=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _BloodGlucoseUnits=null;
-
-	/**
-	 * @return Returns the blood_glucose_units.
-	 */
-	public String getBloodGlucoseUnits(){
-		try{
-			if (_BloodGlucoseUnits==null){
-				_BloodGlucoseUnits=getStringProperty("blood_glucose_units");
-				return _BloodGlucoseUnits;
-			}else {
-				return _BloodGlucoseUnits;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for blood_glucose_units.
-	 * @param v Value to Set.
-	 */
-	public void setBloodGlucoseUnits(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/blood_glucose_units",v);
-		_BloodGlucoseUnits=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _BloodGlucoseTime=null;
-
-	/**
-	 * @return Returns the blood_glucose_time.
-	 */
-	public Object getBloodGlucoseTime(){
-		try{
-			if (_BloodGlucoseTime==null){
-				_BloodGlucoseTime=getProperty("blood_glucose_time");
-				return _BloodGlucoseTime;
-			}else {
-				return _BloodGlucoseTime;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for blood_glucose_time.
-	 * @param v Value to Set.
-	 */
-	public void setBloodGlucoseTime(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/blood_glucose_time",v);
-		_BloodGlucoseTime=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetsessiondata> getAllXnatPetsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatPetsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetsessiondata> getXnatPetsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatPetsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPetsessiondata> getXnatPetsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPetsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatPetsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPetsessiondata getXnatPetsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:petSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPetsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdata.java
deleted file mode 100644
index 0f94e2c6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdata.java
+++ /dev/null
@@ -1,743 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatProjectdata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatProjectdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatProjectdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:projectData";
-
-	public AutoXnatProjectdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatProjectdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatProjectdata(UserI user)
-	 **/
-	public AutoXnatProjectdata(){}
-
-	public AutoXnatProjectdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:projectData";
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Keywords=null;
-
-	/**
-	 * @return Returns the keywords.
-	 */
-	public String getKeywords(){
-		try{
-			if (_Keywords==null){
-				_Keywords=getStringProperty("keywords");
-				return _Keywords;
-			}else {
-				return _Keywords;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for keywords.
-	 * @param v Value to Set.
-	 */
-	public void setKeywords(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/keywords",v);
-		_Keywords=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatProjectdataAlias> _Aliases_alias =null;
-
-	/**
-	 * aliases/alias
-	 * @return Returns an List of org.nrg.xdat.om.XnatProjectdataAlias
-	 */
-	public <A extends org.nrg.xdat.model.XnatProjectdataAliasI> List<A> getAliases_alias() {
-		try{
-			if (_Aliases_alias==null){
-				_Aliases_alias=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("aliases/alias"));
-			}
-			return (List<A>) _Aliases_alias;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatProjectdataAlias>();}
-	}
-
-	/**
-	 * Sets the value for aliases/alias.
-	 * @param v Value to Set.
-	 */
-	public void setAliases_alias(ItemI v) throws Exception{
-		_Aliases_alias =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/aliases/alias",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/aliases/alias",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * aliases/alias
-	 * Adds org.nrg.xdat.model.XnatProjectdataAliasI
-	 */
-	public <A extends org.nrg.xdat.model.XnatProjectdataAliasI> void addAliases_alias(A item) throws Exception{
-	setAliases_alias((ItemI)item);
-	}
-
-	/**
-	 * Removes the aliases/alias of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeAliases_alias(int index) throws java.lang.IndexOutOfBoundsException {
-		_Aliases_alias =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/aliases/alias",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatPublicationresource> _Publications_publication =null;
-
-	/**
-	 * publications/publication
-	 * @return Returns an List of org.nrg.xdat.om.XnatPublicationresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatPublicationresourceI> List<A> getPublications_publication() {
-		try{
-			if (_Publications_publication==null){
-				_Publications_publication=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("publications/publication"));
-			}
-			return (List<A>) _Publications_publication;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatPublicationresource>();}
-	}
-
-	/**
-	 * Sets the value for publications/publication.
-	 * @param v Value to Set.
-	 */
-	public void setPublications_publication(ItemI v) throws Exception{
-		_Publications_publication =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/publications/publication",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/publications/publication",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * publications/publication
-	 * Adds org.nrg.xdat.model.XnatPublicationresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatPublicationresourceI> void addPublications_publication(A item) throws Exception{
-	setPublications_publication((ItemI)item);
-	}
-
-	/**
-	 * Removes the publications/publication of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removePublications_publication(int index) throws java.lang.IndexOutOfBoundsException {
-		_Publications_publication =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/publications/publication",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresource> _Resources_resource =null;
-
-	/**
-	 * resources/resource
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> List<A> getResources_resource() {
-		try{
-			if (_Resources_resource==null){
-				_Resources_resource=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("resources/resource"));
-			}
-			return (List<A>) _Resources_resource;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();}
-	}
-
-	/**
-	 * Sets the value for resources/resource.
-	 * @param v Value to Set.
-	 */
-	public void setResources_resource(ItemI v) throws Exception{
-		_Resources_resource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resources/resource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resources/resource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * resources/resource
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void addResources_resource(A item) throws Exception{
-	setResources_resource((ItemI)item);
-	}
-
-	/**
-	 * Removes the resources/resource of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeResources_resource(int index) throws java.lang.IndexOutOfBoundsException {
-		_Resources_resource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/resources/resource",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractprotocol> _Studyprotocol =null;
-
-	/**
-	 * studyProtocol
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractprotocol
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractprotocolI> List<A> getStudyprotocol() {
-		try{
-			if (_Studyprotocol==null){
-				_Studyprotocol=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("studyProtocol"));
-			}
-			return (List<A>) _Studyprotocol;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractprotocol>();}
-	}
-
-	/**
-	 * Sets the value for studyProtocol.
-	 * @param v Value to Set.
-	 */
-	public void setStudyprotocol(ItemI v) throws Exception{
-		_Studyprotocol =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/studyProtocol",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/studyProtocol",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * studyProtocol
-	 * Adds org.nrg.xdat.model.XnatAbstractprotocolI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractprotocolI> void addStudyprotocol(A item) throws Exception{
-	setStudyprotocol((ItemI)item);
-	}
-
-	/**
-	 * Removes the studyProtocol of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeStudyprotocol(int index) throws java.lang.IndexOutOfBoundsException {
-		_Studyprotocol =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/studyProtocol",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatInvestigatordata _Pi =null;
-
-	/**
-	 * PI
-	 * @return org.nrg.xdat.om.XnatInvestigatordata
-	 */
-	public org.nrg.xdat.om.XnatInvestigatordata getPi() {
-		try{
-			if (_Pi==null){
-				_Pi=((XnatInvestigatordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("PI")));
-				return _Pi;
-			}else {
-				return _Pi;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for PI.
-	 * @param v Value to Set.
-	 */
-	public void setPi(ItemI v) throws Exception{
-		_Pi =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/PI",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/PI",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * PI
-	 * set org.nrg.xdat.model.XnatInvestigatordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatInvestigatordataI> void setPi(A item) throws Exception{
-	setPi((ItemI)item);
-	}
-
-	/**
-	 * Removes the PI.
-	 * */
-	public void removePi() {
-		_Pi =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/PI",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _PiFK=null;
-
-	/**
-	 * @return Returns the xnat:projectData/pi_xnat_investigatordata_id.
-	 */
-	public Integer getPiFK(){
-		try{
-			if (_PiFK==null){
-				_PiFK=getIntegerProperty("xnat:projectData/pi_xnat_investigatordata_id");
-				return _PiFK;
-			}else {
-				return _PiFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:projectData/pi_xnat_investigatordata_id.
-	 * @param v Value to Set.
-	 */
-	public void setPiFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pi_xnat_investigatordata_id",v);
-		_PiFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatInvestigatordata> _Investigators_investigator =null;
-
-	/**
-	 * investigators/investigator
-	 * @return Returns an List of org.nrg.xdat.om.XnatInvestigatordata
-	 */
-	public <A extends org.nrg.xdat.model.XnatInvestigatordataI> List<A> getInvestigators_investigator() {
-		try{
-			if (_Investigators_investigator==null){
-				_Investigators_investigator=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("investigators/investigator"));
-			}
-			return (List<A>) _Investigators_investigator;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatInvestigatordata>();}
-	}
-
-	/**
-	 * Sets the value for investigators/investigator.
-	 * @param v Value to Set.
-	 */
-	public void setInvestigators_investigator(ItemI v) throws Exception{
-		_Investigators_investigator =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/investigators/investigator",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/investigators/investigator",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * investigators/investigator
-	 * Adds org.nrg.xdat.model.XnatInvestigatordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatInvestigatordataI> void addInvestigators_investigator(A item) throws Exception{
-	setInvestigators_investigator((ItemI)item);
-	}
-
-	/**
-	 * Removes the investigators/investigator of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeInvestigators_investigator(int index) throws java.lang.IndexOutOfBoundsException {
-		_Investigators_investigator =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/investigators/investigator",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatProjectdataField> _Fields_field =null;
-
-	/**
-	 * fields/field
-	 * @return Returns an List of org.nrg.xdat.om.XnatProjectdataField
-	 */
-	public <A extends org.nrg.xdat.model.XnatProjectdataFieldI> List<A> getFields_field() {
-		try{
-			if (_Fields_field==null){
-				_Fields_field=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("fields/field"));
-			}
-			return (List<A>) _Fields_field;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatProjectdataField>();}
-	}
-
-	/**
-	 * Sets the value for fields/field.
-	 * @param v Value to Set.
-	 */
-	public void setFields_field(ItemI v) throws Exception{
-		_Fields_field =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * fields/field
-	 * Adds org.nrg.xdat.model.XnatProjectdataFieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatProjectdataFieldI> void addFields_field(A item) throws Exception{
-	setFields_field((ItemI)item);
-	}
-
-	/**
-	 * Removes the fields/field of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeFields_field(int index) throws java.lang.IndexOutOfBoundsException {
-		_Fields_field =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/fields/field",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SecondaryId=null;
-
-	/**
-	 * @return Returns the secondary_ID.
-	 */
-	public String getSecondaryId(){
-		try{
-			if (_SecondaryId==null){
-				_SecondaryId=getStringProperty("secondary_ID");
-				return _SecondaryId;
-			}else {
-				return _SecondaryId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for secondary_ID.
-	 * @param v Value to Set.
-	 */
-	public void setSecondaryId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/secondary_ID",v);
-		_SecondaryId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdata> getAllXnatProjectdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdata> al = new ArrayList<org.nrg.xdat.om.XnatProjectdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdata> getXnatProjectdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdata> al = new ArrayList<org.nrg.xdat.om.XnatProjectdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdata> getXnatProjectdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdata> al = new ArrayList<org.nrg.xdat.om.XnatProjectdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatProjectdata getXnatProjectdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:projectData/ID",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatProjectdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //aliases/alias
-	        for(org.nrg.xdat.model.XnatProjectdataAliasI childAliases_alias : this.getAliases_alias()){
-	            if (childAliases_alias!=null){
-	              for(ResourceFile rf: ((XnatProjectdataAlias)childAliases_alias).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("aliases/alias[" + ((XnatProjectdataAlias)childAliases_alias).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("aliases/alias/" + ((XnatProjectdataAlias)childAliases_alias).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //publications/publication
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childPublications_publication : this.getPublications_publication()){
-	            if (childPublications_publication!=null){
-	              int counterPublications_publication=0;
-	              for(java.io.File f: ((XnatAbstractresource)childPublications_publication).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("publications/publication[xnat_abstractresource_id=" + ((XnatAbstractresource)childPublications_publication).getXnatAbstractresourceId() + "]/file/" + counterPublications_publication +"");
-	                 rf.setXdatPath("publications/publication/" + ((XnatAbstractresource)childPublications_publication).getXnatAbstractresourceId() + "/" + counterPublications_publication++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //resources/resource
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childResources_resource : this.getResources_resource()){
-	            if (childResources_resource!=null){
-	              int counterResources_resource=0;
-	              for(java.io.File f: ((XnatAbstractresource)childResources_resource).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("resources/resource[xnat_abstractresource_id=" + ((XnatAbstractresource)childResources_resource).getXnatAbstractresourceId() + "]/file/" + counterResources_resource +"");
-	                 rf.setXdatPath("resources/resource/" + ((XnatAbstractresource)childResources_resource).getXnatAbstractresourceId() + "/" + counterResources_resource++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //studyProtocol
-	        for(org.nrg.xdat.model.XnatAbstractprotocolI childStudyprotocol : this.getStudyprotocol()){
-	            if (childStudyprotocol!=null){
-	              for(ResourceFile rf: ((XnatAbstractprotocol)childStudyprotocol).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("studyProtocol[" + ((XnatAbstractprotocol)childStudyprotocol).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("studyProtocol/" + ((XnatAbstractprotocol)childStudyprotocol).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //PI
-	        XnatInvestigatordata childPi = (XnatInvestigatordata)this.getPi();
-	            if (childPi!=null){
-	              for(ResourceFile rf: ((XnatInvestigatordata)childPi).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("PI[" + ((XnatInvestigatordata)childPi).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("PI/" + ((XnatInvestigatordata)childPi).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //investigators/investigator
-	        for(org.nrg.xdat.model.XnatInvestigatordataI childInvestigators_investigator : this.getInvestigators_investigator()){
-	            if (childInvestigators_investigator!=null){
-	              for(ResourceFile rf: ((XnatInvestigatordata)childInvestigators_investigator).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("investigators/investigator[" + ((XnatInvestigatordata)childInvestigators_investigator).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("investigators/investigator/" + ((XnatInvestigatordata)childInvestigators_investigator).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //fields/field
-	        for(org.nrg.xdat.model.XnatProjectdataFieldI childFields_field : this.getFields_field()){
-	            if (childFields_field!=null){
-	              for(ResourceFile rf: ((XnatProjectdataField)childFields_field).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("fields/field[" + ((XnatProjectdataField)childFields_field).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("fields/field/" + ((XnatProjectdataField)childFields_field).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdataAlias.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdataAlias.java
deleted file mode 100644
index 5684d5a3..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdataAlias.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatProjectdataAlias extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatProjectdataAliasI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatProjectdataAlias.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:projectData_alias";
-
-	public AutoXnatProjectdataAlias(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatProjectdataAlias(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatProjectdataAlias(UserI user)
-	 **/
-	public AutoXnatProjectdataAlias(){}
-
-	public AutoXnatProjectdataAlias(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:projectData_alias";
-	}
-
-	//FIELD
-
-	private String _Alias=null;
-
-	/**
-	 * @return Returns the alias.
-	 */
-	public String getAlias(){
-		try{
-			if (_Alias==null){
-				_Alias=getStringProperty("alias");
-				return _Alias;
-			}else {
-				return _Alias;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for alias.
-	 * @param v Value to Set.
-	 */
-	public void setAlias(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/alias",v);
-		_Alias=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Source=null;
-
-	/**
-	 * @return Returns the source.
-	 */
-	public String getSource(){
-		try{
-			if (_Source==null){
-				_Source=getStringProperty("source");
-				return _Source;
-			}else {
-				return _Source;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for source.
-	 * @param v Value to Set.
-	 */
-	public void setSource(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/source",v);
-		_Source=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatProjectdataAliasId=null;
-
-	/**
-	 * @return Returns the xnat_projectData_alias_id.
-	 */
-	public Integer getXnatProjectdataAliasId() {
-		try{
-			if (_XnatProjectdataAliasId==null){
-				_XnatProjectdataAliasId=getIntegerProperty("xnat_projectData_alias_id");
-				return _XnatProjectdataAliasId;
-			}else {
-				return _XnatProjectdataAliasId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_projectData_alias_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatProjectdataAliasId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_projectData_alias_id",v);
-		_XnatProjectdataAliasId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdataAlias> getAllXnatProjectdataAliass(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdataAlias> al = new ArrayList<org.nrg.xdat.om.XnatProjectdataAlias>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdataAlias> getXnatProjectdataAliassByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdataAlias> al = new ArrayList<org.nrg.xdat.om.XnatProjectdataAlias>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdataAlias> getXnatProjectdataAliassByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdataAlias> al = new ArrayList<org.nrg.xdat.om.XnatProjectdataAlias>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatProjectdataAlias getXnatProjectdataAliassByXnatProjectdataAliasId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:projectData_alias/xnat_projectData_alias_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatProjectdataAlias) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdataField.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdataField.java
deleted file mode 100644
index d57490d2..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectdataField.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatProjectdataField extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatProjectdataFieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatProjectdataField.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:projectData_field";
-
-	public AutoXnatProjectdataField(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatProjectdataField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatProjectdataField(UserI user)
-	 **/
-	public AutoXnatProjectdataField(){}
-
-	public AutoXnatProjectdataField(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:projectData_field";
-	}
-
-	//FIELD
-
-	private String _Field=null;
-
-	/**
-	 * @return Returns the field.
-	 */
-	public String getField(){
-		try{
-			if (_Field==null){
-				_Field=getStringProperty("field");
-				return _Field;
-			}else {
-				return _Field;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for field.
-	 * @param v Value to Set.
-	 */
-	public void setField(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/field",v);
-		_Field=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatProjectdataFieldId=null;
-
-	/**
-	 * @return Returns the xnat_projectData_field_id.
-	 */
-	public Integer getXnatProjectdataFieldId() {
-		try{
-			if (_XnatProjectdataFieldId==null){
-				_XnatProjectdataFieldId=getIntegerProperty("xnat_projectData_field_id");
-				return _XnatProjectdataFieldId;
-			}else {
-				return _XnatProjectdataFieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_projectData_field_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatProjectdataFieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_projectData_field_id",v);
-		_XnatProjectdataFieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdataField> getAllXnatProjectdataFields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdataField> al = new ArrayList<org.nrg.xdat.om.XnatProjectdataField>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdataField> getXnatProjectdataFieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdataField> al = new ArrayList<org.nrg.xdat.om.XnatProjectdataField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectdataField> getXnatProjectdataFieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectdataField> al = new ArrayList<org.nrg.xdat.om.XnatProjectdataField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatProjectdataField getXnatProjectdataFieldsByXnatProjectdataFieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:projectData_field/xnat_projectData_field_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatProjectdataField) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectparticipant.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectparticipant.java
deleted file mode 100644
index 95e419e6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatProjectparticipant.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatProjectparticipant extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatProjectparticipantI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatProjectparticipant.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:projectParticipant";
-
-	public AutoXnatProjectparticipant(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatProjectparticipant(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatProjectparticipant(UserI user)
-	 **/
-	public AutoXnatProjectparticipant(){}
-
-	public AutoXnatProjectparticipant(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:projectParticipant";
-	}
-
-	//FIELD
-
-	private String _Label=null;
-
-	/**
-	 * @return Returns the label.
-	 */
-	public String getLabel(){
-		try{
-			if (_Label==null){
-				_Label=getStringProperty("label");
-				return _Label;
-			}else {
-				return _Label;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for label.
-	 * @param v Value to Set.
-	 */
-	public void setLabel(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/label",v);
-		_Label=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Project=null;
-
-	/**
-	 * @return Returns the project.
-	 */
-	public String getProject(){
-		try{
-			if (_Project==null){
-				_Project=getStringProperty("project");
-				return _Project;
-			}else {
-				return _Project;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for project.
-	 * @param v Value to Set.
-	 */
-	public void setProject(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/project",v);
-		_Project=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SubjectId=null;
-
-	/**
-	 * @return Returns the subject_ID.
-	 */
-	public String getSubjectId(){
-		try{
-			if (_SubjectId==null){
-				_SubjectId=getStringProperty("subject_ID");
-				return _SubjectId;
-			}else {
-				return _SubjectId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for subject_ID.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/subject_ID",v);
-		_SubjectId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Group=null;
-
-	/**
-	 * @return Returns the group.
-	 */
-	public String getGroup(){
-		try{
-			if (_Group==null){
-				_Group=getStringProperty("group");
-				return _Group;
-			}else {
-				return _Group;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for group.
-	 * @param v Value to Set.
-	 */
-	public void setGroup(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/group",v);
-		_Group=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatProjectparticipantId=null;
-
-	/**
-	 * @return Returns the xnat_projectParticipant_id.
-	 */
-	public Integer getXnatProjectparticipantId() {
-		try{
-			if (_XnatProjectparticipantId==null){
-				_XnatProjectparticipantId=getIntegerProperty("xnat_projectParticipant_id");
-				return _XnatProjectparticipantId;
-			}else {
-				return _XnatProjectparticipantId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_projectParticipant_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatProjectparticipantId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_projectParticipant_id",v);
-		_XnatProjectparticipantId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectparticipant> getAllXnatProjectparticipants(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectparticipant> al = new ArrayList<org.nrg.xdat.om.XnatProjectparticipant>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectparticipant> getXnatProjectparticipantsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectparticipant> al = new ArrayList<org.nrg.xdat.om.XnatProjectparticipant>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatProjectparticipant> getXnatProjectparticipantsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatProjectparticipant> al = new ArrayList<org.nrg.xdat.om.XnatProjectparticipant>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatProjectparticipant getXnatProjectparticipantsByXnatProjectparticipantId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:projectParticipant/xnat_projectParticipant_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatProjectparticipant) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPublicationresource.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPublicationresource.java
deleted file mode 100644
index b1a9a5a1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPublicationresource.java
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPublicationresource extends XnatAbstractresource implements org.nrg.xdat.model.XnatPublicationresourceI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPublicationresource.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:publicationResource";
-
-	public AutoXnatPublicationresource(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPublicationresource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPublicationresource(UserI user)
-	 **/
-	public AutoXnatPublicationresource(){}
-
-	public AutoXnatPublicationresource(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:publicationResource";
-	}
-	 private org.nrg.xdat.om.XnatAbstractresource _Abstractresource =null;
-
-	/**
-	 * abstractResource
-	 * @return org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public org.nrg.xdat.om.XnatAbstractresource getAbstractresource() {
-		try{
-			if (_Abstractresource==null){
-				_Abstractresource=((XnatAbstractresource)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractResource")));
-				return _Abstractresource;
-			}else {
-				return _Abstractresource;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractResource.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractresource(ItemI v) throws Exception{
-		_Abstractresource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractResource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractResource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractResource
-	 * set org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void setAbstractresource(A item) throws Exception{
-	setAbstractresource((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractResource.
-	 * */
-	public void removeAbstractresource() {
-		_Abstractresource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractResource",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Title=null;
-
-	/**
-	 * @return Returns the title.
-	 */
-	public String getTitle(){
-		try{
-			if (_Title==null){
-				_Title=getStringProperty("title");
-				return _Title;
-			}else {
-				return _Title;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for title.
-	 * @param v Value to Set.
-	 */
-	public void setTitle(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/title",v);
-		_Title=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Citation=null;
-
-	/**
-	 * @return Returns the citation.
-	 */
-	public String getCitation(){
-		try{
-			if (_Citation==null){
-				_Citation=getStringProperty("citation");
-				return _Citation;
-			}else {
-				return _Citation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for citation.
-	 * @param v Value to Set.
-	 */
-	public void setCitation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/citation",v);
-		_Citation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Abstract=null;
-
-	/**
-	 * @return Returns the abstract.
-	 */
-	public String getAbstract(){
-		try{
-			if (_Abstract==null){
-				_Abstract=getStringProperty("abstract");
-				return _Abstract;
-			}else {
-				return _Abstract;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for abstract.
-	 * @param v Value to Set.
-	 */
-	public void setAbstract(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/abstract",v);
-		_Abstract=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Commentary=null;
-
-	/**
-	 * @return Returns the commentary.
-	 */
-	public String getCommentary(){
-		try{
-			if (_Commentary==null){
-				_Commentary=getStringProperty("commentary");
-				return _Commentary;
-			}else {
-				return _Commentary;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for commentary.
-	 * @param v Value to Set.
-	 */
-	public void setCommentary(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/commentary",v);
-		_Commentary=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Isprimary=null;
-
-	/**
-	 * @return Returns the isPrimary.
-	 */
-	public Boolean getIsprimary() {
-		try{
-			if (_Isprimary==null){
-				_Isprimary=getBooleanProperty("isPrimary");
-				return _Isprimary;
-			}else {
-				return _Isprimary;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for isPrimary.
-	 * @param v Value to Set.
-	 */
-	public void setIsprimary(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/isPrimary",v);
-		_Isprimary=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Doi=null;
-
-	/**
-	 * @return Returns the doi.
-	 */
-	public String getDoi(){
-		try{
-			if (_Doi==null){
-				_Doi=getStringProperty("doi");
-				return _Doi;
-			}else {
-				return _Doi;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for doi.
-	 * @param v Value to Set.
-	 */
-	public void setDoi(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/doi",v);
-		_Doi=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Pubmed=null;
-
-	/**
-	 * @return Returns the pubmed.
-	 */
-	public String getPubmed(){
-		try{
-			if (_Pubmed==null){
-				_Pubmed=getStringProperty("pubmed");
-				return _Pubmed;
-			}else {
-				return _Pubmed;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pubmed.
-	 * @param v Value to Set.
-	 */
-	public void setPubmed(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pubmed",v);
-		_Pubmed=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Medline=null;
-
-	/**
-	 * @return Returns the medline.
-	 */
-	public String getMedline(){
-		try{
-			if (_Medline==null){
-				_Medline=getStringProperty("medline");
-				return _Medline;
-			}else {
-				return _Medline;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for medline.
-	 * @param v Value to Set.
-	 */
-	public void setMedline(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/medline",v);
-		_Medline=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Uri=null;
-
-	/**
-	 * @return Returns the uri.
-	 */
-	public String getUri(){
-		try{
-			if (_Uri==null){
-				_Uri=getStringProperty("uri");
-				return _Uri;
-			}else {
-				return _Uri;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for uri.
-	 * @param v Value to Set.
-	 */
-	public void setUri(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/uri",v);
-		_Uri=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Other=null;
-
-	/**
-	 * @return Returns the other.
-	 */
-	public String getOther(){
-		try{
-			if (_Other==null){
-				_Other=getStringProperty("other");
-				return _Other;
-			}else {
-				return _Other;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for other.
-	 * @param v Value to Set.
-	 */
-	public void setOther(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/other",v);
-		_Other=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Type=null;
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType(){
-		try{
-			if (_Type==null){
-				_Type=getStringProperty("type");
-				return _Type;
-			}else {
-				return _Type;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for type.
-	 * @param v Value to Set.
-	 */
-	public void setType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/type",v);
-		_Type=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPublicationresource> getAllXnatPublicationresources(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPublicationresource> al = new ArrayList<org.nrg.xdat.om.XnatPublicationresource>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPublicationresource> getXnatPublicationresourcesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPublicationresource> al = new ArrayList<org.nrg.xdat.om.XnatPublicationresource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPublicationresource> getXnatPublicationresourcesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPublicationresource> al = new ArrayList<org.nrg.xdat.om.XnatPublicationresource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPublicationresource getXnatPublicationresourcesByXnatAbstractresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:publicationResource/xnat_abstractresource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPublicationresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatPublicationresource getXnatPublicationresourcesByTitle(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:publicationResource/title",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPublicationresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatPublicationresource getXnatPublicationresourcesByDoi(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:publicationResource/doi",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPublicationresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatPublicationresource getXnatPublicationresourcesByPubmed(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:publicationResource/pubmed",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPublicationresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatPublicationresource getXnatPublicationresourcesByMedline(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:publicationResource/medline",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPublicationresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatPublicationresource getXnatPublicationresourcesByUri(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:publicationResource/uri",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPublicationresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	              int counter=0;
-	              for(java.io.File f: this.getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file/" + counter +"");
-	                 rf.setXdatPath((counter++) +"");
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPvisitdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPvisitdata.java
deleted file mode 100644
index 831a9acf..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatPvisitdata.java
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatPvisitdata extends XnatGenericdata implements org.nrg.xdat.model.XnatPvisitdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatPvisitdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:pVisitData";
-
-	public AutoXnatPvisitdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatPvisitdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatPvisitdata(UserI user)
-	 **/
-	public AutoXnatPvisitdata(){}
-
-	public AutoXnatPvisitdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:pVisitData";
-	}
-	 private org.nrg.xdat.om.XnatGenericdata _Genericdata =null;
-
-	/**
-	 * genericData
-	 * @return org.nrg.xdat.om.XnatGenericdata
-	 */
-	public org.nrg.xdat.om.XnatGenericdata getGenericdata() {
-		try{
-			if (_Genericdata==null){
-				_Genericdata=((XnatGenericdata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("genericData")));
-				return _Genericdata;
-			}else {
-				return _Genericdata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for genericData.
-	 * @param v Value to Set.
-	 */
-	public void setGenericdata(ItemI v) throws Exception{
-		_Genericdata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/genericData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/genericData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * genericData
-	 * set org.nrg.xdat.model.XnatGenericdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatGenericdataI> void setGenericdata(A item) throws Exception{
-	setGenericdata((ItemI)item);
-	}
-
-	/**
-	 * Removes the genericData.
-	 * */
-	public void removeGenericdata() {
-		_Genericdata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/genericData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SubjectId=null;
-
-	/**
-	 * @return Returns the subject_ID.
-	 */
-	public String getSubjectId(){
-		try{
-			if (_SubjectId==null){
-				_SubjectId=getStringProperty("subject_ID");
-				return _SubjectId;
-			}else {
-				return _SubjectId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for subject_ID.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/subject_ID",v);
-		_SubjectId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _VisitType=null;
-
-	/**
-	 * @return Returns the visit_type.
-	 */
-	public String getVisitType(){
-		try{
-			if (_VisitType==null){
-				_VisitType=getStringProperty("visit_type");
-				return _VisitType;
-			}else {
-				return _VisitType;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for visit_type.
-	 * @param v Value to Set.
-	 */
-	public void setVisitType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/visit_type",v);
-		_VisitType=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _VisitName=null;
-
-	/**
-	 * @return Returns the visit_name.
-	 */
-	public String getVisitName(){
-		try{
-			if (_VisitName==null){
-				_VisitName=getStringProperty("visit_name");
-				return _VisitName;
-			}else {
-				return _VisitName;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for visit_name.
-	 * @param v Value to Set.
-	 */
-	public void setVisitName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/visit_name",v);
-		_VisitName=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Notes=null;
-
-	/**
-	 * @return Returns the notes.
-	 */
-	public String getNotes(){
-		try{
-			if (_Notes==null){
-				_Notes=getStringProperty("notes");
-				return _Notes;
-			}else {
-				return _Notes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for notes.
-	 * @param v Value to Set.
-	 */
-	public void setNotes(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/notes",v);
-		_Notes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _StartDate=null;
-
-	/**
-	 * @return Returns the start_date.
-	 */
-	public Object getStartDate(){
-		try{
-			if (_StartDate==null){
-				_StartDate=getProperty("start_date");
-				return _StartDate;
-			}else {
-				return _StartDate;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for start_date.
-	 * @param v Value to Set.
-	 */
-	public void setStartDate(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/start_date",v);
-		_StartDate=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _EndDate=null;
-
-	/**
-	 * @return Returns the end_date.
-	 */
-	public Object getEndDate(){
-		try{
-			if (_EndDate==null){
-				_EndDate=getProperty("end_date");
-				return _EndDate;
-			}else {
-				return _EndDate;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for end_date.
-	 * @param v Value to Set.
-	 */
-	public void setEndDate(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/end_date",v);
-		_EndDate=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Closed=null;
-
-	/**
-	 * @return Returns the closed.
-	 */
-	public Boolean getClosed() {
-		try{
-			if (_Closed==null){
-				_Closed=getBooleanProperty("closed");
-				return _Closed;
-			}else {
-				return _Closed;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for closed.
-	 * @param v Value to Set.
-	 */
-	public void setClosed(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/closed",v);
-		_Closed=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Boolean _Terminal=null;
-
-	/**
-	 * @return Returns the terminal.
-	 */
-	public Boolean getTerminal() {
-		try{
-			if (_Terminal==null){
-				_Terminal=getBooleanProperty("terminal");
-				return _Terminal;
-			}else {
-				return _Terminal;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for terminal.
-	 * @param v Value to Set.
-	 */
-	public void setTerminal(Object v){
-		try{
-		setBooleanProperty(SCHEMA_ELEMENT_NAME + "/terminal",v);
-		_Terminal=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Status=null;
-
-	/**
-	 * @return Returns the status.
-	 */
-	public String getStatus(){
-		try{
-			if (_Status==null){
-				_Status=getStringProperty("status");
-				return _Status;
-			}else {
-				return _Status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for status.
-	 * @param v Value to Set.
-	 */
-	public void setStatus(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/status",v);
-		_Status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Protocolversion=null;
-
-	/**
-	 * @return Returns the protocolVersion.
-	 */
-	public Integer getProtocolversion() {
-		try{
-			if (_Protocolversion==null){
-				_Protocolversion=getIntegerProperty("protocolVersion");
-				return _Protocolversion;
-			}else {
-				return _Protocolversion;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for protocolVersion.
-	 * @param v Value to Set.
-	 */
-	public void setProtocolversion(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/protocolVersion",v);
-		_Protocolversion=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Protocolid=null;
-
-	/**
-	 * @return Returns the protocolId.
-	 */
-	public String getProtocolid(){
-		try{
-			if (_Protocolid==null){
-				_Protocolid=getStringProperty("protocolId");
-				return _Protocolid;
-			}else {
-				return _Protocolid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for protocolId.
-	 * @param v Value to Set.
-	 */
-	public void setProtocolid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/protocolId",v);
-		_Protocolid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPvisitdata> getAllXnatPvisitdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPvisitdata> al = new ArrayList<org.nrg.xdat.om.XnatPvisitdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPvisitdata> getXnatPvisitdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPvisitdata> al = new ArrayList<org.nrg.xdat.om.XnatPvisitdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatPvisitdata> getXnatPvisitdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatPvisitdata> al = new ArrayList<org.nrg.xdat.om.XnatPvisitdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatPvisitdata getXnatPvisitdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:pVisitData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatPvisitdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //genericData
-	        XnatGenericdata childGenericdata = (XnatGenericdata)this.getGenericdata();
-	            if (childGenericdata!=null){
-	              for(ResourceFile rf: ((XnatGenericdata)childGenericdata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("genericData[" + ((XnatGenericdata)childGenericdata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("genericData/" + ((XnatGenericdata)childGenericdata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdata.java
deleted file mode 100644
index 66184579..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdata.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatQcassessmentdata extends XnatMrassessordata implements org.nrg.xdat.model.XnatQcassessmentdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatQcassessmentdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:qcAssessmentData";
-
-	public AutoXnatQcassessmentdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatQcassessmentdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatQcassessmentdata(UserI user)
-	 **/
-	public AutoXnatQcassessmentdata(){}
-
-	public AutoXnatQcassessmentdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:qcAssessmentData";
-	}
-	 private org.nrg.xdat.om.XnatMrassessordata _Mrassessordata =null;
-
-	/**
-	 * mrAssessorData
-	 * @return org.nrg.xdat.om.XnatMrassessordata
-	 */
-	public org.nrg.xdat.om.XnatMrassessordata getMrassessordata() {
-		try{
-			if (_Mrassessordata==null){
-				_Mrassessordata=((XnatMrassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("mrAssessorData")));
-				return _Mrassessordata;
-			}else {
-				return _Mrassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for mrAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setMrassessordata(ItemI v) throws Exception{
-		_Mrassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/mrAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/mrAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * mrAssessorData
-	 * set org.nrg.xdat.model.XnatMrassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatMrassessordataI> void setMrassessordata(A item) throws Exception{
-	setMrassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the mrAssessorData.
-	 * */
-	public void removeMrassessordata() {
-		_Mrassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/mrAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan> _Scans_scan =null;
-
-	/**
-	 * scans/scan
-	 * @return Returns an List of org.nrg.xdat.om.XnatQcassessmentdataScan
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcassessmentdataScanI> List<A> getScans_scan() {
-		try{
-			if (_Scans_scan==null){
-				_Scans_scan=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("scans/scan"));
-			}
-			return (List<A>) _Scans_scan;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan>();}
-	}
-
-	/**
-	 * Sets the value for scans/scan.
-	 * @param v Value to Set.
-	 */
-	public void setScans_scan(ItemI v) throws Exception{
-		_Scans_scan =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * scans/scan
-	 * Adds org.nrg.xdat.model.XnatQcassessmentdataScanI
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcassessmentdataScanI> void addScans_scan(A item) throws Exception{
-	setScans_scan((ItemI)item);
-	}
-
-	/**
-	 * Removes the scans/scan of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeScans_scan(int index) throws java.lang.IndexOutOfBoundsException {
-		_Scans_scan =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/scans/scan",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Type=null;
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType(){
-		try{
-			if (_Type==null){
-				_Type=getStringProperty("type");
-				return _Type;
-			}else {
-				return _Type;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for type.
-	 * @param v Value to Set.
-	 */
-	public void setType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/type",v);
-		_Type=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdata> getAllXnatQcassessmentdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdata> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdata> getXnatQcassessmentdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdata> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdata> getXnatQcassessmentdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdata> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatQcassessmentdata getXnatQcassessmentdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:qcAssessmentData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatQcassessmentdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		XFTItem mr = org.nrg.xft.search.ItemSearch.GetItem("xnat:mrSessionData.ID",getItem().getProperty("xnat:qcAssessmentData.imageSession_ID"),getItem().getUser(),false);
-		al.add(mr);
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",mr.getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //mrAssessorData
-	        XnatMrassessordata childMrassessordata = (XnatMrassessordata)this.getMrassessordata();
-	            if (childMrassessordata!=null){
-	              for(ResourceFile rf: ((XnatMrassessordata)childMrassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("mrAssessorData[" + ((XnatMrassessordata)childMrassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("mrAssessorData/" + ((XnatMrassessordata)childMrassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //scans/scan
-	        for(org.nrg.xdat.model.XnatQcassessmentdataScanI childScans_scan : this.getScans_scan()){
-	            if (childScans_scan!=null){
-	              for(ResourceFile rf: ((XnatQcassessmentdataScan)childScans_scan).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("scans/scan[" + ((XnatQcassessmentdataScan)childScans_scan).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("scans/scan/" + ((XnatQcassessmentdataScan)childScans_scan).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdataScan.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdataScan.java
deleted file mode 100644
index 4dbeff11..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdataScan.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatQcassessmentdataScan extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatQcassessmentdataScanI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatQcassessmentdataScan.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:qcAssessmentData_scan";
-
-	public AutoXnatQcassessmentdataScan(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatQcassessmentdataScan(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatQcassessmentdataScan(UserI user)
-	 **/
-	public AutoXnatQcassessmentdataScan(){}
-
-	public AutoXnatQcassessmentdataScan(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:qcAssessmentData_scan";
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice> _Sliceqc_slice =null;
-
-	/**
-	 * sliceQC/slice
-	 * @return Returns an List of org.nrg.xdat.om.XnatQcassessmentdataScanSlice
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcassessmentdataScanSliceI> List<A> getSliceqc_slice() {
-		try{
-			if (_Sliceqc_slice==null){
-				_Sliceqc_slice=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("sliceQC/slice"));
-			}
-			return (List<A>) _Sliceqc_slice;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice>();}
-	}
-
-	/**
-	 * Sets the value for sliceQC/slice.
-	 * @param v Value to Set.
-	 */
-	public void setSliceqc_slice(ItemI v) throws Exception{
-		_Sliceqc_slice =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sliceQC/slice",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sliceQC/slice",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * sliceQC/slice
-	 * Adds org.nrg.xdat.model.XnatQcassessmentdataScanSliceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcassessmentdataScanSliceI> void addSliceqc_slice(A item) throws Exception{
-	setSliceqc_slice((ItemI)item);
-	}
-
-	/**
-	 * Removes the sliceQC/slice of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSliceqc_slice(int index) throws java.lang.IndexOutOfBoundsException {
-		_Sliceqc_slice =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/sliceQC/slice",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatAbstractstatistics _Scanstatistics =null;
-
-	/**
-	 * scanStatistics
-	 * @return org.nrg.xdat.om.XnatAbstractstatistics
-	 */
-	public org.nrg.xdat.om.XnatAbstractstatistics getScanstatistics() {
-		try{
-			if (_Scanstatistics==null){
-				_Scanstatistics=((XnatAbstractstatistics)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("scanStatistics")));
-				return _Scanstatistics;
-			}else {
-				return _Scanstatistics;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for scanStatistics.
-	 * @param v Value to Set.
-	 */
-	public void setScanstatistics(ItemI v) throws Exception{
-		_Scanstatistics =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scanStatistics",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scanStatistics",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * scanStatistics
-	 * set org.nrg.xdat.model.XnatAbstractstatisticsI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractstatisticsI> void setScanstatistics(A item) throws Exception{
-	setScanstatistics((ItemI)item);
-	}
-
-	/**
-	 * Removes the scanStatistics.
-	 * */
-	public void removeScanstatistics() {
-		_Scanstatistics =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/scanStatistics",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ScanstatisticsFK=null;
-
-	/**
-	 * @return Returns the xnat:qcAssessmentData_scan/scanstatistics_xnat_abstractstatistics_id.
-	 */
-	public Integer getScanstatisticsFK(){
-		try{
-			if (_ScanstatisticsFK==null){
-				_ScanstatisticsFK=getIntegerProperty("xnat:qcAssessmentData_scan/scanstatistics_xnat_abstractstatistics_id");
-				return _ScanstatisticsFK;
-			}else {
-				return _ScanstatisticsFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:qcAssessmentData_scan/scanstatistics_xnat_abstractstatistics_id.
-	 * @param v Value to Set.
-	 */
-	public void setScanstatisticsFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scanstatistics_xnat_abstractstatistics_id",v);
-		_ScanstatisticsFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the id.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("id");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for id.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/id",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatQcassessmentdataScanId=null;
-
-	/**
-	 * @return Returns the xnat_qcAssessmentData_scan_id.
-	 */
-	public Integer getXnatQcassessmentdataScanId() {
-		try{
-			if (_XnatQcassessmentdataScanId==null){
-				_XnatQcassessmentdataScanId=getIntegerProperty("xnat_qcAssessmentData_scan_id");
-				return _XnatQcassessmentdataScanId;
-			}else {
-				return _XnatQcassessmentdataScanId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_qcAssessmentData_scan_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatQcassessmentdataScanId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_qcAssessmentData_scan_id",v);
-		_XnatQcassessmentdataScanId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan> getAllXnatQcassessmentdataScans(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan> getXnatQcassessmentdataScansByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan> getXnatQcassessmentdataScansByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScan>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatQcassessmentdataScan getXnatQcassessmentdataScansByXnatQcassessmentdataScanId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:qcAssessmentData_scan/xnat_qcAssessmentData_scan_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatQcassessmentdataScan) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //sliceQC/slice
-	        for(org.nrg.xdat.model.XnatQcassessmentdataScanSliceI childSliceqc_slice : this.getSliceqc_slice()){
-	            if (childSliceqc_slice!=null){
-	              for(ResourceFile rf: ((XnatQcassessmentdataScanSlice)childSliceqc_slice).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("sliceQC/slice[" + ((XnatQcassessmentdataScanSlice)childSliceqc_slice).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("sliceQC/slice/" + ((XnatQcassessmentdataScanSlice)childSliceqc_slice).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //scanStatistics
-	        XnatAbstractstatistics childScanstatistics = (XnatAbstractstatistics)this.getScanstatistics();
-	            if (childScanstatistics!=null){
-	              for(ResourceFile rf: ((XnatAbstractstatistics)childScanstatistics).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("scanStatistics[" + ((XnatAbstractstatistics)childScanstatistics).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("scanStatistics/" + ((XnatAbstractstatistics)childScanstatistics).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdataScanSlice.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdataScanSlice.java
deleted file mode 100644
index 0930d1bf..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcassessmentdataScanSlice.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatQcassessmentdataScanSlice extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatQcassessmentdataScanSliceI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatQcassessmentdataScanSlice.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:qcAssessmentData_scan_slice";
-
-	public AutoXnatQcassessmentdataScanSlice(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatQcassessmentdataScanSlice(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatQcassessmentdataScanSlice(UserI user)
-	 **/
-	public AutoXnatQcassessmentdataScanSlice(){}
-
-	public AutoXnatQcassessmentdataScanSlice(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:qcAssessmentData_scan_slice";
-	}
-	 private org.nrg.xdat.om.XnatAbstractstatistics _Slicestatistics =null;
-
-	/**
-	 * sliceStatistics
-	 * @return org.nrg.xdat.om.XnatAbstractstatistics
-	 */
-	public org.nrg.xdat.om.XnatAbstractstatistics getSlicestatistics() {
-		try{
-			if (_Slicestatistics==null){
-				_Slicestatistics=((XnatAbstractstatistics)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("sliceStatistics")));
-				return _Slicestatistics;
-			}else {
-				return _Slicestatistics;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for sliceStatistics.
-	 * @param v Value to Set.
-	 */
-	public void setSlicestatistics(ItemI v) throws Exception{
-		_Slicestatistics =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sliceStatistics",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sliceStatistics",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * sliceStatistics
-	 * set org.nrg.xdat.model.XnatAbstractstatisticsI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractstatisticsI> void setSlicestatistics(A item) throws Exception{
-	setSlicestatistics((ItemI)item);
-	}
-
-	/**
-	 * Removes the sliceStatistics.
-	 * */
-	public void removeSlicestatistics() {
-		_Slicestatistics =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/sliceStatistics",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _SlicestatisticsFK=null;
-
-	/**
-	 * @return Returns the xnat:qcAssessmentData_scan_slice/slicestatistics_xnat_abstractstatistics_id.
-	 */
-	public Integer getSlicestatisticsFK(){
-		try{
-			if (_SlicestatisticsFK==null){
-				_SlicestatisticsFK=getIntegerProperty("xnat:qcAssessmentData_scan_slice/slicestatistics_xnat_abstractstatistics_id");
-				return _SlicestatisticsFK;
-			}else {
-				return _SlicestatisticsFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:qcAssessmentData_scan_slice/slicestatistics_xnat_abstractstatistics_id.
-	 * @param v Value to Set.
-	 */
-	public void setSlicestatisticsFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/slicestatistics_xnat_abstractstatistics_id",v);
-		_SlicestatisticsFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Number=null;
-
-	/**
-	 * @return Returns the number.
-	 */
-	public String getNumber(){
-		try{
-			if (_Number==null){
-				_Number=getStringProperty("number");
-				return _Number;
-			}else {
-				return _Number;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for number.
-	 * @param v Value to Set.
-	 */
-	public void setNumber(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/number",v);
-		_Number=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatQcassessmentdataScanSliceId=null;
-
-	/**
-	 * @return Returns the xnat_qcAssessmentData_scan_slice_id.
-	 */
-	public Integer getXnatQcassessmentdataScanSliceId() {
-		try{
-			if (_XnatQcassessmentdataScanSliceId==null){
-				_XnatQcassessmentdataScanSliceId=getIntegerProperty("xnat_qcAssessmentData_scan_slice_id");
-				return _XnatQcassessmentdataScanSliceId;
-			}else {
-				return _XnatQcassessmentdataScanSliceId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_qcAssessmentData_scan_slice_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatQcassessmentdataScanSliceId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_qcAssessmentData_scan_slice_id",v);
-		_XnatQcassessmentdataScanSliceId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice> getAllXnatQcassessmentdataScanSlices(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice> getXnatQcassessmentdataScanSlicesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice> getXnatQcassessmentdataScanSlicesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice> al = new ArrayList<org.nrg.xdat.om.XnatQcassessmentdataScanSlice>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatQcassessmentdataScanSlice getXnatQcassessmentdataScanSlicesByXnatQcassessmentdataScanSliceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:qcAssessmentData_scan_slice/xnat_qcAssessmentData_scan_slice_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatQcassessmentdataScanSlice) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //sliceStatistics
-	        XnatAbstractstatistics childSlicestatistics = (XnatAbstractstatistics)this.getSlicestatistics();
-	            if (childSlicestatistics!=null){
-	              for(ResourceFile rf: ((XnatAbstractstatistics)childSlicestatistics).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("sliceStatistics[" + ((XnatAbstractstatistics)childSlicestatistics).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("sliceStatistics/" + ((XnatAbstractstatistics)childSlicestatistics).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcmanualassessordata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcmanualassessordata.java
deleted file mode 100644
index 41bb2aa2..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcmanualassessordata.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatQcmanualassessordata extends XnatImageassessordata implements org.nrg.xdat.model.XnatQcmanualassessordataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatQcmanualassessordata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:qcManualAssessorData";
-
-	public AutoXnatQcmanualassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatQcmanualassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatQcmanualassessordata(UserI user)
-	 **/
-	public AutoXnatQcmanualassessordata(){}
-
-	public AutoXnatQcmanualassessordata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:qcManualAssessorData";
-	}
-	 private org.nrg.xdat.om.XnatImageassessordata _Imageassessordata =null;
-
-	/**
-	 * imageAssessorData
-	 * @return org.nrg.xdat.om.XnatImageassessordata
-	 */
-	public org.nrg.xdat.om.XnatImageassessordata getImageassessordata() {
-		try{
-			if (_Imageassessordata==null){
-				_Imageassessordata=((XnatImageassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageAssessorData")));
-				return _Imageassessordata;
-			}else {
-				return _Imageassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setImageassessordata(ItemI v) throws Exception{
-		_Imageassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageAssessorData
-	 * set org.nrg.xdat.model.XnatImageassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImageassessordataI> void setImageassessordata(A item) throws Exception{
-	setImageassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageAssessorData.
-	 * */
-	public void removeImageassessordata() {
-		_Imageassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rater=null;
-
-	/**
-	 * @return Returns the rater.
-	 */
-	public String getRater(){
-		try{
-			if (_Rater==null){
-				_Rater=getStringProperty("rater");
-				return _Rater;
-			}else {
-				return _Rater;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rater.
-	 * @param v Value to Set.
-	 */
-	public void setRater(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rater",v);
-		_Rater=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Stereotacticmarker=null;
-
-	/**
-	 * @return Returns the stereotacticMarker.
-	 */
-	public String getStereotacticmarker(){
-		try{
-			if (_Stereotacticmarker==null){
-				_Stereotacticmarker=getStringProperty("stereotacticMarker");
-				return _Stereotacticmarker;
-			}else {
-				return _Stereotacticmarker;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stereotacticMarker.
-	 * @param v Value to Set.
-	 */
-	public void setStereotacticmarker(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stereotacticMarker",v);
-		_Stereotacticmarker=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Incidentalfindings=null;
-
-	/**
-	 * @return Returns the incidentalFindings.
-	 */
-	public String getIncidentalfindings(){
-		try{
-			if (_Incidentalfindings==null){
-				_Incidentalfindings=getStringProperty("incidentalFindings");
-				return _Incidentalfindings;
-			}else {
-				return _Incidentalfindings;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for incidentalFindings.
-	 * @param v Value to Set.
-	 */
-	public void setIncidentalfindings(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/incidentalFindings",v);
-		_Incidentalfindings=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatQcscandata> _Scans_scan =null;
-
-	/**
-	 * scans/scan
-	 * @return Returns an List of org.nrg.xdat.om.XnatQcscandata
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcscandataI> List<A> getScans_scan() {
-		try{
-			if (_Scans_scan==null){
-				_Scans_scan=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("scans/scan"));
-			}
-			return (List<A>) _Scans_scan;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatQcscandata>();}
-	}
-
-	/**
-	 * Sets the value for scans/scan.
-	 * @param v Value to Set.
-	 */
-	public void setScans_scan(ItemI v) throws Exception{
-		_Scans_scan =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/scans/scan",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * scans/scan
-	 * Adds org.nrg.xdat.model.XnatQcscandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcscandataI> void addScans_scan(A item) throws Exception{
-	setScans_scan((ItemI)item);
-	}
-
-	/**
-	 * Removes the scans/scan of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeScans_scan(int index) throws java.lang.IndexOutOfBoundsException {
-		_Scans_scan =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/scans/scan",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Comments=null;
-
-	/**
-	 * @return Returns the comments.
-	 */
-	public String getComments(){
-		try{
-			if (_Comments==null){
-				_Comments=getStringProperty("comments");
-				return _Comments;
-			}else {
-				return _Comments;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for comments.
-	 * @param v Value to Set.
-	 */
-	public void setComments(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/comments",v);
-		_Comments=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Pass=null;
-
-	/**
-	 * @return Returns the pass.
-	 */
-	public String getPass(){
-		try{
-			if (_Pass==null){
-				_Pass=getStringProperty("pass");
-				return _Pass;
-			}else {
-				return _Pass;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pass.
-	 * @param v Value to Set.
-	 */
-	public void setPass(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pass",v);
-		_Pass=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Payable=null;
-
-	/**
-	 * @return Returns the payable.
-	 */
-	public String getPayable(){
-		try{
-			if (_Payable==null){
-				_Payable=getStringProperty("payable");
-				return _Payable;
-			}else {
-				return _Payable;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for payable.
-	 * @param v Value to Set.
-	 */
-	public void setPayable(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/payable",v);
-		_Payable=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rescan=null;
-
-	/**
-	 * @return Returns the rescan.
-	 */
-	public String getRescan(){
-		try{
-			if (_Rescan==null){
-				_Rescan=getStringProperty("rescan");
-				return _Rescan;
-			}else {
-				return _Rescan;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rescan.
-	 * @param v Value to Set.
-	 */
-	public void setRescan(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rescan",v);
-		_Rescan=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Resolvable=null;
-
-	/**
-	 * @return Returns the resolvable.
-	 */
-	public String getResolvable(){
-		try{
-			if (_Resolvable==null){
-				_Resolvable=getStringProperty("resolvable");
-				return _Resolvable;
-			}else {
-				return _Resolvable;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for resolvable.
-	 * @param v Value to Set.
-	 */
-	public void setResolvable(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/resolvable",v);
-		_Resolvable=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Retrain=null;
-
-	/**
-	 * @return Returns the retrain.
-	 */
-	public String getRetrain(){
-		try{
-			if (_Retrain==null){
-				_Retrain=getStringProperty("retrain");
-				return _Retrain;
-			}else {
-				return _Retrain;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for retrain.
-	 * @param v Value to Set.
-	 */
-	public void setRetrain(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/retrain",v);
-		_Retrain=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata> getAllXnatQcmanualassessordatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata> al = new ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata> getXnatQcmanualassessordatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata> al = new ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata> getXnatQcmanualassessordatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata> al = new ArrayList<org.nrg.xdat.om.XnatQcmanualassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatQcmanualassessordata getXnatQcmanualassessordatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:qcManualAssessorData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatQcmanualassessordata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageAssessorData
-	        XnatImageassessordata childImageassessordata = (XnatImageassessordata)this.getImageassessordata();
-	            if (childImageassessordata!=null){
-	              for(ResourceFile rf: ((XnatImageassessordata)childImageassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageAssessorData[" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageAssessorData/" + ((XnatImageassessordata)childImageassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //scans/scan
-	        for(org.nrg.xdat.model.XnatQcscandataI childScans_scan : this.getScans_scan()){
-	            if (childScans_scan!=null){
-	              for(ResourceFile rf: ((XnatQcscandata)childScans_scan).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("scans/scan[" + ((XnatQcscandata)childScans_scan).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("scans/scan/" + ((XnatQcscandata)childScans_scan).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcscandata.java
deleted file mode 100644
index 05a3724f..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcscandata.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatQcscandata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatQcscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatQcscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:qcScanData";
-
-	public AutoXnatQcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatQcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatQcscandata(UserI user)
-	 **/
-	public AutoXnatQcscandata(){}
-
-	public AutoXnatQcscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:qcScanData";
-	}
-
-	//FIELD
-
-	private String _ImagescanId=null;
-
-	/**
-	 * @return Returns the imageScan_ID.
-	 */
-	public String getImagescanId(){
-		try{
-			if (_ImagescanId==null){
-				_ImagescanId=getStringProperty("imageScan_ID");
-				return _ImagescanId;
-			}else {
-				return _ImagescanId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for imageScan_ID.
-	 * @param v Value to Set.
-	 */
-	public void setImagescanId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/imageScan_ID",v);
-		_ImagescanId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rater=null;
-
-	/**
-	 * @return Returns the rater.
-	 */
-	public String getRater(){
-		try{
-			if (_Rater==null){
-				_Rater=getStringProperty("rater");
-				return _Rater;
-			}else {
-				return _Rater;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rater.
-	 * @param v Value to Set.
-	 */
-	public void setRater(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rater",v);
-		_Rater=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Coverage=null;
-
-	/**
-	 * @return Returns the coverage.
-	 */
-	public String getCoverage(){
-		try{
-			if (_Coverage==null){
-				_Coverage=getStringProperty("coverage");
-				return _Coverage;
-			}else {
-				return _Coverage;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for coverage.
-	 * @param v Value to Set.
-	 */
-	public void setCoverage(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/coverage",v);
-		_Coverage=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Motion=null;
-
-	/**
-	 * @return Returns the motion.
-	 */
-	public String getMotion(){
-		try{
-			if (_Motion==null){
-				_Motion=getStringProperty("motion");
-				return _Motion;
-			}else {
-				return _Motion;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for motion.
-	 * @param v Value to Set.
-	 */
-	public void setMotion(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/motion",v);
-		_Motion=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Otherimageartifacts=null;
-
-	/**
-	 * @return Returns the otherImageArtifacts.
-	 */
-	public String getOtherimageartifacts(){
-		try{
-			if (_Otherimageartifacts==null){
-				_Otherimageartifacts=getStringProperty("otherImageArtifacts");
-				return _Otherimageartifacts;
-			}else {
-				return _Otherimageartifacts;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for otherImageArtifacts.
-	 * @param v Value to Set.
-	 */
-	public void setOtherimageartifacts(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/otherImageArtifacts",v);
-		_Otherimageartifacts=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Comments=null;
-
-	/**
-	 * @return Returns the comments.
-	 */
-	public String getComments(){
-		try{
-			if (_Comments==null){
-				_Comments=getStringProperty("comments");
-				return _Comments;
-			}else {
-				return _Comments;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for comments.
-	 * @param v Value to Set.
-	 */
-	public void setComments(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/comments",v);
-		_Comments=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Pass=null;
-
-	/**
-	 * @return Returns the pass.
-	 */
-	public String getPass(){
-		try{
-			if (_Pass==null){
-				_Pass=getStringProperty("pass");
-				return _Pass;
-			}else {
-				return _Pass;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pass.
-	 * @param v Value to Set.
-	 */
-	public void setPass(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pass",v);
-		_Pass=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rating=null;
-
-	/**
-	 * @return Returns the rating.
-	 */
-	public String getRating(){
-		try{
-			if (_Rating==null){
-				_Rating=getStringProperty("rating");
-				return _Rating;
-			}else {
-				return _Rating;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rating.
-	 * @param v Value to Set.
-	 */
-	public void setRating(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rating",v);
-		_Rating=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Rating_scale=null;
-
-	/**
-	 * @return Returns the rating/scale.
-	 */
-	public String getRating_scale(){
-		try{
-			if (_Rating_scale==null){
-				_Rating_scale=getStringProperty("rating/scale");
-				return _Rating_scale;
-			}else {
-				return _Rating_scale;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for rating/scale.
-	 * @param v Value to Set.
-	 */
-	public void setRating_scale(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/rating/scale",v);
-		_Rating_scale=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatQcscandataField> _Fields_field =null;
-
-	/**
-	 * fields/field
-	 * @return Returns an List of org.nrg.xdat.om.XnatQcscandataField
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcscandataFieldI> List<A> getFields_field() {
-		try{
-			if (_Fields_field==null){
-				_Fields_field=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("fields/field"));
-			}
-			return (List<A>) _Fields_field;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatQcscandataField>();}
-	}
-
-	/**
-	 * Sets the value for fields/field.
-	 * @param v Value to Set.
-	 */
-	public void setFields_field(ItemI v) throws Exception{
-		_Fields_field =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * fields/field
-	 * Adds org.nrg.xdat.model.XnatQcscandataFieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatQcscandataFieldI> void addFields_field(A item) throws Exception{
-	setFields_field((ItemI)item);
-	}
-
-	/**
-	 * Removes the fields/field of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeFields_field(int index) throws java.lang.IndexOutOfBoundsException {
-		_Fields_field =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/fields/field",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatQcscandataId=null;
-
-	/**
-	 * @return Returns the xnat_qcScanData_id.
-	 */
-	public Integer getXnatQcscandataId() {
-		try{
-			if (_XnatQcscandataId==null){
-				_XnatQcscandataId=getIntegerProperty("xnat_qcScanData_id");
-				return _XnatQcscandataId;
-			}else {
-				return _XnatQcscandataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_qcScanData_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatQcscandataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_qcScanData_id",v);
-		_XnatQcscandataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcscandata> getAllXnatQcscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcscandata> al = new ArrayList<org.nrg.xdat.om.XnatQcscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcscandata> getXnatQcscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcscandata> al = new ArrayList<org.nrg.xdat.om.XnatQcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcscandata> getXnatQcscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcscandata> al = new ArrayList<org.nrg.xdat.om.XnatQcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatQcscandata getXnatQcscandatasByXnatQcscandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:qcScanData/xnat_qcScanData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatQcscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //fields/field
-	        for(org.nrg.xdat.model.XnatQcscandataFieldI childFields_field : this.getFields_field()){
-	            if (childFields_field!=null){
-	              for(ResourceFile rf: ((XnatQcscandataField)childFields_field).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("fields/field[" + ((XnatQcscandataField)childFields_field).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("fields/field/" + ((XnatQcscandataField)childFields_field).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcscandataField.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcscandataField.java
deleted file mode 100644
index c13fe5dc..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatQcscandataField.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatQcscandataField extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatQcscandataFieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatQcscandataField.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:qcScanData_field";
-
-	public AutoXnatQcscandataField(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatQcscandataField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatQcscandataField(UserI user)
-	 **/
-	public AutoXnatQcscandataField(){}
-
-	public AutoXnatQcscandataField(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:qcScanData_field";
-	}
-
-	//FIELD
-
-	private String _Field=null;
-
-	/**
-	 * @return Returns the field.
-	 */
-	public String getField(){
-		try{
-			if (_Field==null){
-				_Field=getStringProperty("field");
-				return _Field;
-			}else {
-				return _Field;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for field.
-	 * @param v Value to Set.
-	 */
-	public void setField(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/field",v);
-		_Field=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatQcscandataFieldId=null;
-
-	/**
-	 * @return Returns the xnat_qcScanData_field_id.
-	 */
-	public Integer getXnatQcscandataFieldId() {
-		try{
-			if (_XnatQcscandataFieldId==null){
-				_XnatQcscandataFieldId=getIntegerProperty("xnat_qcScanData_field_id");
-				return _XnatQcscandataFieldId;
-			}else {
-				return _XnatQcscandataFieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_qcScanData_field_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatQcscandataFieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_qcScanData_field_id",v);
-		_XnatQcscandataFieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcscandataField> getAllXnatQcscandataFields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcscandataField> al = new ArrayList<org.nrg.xdat.om.XnatQcscandataField>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcscandataField> getXnatQcscandataFieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcscandataField> al = new ArrayList<org.nrg.xdat.om.XnatQcscandataField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatQcscandataField> getXnatQcscandataFieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatQcscandataField> al = new ArrayList<org.nrg.xdat.om.XnatQcscandataField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatQcscandataField getXnatQcscandataFieldsByXnatQcscandataFieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:qcScanData_field/xnat_qcScanData_field_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatQcscandataField) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatReconstructedimagedata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatReconstructedimagedata.java
deleted file mode 100644
index 5220e6e1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatReconstructedimagedata.java
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatReconstructedimagedata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatReconstructedimagedataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatReconstructedimagedata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:reconstructedImageData";
-
-	public AutoXnatReconstructedimagedata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatReconstructedimagedata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatReconstructedimagedata(UserI user)
-	 **/
-	public AutoXnatReconstructedimagedata(){}
-
-	public AutoXnatReconstructedimagedata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:reconstructedImageData";
-	}
-
-	//FIELD
-
-	private String _ImageSessionId=null;
-
-	/**
-	 * @return Returns the image_session_ID.
-	 */
-	public String getImageSessionId(){
-		try{
-			if (_ImageSessionId==null){
-				_ImageSessionId=getStringProperty("image_session_ID");
-				return _ImageSessionId;
-			}else {
-				return _ImageSessionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for image_session_ID.
-	 * @param v Value to Set.
-	 */
-	public void setImageSessionId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/image_session_ID",v);
-		_ImageSessionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid> _Inscans_scanid =null;
-
-	/**
-	 * inScans/scanID
-	 * @return Returns an List of org.nrg.xdat.om.XnatReconstructedimagedataScanid
-	 */
-	public <A extends org.nrg.xdat.model.XnatReconstructedimagedataScanidI> List<A> getInscans_scanid() {
-		try{
-			if (_Inscans_scanid==null){
-				_Inscans_scanid=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("inScans/scanID"));
-			}
-			return (List<A>) _Inscans_scanid;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid>();}
-	}
-
-	/**
-	 * Sets the value for inScans/scanID.
-	 * @param v Value to Set.
-	 */
-	public void setInscans_scanid(ItemI v) throws Exception{
-		_Inscans_scanid =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/inScans/scanID",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/inScans/scanID",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * inScans/scanID
-	 * Adds org.nrg.xdat.model.XnatReconstructedimagedataScanidI
-	 */
-	public <A extends org.nrg.xdat.model.XnatReconstructedimagedataScanidI> void addInscans_scanid(A item) throws Exception{
-	setInscans_scanid((ItemI)item);
-	}
-
-	/**
-	 * Removes the inScans/scanID of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeInscans_scanid(int index) throws java.lang.IndexOutOfBoundsException {
-		_Inscans_scanid =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/inScans/scanID",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresource> _In_file =null;
-
-	/**
-	 * in/file
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> List<A> getIn_file() {
-		try{
-			if (_In_file==null){
-				_In_file=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("in/file"));
-			}
-			return (List<A>) _In_file;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();}
-	}
-
-	/**
-	 * Sets the value for in/file.
-	 * @param v Value to Set.
-	 */
-	public void setIn_file(ItemI v) throws Exception{
-		_In_file =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/in/file",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/in/file",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * in/file
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void addIn_file(A item) throws Exception{
-	setIn_file((ItemI)item);
-	}
-
-	/**
-	 * Removes the in/file of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeIn_file(int index) throws java.lang.IndexOutOfBoundsException {
-		_In_file =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/in/file",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresource> _Out_file =null;
-
-	/**
-	 * out/file
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> List<A> getOut_file() {
-		try{
-			if (_Out_file==null){
-				_Out_file=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("out/file"));
-			}
-			return (List<A>) _Out_file;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();}
-	}
-
-	/**
-	 * Sets the value for out/file.
-	 * @param v Value to Set.
-	 */
-	public void setOut_file(ItemI v) throws Exception{
-		_Out_file =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/out/file",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/out/file",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * out/file
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void addOut_file(A item) throws Exception{
-	setOut_file((ItemI)item);
-	}
-
-	/**
-	 * Removes the out/file of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeOut_file(int index) throws java.lang.IndexOutOfBoundsException {
-		_Out_file =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/out/file",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.ProvProcess _Provenance =null;
-
-	/**
-	 * provenance
-	 * @return org.nrg.xdat.om.ProvProcess
-	 */
-	public org.nrg.xdat.om.ProvProcess getProvenance() {
-		try{
-			if (_Provenance==null){
-				_Provenance=((ProvProcess)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("provenance")));
-				return _Provenance;
-			}else {
-				return _Provenance;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for provenance.
-	 * @param v Value to Set.
-	 */
-	public void setProvenance(ItemI v) throws Exception{
-		_Provenance =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/provenance",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/provenance",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * provenance
-	 * set org.nrg.xdat.model.ProvProcessI
-	 */
-	public <A extends org.nrg.xdat.model.ProvProcessI> void setProvenance(A item) throws Exception{
-	setProvenance((ItemI)item);
-	}
-
-	/**
-	 * Removes the provenance.
-	 * */
-	public void removeProvenance() {
-		_Provenance =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/provenance",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ProvenanceFK=null;
-
-	/**
-	 * @return Returns the xnat:reconstructedImageData/provenance_prov_process_id.
-	 */
-	public Integer getProvenanceFK(){
-		try{
-			if (_ProvenanceFK==null){
-				_ProvenanceFK=getIntegerProperty("xnat:reconstructedImageData/provenance_prov_process_id");
-				return _ProvenanceFK;
-			}else {
-				return _ProvenanceFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:reconstructedImageData/provenance_prov_process_id.
-	 * @param v Value to Set.
-	 */
-	public void setProvenanceFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/provenance_prov_process_id",v);
-		_ProvenanceFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAddfield> _Parameters_addparam =null;
-
-	/**
-	 * parameters/addParam
-	 * @return Returns an List of org.nrg.xdat.om.XnatAddfield
-	 */
-	public <A extends org.nrg.xdat.model.XnatAddfieldI> List<A> getParameters_addparam() {
-		try{
-			if (_Parameters_addparam==null){
-				_Parameters_addparam=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("parameters/addParam"));
-			}
-			return (List<A>) _Parameters_addparam;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAddfield>();}
-	}
-
-	/**
-	 * Sets the value for parameters/addParam.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_addparam(ItemI v) throws Exception{
-		_Parameters_addparam =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/addParam
-	 * Adds org.nrg.xdat.model.XnatAddfieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAddfieldI> void addParameters_addparam(A item) throws Exception{
-	setParameters_addparam((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/addParam of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeParameters_addparam(int index) throws java.lang.IndexOutOfBoundsException {
-		_Parameters_addparam =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/addParam",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatComputationdata> _Computations_datum =null;
-
-	/**
-	 * computations/datum
-	 * @return Returns an List of org.nrg.xdat.om.XnatComputationdata
-	 */
-	public <A extends org.nrg.xdat.model.XnatComputationdataI> List<A> getComputations_datum() {
-		try{
-			if (_Computations_datum==null){
-				_Computations_datum=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("computations/datum"));
-			}
-			return (List<A>) _Computations_datum;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatComputationdata>();}
-	}
-
-	/**
-	 * Sets the value for computations/datum.
-	 * @param v Value to Set.
-	 */
-	public void setComputations_datum(ItemI v) throws Exception{
-		_Computations_datum =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/computations/datum",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/computations/datum",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * computations/datum
-	 * Adds org.nrg.xdat.model.XnatComputationdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatComputationdataI> void addComputations_datum(A item) throws Exception{
-	setComputations_datum((ItemI)item);
-	}
-
-	/**
-	 * Removes the computations/datum of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeComputations_datum(int index) throws java.lang.IndexOutOfBoundsException {
-		_Computations_datum =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/computations/datum",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Type=null;
-
-	/**
-	 * @return Returns the type.
-	 */
-	public String getType(){
-		try{
-			if (_Type==null){
-				_Type=getStringProperty("type");
-				return _Type;
-			}else {
-				return _Type;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for type.
-	 * @param v Value to Set.
-	 */
-	public void setType(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/type",v);
-		_Type=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Basescantype=null;
-
-	/**
-	 * @return Returns the baseScanType.
-	 */
-	public String getBasescantype(){
-		try{
-			if (_Basescantype==null){
-				_Basescantype=getStringProperty("baseScanType");
-				return _Basescantype;
-			}else {
-				return _Basescantype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for baseScanType.
-	 * @param v Value to Set.
-	 */
-	public void setBasescantype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/baseScanType",v);
-		_Basescantype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatReconstructedimagedataId=null;
-
-	/**
-	 * @return Returns the xnat_reconstructedImageData_id.
-	 */
-	public Integer getXnatReconstructedimagedataId() {
-		try{
-			if (_XnatReconstructedimagedataId==null){
-				_XnatReconstructedimagedataId=getIntegerProperty("xnat_reconstructedImageData_id");
-				return _XnatReconstructedimagedataId;
-			}else {
-				return _XnatReconstructedimagedataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_reconstructedImageData_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatReconstructedimagedataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_reconstructedImageData_id",v);
-		_XnatReconstructedimagedataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata> getAllXnatReconstructedimagedatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata> al = new ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata> getXnatReconstructedimagedatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata> al = new ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata> getXnatReconstructedimagedatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata> al = new ArrayList<org.nrg.xdat.om.XnatReconstructedimagedata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatReconstructedimagedata getXnatReconstructedimagedatasByXnatReconstructedimagedataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:reconstructedImageData/xnat_reconstructedImageData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatReconstructedimagedata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatReconstructedimagedata getXnatReconstructedimagedatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:reconstructedImageData/ID",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatReconstructedimagedata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //inScans/scanID
-	        for(org.nrg.xdat.model.XnatReconstructedimagedataScanidI childInscans_scanid : this.getInscans_scanid()){
-	            if (childInscans_scanid!=null){
-	              for(ResourceFile rf: ((XnatReconstructedimagedataScanid)childInscans_scanid).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("inScans/scanID[" + ((XnatReconstructedimagedataScanid)childInscans_scanid).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("inScans/scanID/" + ((XnatReconstructedimagedataScanid)childInscans_scanid).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //in/file
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childIn_file : this.getIn_file()){
-	            if (childIn_file!=null){
-	              int counterIn_file=0;
-	              for(java.io.File f: ((XnatAbstractresource)childIn_file).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("in/file[xnat_abstractresource_id=" + ((XnatAbstractresource)childIn_file).getXnatAbstractresourceId() + "]/file/" + counterIn_file +"");
-	                 rf.setXdatPath("in/file/" + ((XnatAbstractresource)childIn_file).getXnatAbstractresourceId() + "/" + counterIn_file++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //out/file
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childOut_file : this.getOut_file()){
-	            if (childOut_file!=null){
-	              int counterOut_file=0;
-	              for(java.io.File f: ((XnatAbstractresource)childOut_file).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("out/file[xnat_abstractresource_id=" + ((XnatAbstractresource)childOut_file).getXnatAbstractresourceId() + "]/file/" + counterOut_file +"");
-	                 rf.setXdatPath("out/file/" + ((XnatAbstractresource)childOut_file).getXnatAbstractresourceId() + "/" + counterOut_file++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //provenance
-	        ProvProcess childProvenance = (ProvProcess)this.getProvenance();
-	            if (childProvenance!=null){
-	              for(ResourceFile rf: ((ProvProcess)childProvenance).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("provenance[" + ((ProvProcess)childProvenance).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("provenance/" + ((ProvProcess)childProvenance).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/addParam
-	        for(org.nrg.xdat.model.XnatAddfieldI childParameters_addparam : this.getParameters_addparam()){
-	            if (childParameters_addparam!=null){
-	              for(ResourceFile rf: ((XnatAddfield)childParameters_addparam).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/addParam[" + ((XnatAddfield)childParameters_addparam).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/addParam/" + ((XnatAddfield)childParameters_addparam).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //computations/datum
-	        for(org.nrg.xdat.model.XnatComputationdataI childComputations_datum : this.getComputations_datum()){
-	            if (childComputations_datum!=null){
-	              for(ResourceFile rf: ((XnatComputationdata)childComputations_datum).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("computations/datum[" + ((XnatComputationdata)childComputations_datum).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("computations/datum/" + ((XnatComputationdata)childComputations_datum).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatReconstructedimagedataScanid.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatReconstructedimagedataScanid.java
deleted file mode 100644
index 7b412f7a..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatReconstructedimagedataScanid.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatReconstructedimagedataScanid extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatReconstructedimagedataScanidI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatReconstructedimagedataScanid.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:reconstructedImageData_scanID";
-
-	public AutoXnatReconstructedimagedataScanid(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatReconstructedimagedataScanid(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatReconstructedimagedataScanid(UserI user)
-	 **/
-	public AutoXnatReconstructedimagedataScanid(){}
-
-	public AutoXnatReconstructedimagedataScanid(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:reconstructedImageData_scanID";
-	}
-
-	//FIELD
-
-	private String _Scanid=null;
-
-	/**
-	 * @return Returns the scanID.
-	 */
-	public String getScanid(){
-		try{
-			if (_Scanid==null){
-				_Scanid=getStringProperty("scanID");
-				return _Scanid;
-			}else {
-				return _Scanid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for scanID.
-	 * @param v Value to Set.
-	 */
-	public void setScanid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/scanID",v);
-		_Scanid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatReconstructedimagedataScanidId=null;
-
-	/**
-	 * @return Returns the xnat_reconstructedImageData_scanID_id.
-	 */
-	public Integer getXnatReconstructedimagedataScanidId() {
-		try{
-			if (_XnatReconstructedimagedataScanidId==null){
-				_XnatReconstructedimagedataScanidId=getIntegerProperty("xnat_reconstructedImageData_scanID_id");
-				return _XnatReconstructedimagedataScanidId;
-			}else {
-				return _XnatReconstructedimagedataScanidId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_reconstructedImageData_scanID_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatReconstructedimagedataScanidId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_reconstructedImageData_scanID_id",v);
-		_XnatReconstructedimagedataScanidId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid> getAllXnatReconstructedimagedataScanids(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid> al = new ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid> getXnatReconstructedimagedataScanidsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid> al = new ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid> getXnatReconstructedimagedataScanidsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid> al = new ArrayList<org.nrg.xdat.om.XnatReconstructedimagedataScanid>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatReconstructedimagedataScanid getXnatReconstructedimagedataScanidsByXnatReconstructedimagedataScanidId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:reconstructedImageData_scanID/xnat_reconstructedImageData_scanID_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatReconstructedimagedataScanid) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRegionresource.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRegionresource.java
deleted file mode 100644
index c1d29e19..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRegionresource.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatRegionresource extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatRegionresourceI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatRegionresource.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:regionResource";
-
-	public AutoXnatRegionresource(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatRegionresource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatRegionresource(UserI user)
-	 **/
-	public AutoXnatRegionresource(){}
-
-	public AutoXnatRegionresource(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:regionResource";
-	}
-	 private org.nrg.xdat.om.XnatAbstractresource _File =null;
-
-	/**
-	 * file
-	 * @return org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public org.nrg.xdat.om.XnatAbstractresource getFile() {
-		try{
-			if (_File==null){
-				_File=((XnatAbstractresource)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("file")));
-				return _File;
-			}else {
-				return _File;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for file.
-	 * @param v Value to Set.
-	 */
-	public void setFile(ItemI v) throws Exception{
-		_File =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/file",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/file",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * file
-	 * set org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void setFile(A item) throws Exception{
-	setFile((ItemI)item);
-	}
-
-	/**
-	 * Removes the file.
-	 * */
-	public void removeFile() {
-		_File =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/file",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _FileFK=null;
-
-	/**
-	 * @return Returns the xnat:regionResource/file_xnat_abstractresource_id.
-	 */
-	public Integer getFileFK(){
-		try{
-			if (_FileFK==null){
-				_FileFK=getIntegerProperty("xnat:regionResource/file_xnat_abstractresource_id");
-				return _FileFK;
-			}else {
-				return _FileFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:regionResource/file_xnat_abstractresource_id.
-	 * @param v Value to Set.
-	 */
-	public void setFileFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/file_xnat_abstractresource_id",v);
-		_FileFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatAbstractresource _Baseimage =null;
-
-	/**
-	 * baseimage
-	 * @return org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public org.nrg.xdat.om.XnatAbstractresource getBaseimage() {
-		try{
-			if (_Baseimage==null){
-				_Baseimage=((XnatAbstractresource)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("baseimage")));
-				return _Baseimage;
-			}else {
-				return _Baseimage;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for baseimage.
-	 * @param v Value to Set.
-	 */
-	public void setBaseimage(ItemI v) throws Exception{
-		_Baseimage =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/baseimage",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/baseimage",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * baseimage
-	 * set org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void setBaseimage(A item) throws Exception{
-	setBaseimage((ItemI)item);
-	}
-
-	/**
-	 * Removes the baseimage.
-	 * */
-	public void removeBaseimage() {
-		_Baseimage =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/baseimage",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _BaseimageFK=null;
-
-	/**
-	 * @return Returns the xnat:regionResource/baseimage_xnat_abstractresource_id.
-	 */
-	public Integer getBaseimageFK(){
-		try{
-			if (_BaseimageFK==null){
-				_BaseimageFK=getIntegerProperty("xnat:regionResource/baseimage_xnat_abstractresource_id");
-				return _BaseimageFK;
-			}else {
-				return _BaseimageFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:regionResource/baseimage_xnat_abstractresource_id.
-	 * @param v Value to Set.
-	 */
-	public void setBaseimageFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/baseimage_xnat_abstractresource_id",v);
-		_BaseimageFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Creator_firstname=null;
-
-	/**
-	 * @return Returns the creator/firstname.
-	 */
-	public String getCreator_firstname(){
-		try{
-			if (_Creator_firstname==null){
-				_Creator_firstname=getStringProperty("creator/firstname");
-				return _Creator_firstname;
-			}else {
-				return _Creator_firstname;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for creator/firstname.
-	 * @param v Value to Set.
-	 */
-	public void setCreator_firstname(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/creator/firstname",v);
-		_Creator_firstname=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Creator_lastname=null;
-
-	/**
-	 * @return Returns the creator/lastname.
-	 */
-	public String getCreator_lastname(){
-		try{
-			if (_Creator_lastname==null){
-				_Creator_lastname=getStringProperty("creator/lastname");
-				return _Creator_lastname;
-			}else {
-				return _Creator_lastname;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for creator/lastname.
-	 * @param v Value to Set.
-	 */
-	public void setCreator_lastname(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/creator/lastname",v);
-		_Creator_lastname=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel> _Subregionlabels_label =null;
-
-	/**
-	 * subregionlabels/label
-	 * @return Returns an List of org.nrg.xdat.om.XnatRegionresourceLabel
-	 */
-	public <A extends org.nrg.xdat.model.XnatRegionresourceLabelI> List<A> getSubregionlabels_label() {
-		try{
-			if (_Subregionlabels_label==null){
-				_Subregionlabels_label=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("subregionlabels/label"));
-			}
-			return (List<A>) _Subregionlabels_label;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel>();}
-	}
-
-	/**
-	 * Sets the value for subregionlabels/label.
-	 * @param v Value to Set.
-	 */
-	public void setSubregionlabels_label(ItemI v) throws Exception{
-		_Subregionlabels_label =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subregionlabels/label",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subregionlabels/label",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subregionlabels/label
-	 * Adds org.nrg.xdat.model.XnatRegionresourceLabelI
-	 */
-	public <A extends org.nrg.xdat.model.XnatRegionresourceLabelI> void addSubregionlabels_label(A item) throws Exception{
-	setSubregionlabels_label((ItemI)item);
-	}
-
-	/**
-	 * Removes the subregionlabels/label of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSubregionlabels_label(int index) throws java.lang.IndexOutOfBoundsException {
-		_Subregionlabels_label =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subregionlabels/label",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Hemisphere=null;
-
-	/**
-	 * @return Returns the hemisphere.
-	 */
-	public String getHemisphere(){
-		try{
-			if (_Hemisphere==null){
-				_Hemisphere=getStringProperty("hemisphere");
-				return _Hemisphere;
-			}else {
-				return _Hemisphere;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for hemisphere.
-	 * @param v Value to Set.
-	 */
-	public void setHemisphere(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/hemisphere",v);
-		_Hemisphere=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SessionId=null;
-
-	/**
-	 * @return Returns the session_id.
-	 */
-	public String getSessionId(){
-		try{
-			if (_SessionId==null){
-				_SessionId=getStringProperty("session_id");
-				return _SessionId;
-			}else {
-				return _SessionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for session_id.
-	 * @param v Value to Set.
-	 */
-	public void setSessionId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/session_id",v);
-		_SessionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatRegionresourceId=null;
-
-	/**
-	 * @return Returns the xnat_regionResource_id.
-	 */
-	public Integer getXnatRegionresourceId() {
-		try{
-			if (_XnatRegionresourceId==null){
-				_XnatRegionresourceId=getIntegerProperty("xnat_regionResource_id");
-				return _XnatRegionresourceId;
-			}else {
-				return _XnatRegionresourceId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_regionResource_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatRegionresourceId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_regionResource_id",v);
-		_XnatRegionresourceId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRegionresource> getAllXnatRegionresources(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRegionresource> al = new ArrayList<org.nrg.xdat.om.XnatRegionresource>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRegionresource> getXnatRegionresourcesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRegionresource> al = new ArrayList<org.nrg.xdat.om.XnatRegionresource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRegionresource> getXnatRegionresourcesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRegionresource> al = new ArrayList<org.nrg.xdat.om.XnatRegionresource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatRegionresource getXnatRegionresourcesByXnatRegionresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:regionResource/xnat_regionResource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatRegionresource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //file
-	        org.nrg.xdat.model.XnatAbstractresourceI childFile = (XnatAbstractresource)this.getFile();
-	            if (childFile!=null){
-	              int counterFile=0;
-	              for(java.io.File f: ((XnatAbstractresource)childFile).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file[xnat_abstractresource_id=" + ((XnatAbstractresource)childFile).getXnatAbstractresourceId() + "]/file/" + counterFile +"");
-	                 rf.setXdatPath("file/" + ((XnatAbstractresource)childFile).getXnatAbstractresourceId() + "/" + counterFile++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //baseimage
-	        org.nrg.xdat.model.XnatAbstractresourceI childBaseimage = (XnatAbstractresource)this.getBaseimage();
-	            if (childBaseimage!=null){
-	              int counterBaseimage=0;
-	              for(java.io.File f: ((XnatAbstractresource)childBaseimage).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("baseimage[xnat_abstractresource_id=" + ((XnatAbstractresource)childBaseimage).getXnatAbstractresourceId() + "]/file/" + counterBaseimage +"");
-	                 rf.setXdatPath("baseimage/" + ((XnatAbstractresource)childBaseimage).getXnatAbstractresourceId() + "/" + counterBaseimage++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //subregionlabels/label
-	        for(org.nrg.xdat.model.XnatRegionresourceLabelI childSubregionlabels_label : this.getSubregionlabels_label()){
-	            if (childSubregionlabels_label!=null){
-	              for(ResourceFile rf: ((XnatRegionresourceLabel)childSubregionlabels_label).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subregionlabels/label[" + ((XnatRegionresourceLabel)childSubregionlabels_label).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subregionlabels/label/" + ((XnatRegionresourceLabel)childSubregionlabels_label).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRegionresourceLabel.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRegionresourceLabel.java
deleted file mode 100644
index eabb6318..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRegionresourceLabel.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatRegionresourceLabel extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatRegionresourceLabelI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatRegionresourceLabel.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:regionResource_label";
-
-	public AutoXnatRegionresourceLabel(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatRegionresourceLabel(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatRegionresourceLabel(UserI user)
-	 **/
-	public AutoXnatRegionresourceLabel(){}
-
-	public AutoXnatRegionresourceLabel(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:regionResource_label";
-	}
-
-	//FIELD
-
-	private String _Label=null;
-
-	/**
-	 * @return Returns the label.
-	 */
-	public String getLabel(){
-		try{
-			if (_Label==null){
-				_Label=getStringProperty("label");
-				return _Label;
-			}else {
-				return _Label;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for label.
-	 * @param v Value to Set.
-	 */
-	public void setLabel(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/label",v);
-		_Label=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Id=null;
-
-	/**
-	 * @return Returns the id.
-	 */
-	public Object getId(){
-		try{
-			if (_Id==null){
-				_Id=getProperty("id");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for id.
-	 * @param v Value to Set.
-	 */
-	public void setId(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/id",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Hemisphere=null;
-
-	/**
-	 * @return Returns the hemisphere.
-	 */
-	public String getHemisphere(){
-		try{
-			if (_Hemisphere==null){
-				_Hemisphere=getStringProperty("hemisphere");
-				return _Hemisphere;
-			}else {
-				return _Hemisphere;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for hemisphere.
-	 * @param v Value to Set.
-	 */
-	public void setHemisphere(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/hemisphere",v);
-		_Hemisphere=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatRegionresourceLabelId=null;
-
-	/**
-	 * @return Returns the xnat_regionResource_label_id.
-	 */
-	public Integer getXnatRegionresourceLabelId() {
-		try{
-			if (_XnatRegionresourceLabelId==null){
-				_XnatRegionresourceLabelId=getIntegerProperty("xnat_regionResource_label_id");
-				return _XnatRegionresourceLabelId;
-			}else {
-				return _XnatRegionresourceLabelId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_regionResource_label_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatRegionresourceLabelId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_regionResource_label_id",v);
-		_XnatRegionresourceLabelId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel> getAllXnatRegionresourceLabels(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel> al = new ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel> getXnatRegionresourceLabelsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel> al = new ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel> getXnatRegionresourceLabelsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel> al = new ArrayList<org.nrg.xdat.om.XnatRegionresourceLabel>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatRegionresourceLabel getXnatRegionresourceLabelsByXnatRegionresourceLabelId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:regionResource_label/xnat_regionResource_label_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatRegionresourceLabel) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResource.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResource.java
deleted file mode 100644
index 49dbdca9..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResource.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatResource extends XnatAbstractresource implements org.nrg.xdat.model.XnatResourceI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatResource.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:resource";
-
-	public AutoXnatResource(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatResource(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatResource(UserI user)
-	 **/
-	public AutoXnatResource(){}
-
-	public AutoXnatResource(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:resource";
-	}
-	 private org.nrg.xdat.om.XnatAbstractresource _Abstractresource =null;
-
-	/**
-	 * abstractResource
-	 * @return org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public org.nrg.xdat.om.XnatAbstractresource getAbstractresource() {
-		try{
-			if (_Abstractresource==null){
-				_Abstractresource=((XnatAbstractresource)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractResource")));
-				return _Abstractresource;
-			}else {
-				return _Abstractresource;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractResource.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractresource(ItemI v) throws Exception{
-		_Abstractresource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractResource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractResource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractResource
-	 * set org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void setAbstractresource(A item) throws Exception{
-	setAbstractresource((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractResource.
-	 * */
-	public void removeAbstractresource() {
-		_Abstractresource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractResource",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.ProvProcess _Provenance =null;
-
-	/**
-	 * provenance
-	 * @return org.nrg.xdat.om.ProvProcess
-	 */
-	public org.nrg.xdat.om.ProvProcess getProvenance() {
-		try{
-			if (_Provenance==null){
-				_Provenance=((ProvProcess)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("provenance")));
-				return _Provenance;
-			}else {
-				return _Provenance;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for provenance.
-	 * @param v Value to Set.
-	 */
-	public void setProvenance(ItemI v) throws Exception{
-		_Provenance =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/provenance",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/provenance",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * provenance
-	 * set org.nrg.xdat.model.ProvProcessI
-	 */
-	public <A extends org.nrg.xdat.model.ProvProcessI> void setProvenance(A item) throws Exception{
-	setProvenance((ItemI)item);
-	}
-
-	/**
-	 * Removes the provenance.
-	 * */
-	public void removeProvenance() {
-		_Provenance =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/provenance",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _ProvenanceFK=null;
-
-	/**
-	 * @return Returns the xnat:resource/provenance_prov_process_id.
-	 */
-	public Integer getProvenanceFK(){
-		try{
-			if (_ProvenanceFK==null){
-				_ProvenanceFK=getIntegerProperty("xnat:resource/provenance_prov_process_id");
-				return _ProvenanceFK;
-			}else {
-				return _ProvenanceFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:resource/provenance_prov_process_id.
-	 * @param v Value to Set.
-	 */
-	public void setProvenanceFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/provenance_prov_process_id",v);
-		_ProvenanceFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Uri=null;
-
-	/**
-	 * @return Returns the URI.
-	 */
-	public String getUri(){
-		try{
-			if (_Uri==null){
-				_Uri=getStringProperty("URI");
-				return _Uri;
-			}else {
-				return _Uri;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for URI.
-	 * @param v Value to Set.
-	 */
-	public void setUri(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/URI",v);
-		_Uri=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Format=null;
-
-	/**
-	 * @return Returns the format.
-	 */
-	public String getFormat(){
-		try{
-			if (_Format==null){
-				_Format=getStringProperty("format");
-				return _Format;
-			}else {
-				return _Format;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for format.
-	 * @param v Value to Set.
-	 */
-	public void setFormat(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/format",v);
-		_Format=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Content=null;
-
-	/**
-	 * @return Returns the content.
-	 */
-	public String getContent(){
-		try{
-			if (_Content==null){
-				_Content=getStringProperty("content");
-				return _Content;
-			}else {
-				return _Content;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for content.
-	 * @param v Value to Set.
-	 */
-	public void setContent(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/content",v);
-		_Content=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Cachepath=null;
-
-	/**
-	 * @return Returns the cachePath.
-	 */
-	public String getCachepath(){
-		try{
-			if (_Cachepath==null){
-				_Cachepath=getStringProperty("cachePath");
-				return _Cachepath;
-			}else {
-				return _Cachepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cachePath.
-	 * @param v Value to Set.
-	 */
-	public void setCachepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cachePath",v);
-		_Cachepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResource> getAllXnatResources(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResource> al = new ArrayList<org.nrg.xdat.om.XnatResource>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResource> getXnatResourcesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResource> al = new ArrayList<org.nrg.xdat.om.XnatResource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResource> getXnatResourcesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResource> al = new ArrayList<org.nrg.xdat.om.XnatResource>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatResource getXnatResourcesByXnatAbstractresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:resource/xnat_abstractresource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatResource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static XnatResource getXnatResourcesByUri(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:resource/URI",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatResource) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	              int counter=0;
-	              for(java.io.File f: this.getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file/" + counter +"");
-	                 rf.setXdatPath((counter++) +"");
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResourcecatalog.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResourcecatalog.java
deleted file mode 100644
index 3b5f355b..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResourcecatalog.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatResourcecatalog extends XnatResource implements org.nrg.xdat.model.XnatResourcecatalogI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatResourcecatalog.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:resourceCatalog";
-
-	public AutoXnatResourcecatalog(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatResourcecatalog(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatResourcecatalog(UserI user)
-	 **/
-	public AutoXnatResourcecatalog(){}
-
-	public AutoXnatResourcecatalog(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:resourceCatalog";
-	}
-	 private org.nrg.xdat.om.XnatResource _Resource =null;
-
-	/**
-	 * resource
-	 * @return org.nrg.xdat.om.XnatResource
-	 */
-	public org.nrg.xdat.om.XnatResource getResource() {
-		try{
-			if (_Resource==null){
-				_Resource=((XnatResource)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("resource")));
-				return _Resource;
-			}else {
-				return _Resource;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for resource.
-	 * @param v Value to Set.
-	 */
-	public void setResource(ItemI v) throws Exception{
-		_Resource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * resource
-	 * set org.nrg.xdat.model.XnatResourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatResourceI> void setResource(A item) throws Exception{
-	setResource((ItemI)item);
-	}
-
-	/**
-	 * Removes the resource.
-	 * */
-	public void removeResource() {
-		_Resource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/resource",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResourcecatalog> getAllXnatResourcecatalogs(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResourcecatalog> al = new ArrayList<org.nrg.xdat.om.XnatResourcecatalog>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResourcecatalog> getXnatResourcecatalogsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResourcecatalog> al = new ArrayList<org.nrg.xdat.om.XnatResourcecatalog>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResourcecatalog> getXnatResourcecatalogsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResourcecatalog> al = new ArrayList<org.nrg.xdat.om.XnatResourcecatalog>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatResourcecatalog getXnatResourcecatalogsByXnatAbstractresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:resourceCatalog/xnat_abstractresource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatResourcecatalog) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	              int counter=0;
-	              for(java.io.File f: this.getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file/" + counter +"");
-	                 rf.setXdatPath((counter++) +"");
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResourceseries.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResourceseries.java
deleted file mode 100644
index 39782799..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatResourceseries.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatResourceseries extends XnatAbstractresource implements org.nrg.xdat.model.XnatResourceseriesI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatResourceseries.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:resourceSeries";
-
-	public AutoXnatResourceseries(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatResourceseries(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatResourceseries(UserI user)
-	 **/
-	public AutoXnatResourceseries(){}
-
-	public AutoXnatResourceseries(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:resourceSeries";
-	}
-	 private org.nrg.xdat.om.XnatAbstractresource _Abstractresource =null;
-
-	/**
-	 * abstractResource
-	 * @return org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public org.nrg.xdat.om.XnatAbstractresource getAbstractresource() {
-		try{
-			if (_Abstractresource==null){
-				_Abstractresource=((XnatAbstractresource)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractResource")));
-				return _Abstractresource;
-			}else {
-				return _Abstractresource;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractResource.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractresource(ItemI v) throws Exception{
-		_Abstractresource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractResource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractResource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractResource
-	 * set org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void setAbstractresource(A item) throws Exception{
-	setAbstractresource((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractResource.
-	 * */
-	public void removeAbstractresource() {
-		_Abstractresource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractResource",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Path=null;
-
-	/**
-	 * @return Returns the path.
-	 */
-	public String getPath(){
-		try{
-			if (_Path==null){
-				_Path=getStringProperty("path");
-				return _Path;
-			}else {
-				return _Path;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for path.
-	 * @param v Value to Set.
-	 */
-	public void setPath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/path",v);
-		_Path=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Pattern=null;
-
-	/**
-	 * @return Returns the pattern.
-	 */
-	public String getPattern(){
-		try{
-			if (_Pattern==null){
-				_Pattern=getStringProperty("pattern");
-				return _Pattern;
-			}else {
-				return _Pattern;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for pattern.
-	 * @param v Value to Set.
-	 */
-	public void setPattern(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/pattern",v);
-		_Pattern=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Count=null;
-
-	/**
-	 * @return Returns the count.
-	 */
-	public Integer getCount() {
-		try{
-			if (_Count==null){
-				_Count=getIntegerProperty("count");
-				return _Count;
-			}else {
-				return _Count;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for count.
-	 * @param v Value to Set.
-	 */
-	public void setCount(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/count",v);
-		_Count=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Format=null;
-
-	/**
-	 * @return Returns the format.
-	 */
-	public String getFormat(){
-		try{
-			if (_Format==null){
-				_Format=getStringProperty("format");
-				return _Format;
-			}else {
-				return _Format;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for format.
-	 * @param v Value to Set.
-	 */
-	public void setFormat(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/format",v);
-		_Format=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Content=null;
-
-	/**
-	 * @return Returns the content.
-	 */
-	public String getContent(){
-		try{
-			if (_Content==null){
-				_Content=getStringProperty("content");
-				return _Content;
-			}else {
-				return _Content;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for content.
-	 * @param v Value to Set.
-	 */
-	public void setContent(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/content",v);
-		_Content=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Cachepath=null;
-
-	/**
-	 * @return Returns the cachePath.
-	 */
-	public String getCachepath(){
-		try{
-			if (_Cachepath==null){
-				_Cachepath=getStringProperty("cachePath");
-				return _Cachepath;
-			}else {
-				return _Cachepath;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cachePath.
-	 * @param v Value to Set.
-	 */
-	public void setCachepath(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cachePath",v);
-		_Cachepath=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResourceseries> getAllXnatResourceseriess(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResourceseries> al = new ArrayList<org.nrg.xdat.om.XnatResourceseries>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResourceseries> getXnatResourceseriessByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResourceseries> al = new ArrayList<org.nrg.xdat.om.XnatResourceseries>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatResourceseries> getXnatResourceseriessByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatResourceseries> al = new ArrayList<org.nrg.xdat.om.XnatResourceseries>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatResourceseries getXnatResourceseriessByXnatAbstractresourceId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:resourceSeries/xnat_abstractresource_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatResourceseries) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	              int counter=0;
-	              for(java.io.File f: this.getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("file/" + counter +"");
-	                 rf.setXdatPath((counter++) +"");
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRfscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRfscandata.java
deleted file mode 100644
index b2d0a749..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRfscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatRfscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatRfscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatRfscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:rfScanData";
-
-	public AutoXnatRfscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatRfscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatRfscandata(UserI user)
-	 **/
-	public AutoXnatRfscandata(){}
-
-	public AutoXnatRfscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:rfScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRfscandata> getAllXnatRfscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRfscandata> al = new ArrayList<org.nrg.xdat.om.XnatRfscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRfscandata> getXnatRfscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRfscandata> al = new ArrayList<org.nrg.xdat.om.XnatRfscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRfscandata> getXnatRfscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRfscandata> al = new ArrayList<org.nrg.xdat.om.XnatRfscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatRfscandata getXnatRfscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:rfScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatRfscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRfsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRfsessiondata.java
deleted file mode 100644
index d2d91952..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRfsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatRfsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatRfsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatRfsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:rfSessionData";
-
-	public AutoXnatRfsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatRfsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatRfsessiondata(UserI user)
-	 **/
-	public AutoXnatRfsessiondata(){}
-
-	public AutoXnatRfsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:rfSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRfsessiondata> getAllXnatRfsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRfsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatRfsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRfsessiondata> getXnatRfsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRfsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatRfsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRfsessiondata> getXnatRfsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRfsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatRfsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatRfsessiondata getXnatRfsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:rfSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatRfsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRtimagescandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRtimagescandata.java
deleted file mode 100644
index e072b918..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRtimagescandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatRtimagescandata extends XnatImagescandata implements org.nrg.xdat.model.XnatRtimagescandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatRtimagescandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:rtImageScanData";
-
-	public AutoXnatRtimagescandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatRtimagescandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatRtimagescandata(UserI user)
-	 **/
-	public AutoXnatRtimagescandata(){}
-
-	public AutoXnatRtimagescandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:rtImageScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRtimagescandata> getAllXnatRtimagescandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRtimagescandata> al = new ArrayList<org.nrg.xdat.om.XnatRtimagescandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRtimagescandata> getXnatRtimagescandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRtimagescandata> al = new ArrayList<org.nrg.xdat.om.XnatRtimagescandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRtimagescandata> getXnatRtimagescandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRtimagescandata> al = new ArrayList<org.nrg.xdat.om.XnatRtimagescandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatRtimagescandata getXnatRtimagescandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:rtImageScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatRtimagescandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRtsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRtsessiondata.java
deleted file mode 100644
index 2f913db9..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatRtsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatRtsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatRtsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatRtsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:rtSessionData";
-
-	public AutoXnatRtsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatRtsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatRtsessiondata(UserI user)
-	 **/
-	public AutoXnatRtsessiondata(){}
-
-	public AutoXnatRtsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:rtSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRtsessiondata> getAllXnatRtsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRtsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatRtsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRtsessiondata> getXnatRtsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRtsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatRtsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatRtsessiondata> getXnatRtsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatRtsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatRtsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatRtsessiondata getXnatRtsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:rtSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatRtsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatScscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatScscandata.java
deleted file mode 100644
index 44b5bf94..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatScscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatScscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatScscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatScscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:scScanData";
-
-	public AutoXnatScscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatScscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatScscandata(UserI user)
-	 **/
-	public AutoXnatScscandata(){}
-
-	public AutoXnatScscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:scScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatScscandata> getAllXnatScscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatScscandata> al = new ArrayList<org.nrg.xdat.om.XnatScscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatScscandata> getXnatScscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatScscandata> al = new ArrayList<org.nrg.xdat.om.XnatScscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatScscandata> getXnatScscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatScscandata> al = new ArrayList<org.nrg.xdat.om.XnatScscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatScscandata getXnatScscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:scScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatScscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSegscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSegscandata.java
deleted file mode 100644
index bb1a1a99..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSegscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSegscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatSegscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSegscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:segScanData";
-
-	public AutoXnatSegscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSegscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSegscandata(UserI user)
-	 **/
-	public AutoXnatSegscandata(){}
-
-	public AutoXnatSegscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:segScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSegscandata> getAllXnatSegscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSegscandata> al = new ArrayList<org.nrg.xdat.om.XnatSegscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSegscandata> getXnatSegscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSegscandata> al = new ArrayList<org.nrg.xdat.om.XnatSegscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSegscandata> getXnatSegscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSegscandata> al = new ArrayList<org.nrg.xdat.om.XnatSegscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSegscandata getXnatSegscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:segScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSegscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSmscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSmscandata.java
deleted file mode 100644
index b6eec7a5..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSmscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSmscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatSmscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSmscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:smScanData";
-
-	public AutoXnatSmscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSmscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSmscandata(UserI user)
-	 **/
-	public AutoXnatSmscandata(){}
-
-	public AutoXnatSmscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:smScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSmscandata> getAllXnatSmscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSmscandata> al = new ArrayList<org.nrg.xdat.om.XnatSmscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSmscandata> getXnatSmscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSmscandata> al = new ArrayList<org.nrg.xdat.om.XnatSmscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSmscandata> getXnatSmscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSmscandata> al = new ArrayList<org.nrg.xdat.om.XnatSmscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSmscandata getXnatSmscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:smScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSmscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSmsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSmsessiondata.java
deleted file mode 100644
index b1daa6ec..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSmsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSmsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatSmsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSmsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:smSessionData";
-
-	public AutoXnatSmsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSmsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSmsessiondata(UserI user)
-	 **/
-	public AutoXnatSmsessiondata(){}
-
-	public AutoXnatSmsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:smSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSmsessiondata> getAllXnatSmsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatSmsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSmsessiondata> getXnatSmsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatSmsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSmsessiondata> getXnatSmsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSmsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatSmsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSmsessiondata getXnatSmsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:smSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSmsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSrscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSrscandata.java
deleted file mode 100644
index 40566da5..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSrscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSrscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatSrscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSrscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:srScanData";
-
-	public AutoXnatSrscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSrscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSrscandata(UserI user)
-	 **/
-	public AutoXnatSrscandata(){}
-
-	public AutoXnatSrscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:srScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSrscandata> getAllXnatSrscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSrscandata> al = new ArrayList<org.nrg.xdat.om.XnatSrscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSrscandata> getXnatSrscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSrscandata> al = new ArrayList<org.nrg.xdat.om.XnatSrscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSrscandata> getXnatSrscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSrscandata> al = new ArrayList<org.nrg.xdat.om.XnatSrscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSrscandata getXnatSrscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:srScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSrscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSrsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSrsessiondata.java
deleted file mode 100644
index c560abd6..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSrsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:08 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSrsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatSrsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSrsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:srSessionData";
-
-	public AutoXnatSrsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSrsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSrsessiondata(UserI user)
-	 **/
-	public AutoXnatSrsessiondata(){}
-
-	public AutoXnatSrsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:srSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSrsessiondata> getAllXnatSrsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatSrsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSrsessiondata> getXnatSrsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatSrsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSrsessiondata> getXnatSrsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSrsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatSrsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSrsessiondata getXnatSrsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:srSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSrsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdata.java
deleted file mode 100644
index b8b2edd2..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdata.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatStatisticsdata extends XnatAbstractstatistics implements org.nrg.xdat.model.XnatStatisticsdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatStatisticsdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:statisticsData";
-
-	public AutoXnatStatisticsdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatStatisticsdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatStatisticsdata(UserI user)
-	 **/
-	public AutoXnatStatisticsdata(){}
-
-	public AutoXnatStatisticsdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:statisticsData";
-	}
-	 private org.nrg.xdat.om.XnatAbstractstatistics _Abstractstatistics =null;
-
-	/**
-	 * abstractStatistics
-	 * @return org.nrg.xdat.om.XnatAbstractstatistics
-	 */
-	public org.nrg.xdat.om.XnatAbstractstatistics getAbstractstatistics() {
-		try{
-			if (_Abstractstatistics==null){
-				_Abstractstatistics=((XnatAbstractstatistics)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractStatistics")));
-				return _Abstractstatistics;
-			}else {
-				return _Abstractstatistics;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractStatistics.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractstatistics(ItemI v) throws Exception{
-		_Abstractstatistics =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractStatistics",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractStatistics",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractStatistics
-	 * set org.nrg.xdat.model.XnatAbstractstatisticsI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractstatisticsI> void setAbstractstatistics(A item) throws Exception{
-	setAbstractstatistics((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractStatistics.
-	 * */
-	public void removeAbstractstatistics() {
-		_Abstractstatistics =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractStatistics",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Mean=null;
-
-	/**
-	 * @return Returns the mean.
-	 */
-	public Double getMean() {
-		try{
-			if (_Mean==null){
-				_Mean=getDoubleProperty("mean");
-				return _Mean;
-			}else {
-				return _Mean;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for mean.
-	 * @param v Value to Set.
-	 */
-	public void setMean(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/mean",v);
-		_Mean=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Snr=null;
-
-	/**
-	 * @return Returns the snr.
-	 */
-	public Double getSnr() {
-		try{
-			if (_Snr==null){
-				_Snr=getDoubleProperty("snr");
-				return _Snr;
-			}else {
-				return _Snr;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for snr.
-	 * @param v Value to Set.
-	 */
-	public void setSnr(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/snr",v);
-		_Snr=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Min=null;
-
-	/**
-	 * @return Returns the min.
-	 */
-	public Double getMin() {
-		try{
-			if (_Min==null){
-				_Min=getDoubleProperty("min");
-				return _Min;
-			}else {
-				return _Min;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for min.
-	 * @param v Value to Set.
-	 */
-	public void setMin(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/min",v);
-		_Min=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Max=null;
-
-	/**
-	 * @return Returns the max.
-	 */
-	public Double getMax() {
-		try{
-			if (_Max==null){
-				_Max=getDoubleProperty("max");
-				return _Max;
-			}else {
-				return _Max;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for max.
-	 * @param v Value to Set.
-	 */
-	public void setMax(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/max",v);
-		_Max=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Stddev=null;
-
-	/**
-	 * @return Returns the stddev.
-	 */
-	public Double getStddev() {
-		try{
-			if (_Stddev==null){
-				_Stddev=getDoubleProperty("stddev");
-				return _Stddev;
-			}else {
-				return _Stddev;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for stddev.
-	 * @param v Value to Set.
-	 */
-	public void setStddev(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/stddev",v);
-		_Stddev=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _NoOfVoxels=null;
-
-	/**
-	 * @return Returns the no_of_voxels.
-	 */
-	public Integer getNoOfVoxels() {
-		try{
-			if (_NoOfVoxels==null){
-				_NoOfVoxels=getIntegerProperty("no_of_voxels");
-				return _NoOfVoxels;
-			}else {
-				return _NoOfVoxels;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for no_of_voxels.
-	 * @param v Value to Set.
-	 */
-	public void setNoOfVoxels(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/no_of_voxels",v);
-		_NoOfVoxels=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics> _Additionalstatistics =null;
-
-	/**
-	 * additionalStatistics
-	 * @return Returns an List of org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics
-	 */
-	public <A extends org.nrg.xdat.model.XnatStatisticsdataAdditionalstatisticsI> List<A> getAdditionalstatistics() {
-		try{
-			if (_Additionalstatistics==null){
-				_Additionalstatistics=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("additionalStatistics"));
-			}
-			return (List<A>) _Additionalstatistics;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics>();}
-	}
-
-	/**
-	 * Sets the value for additionalStatistics.
-	 * @param v Value to Set.
-	 */
-	public void setAdditionalstatistics(ItemI v) throws Exception{
-		_Additionalstatistics =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/additionalStatistics",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/additionalStatistics",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * additionalStatistics
-	 * Adds org.nrg.xdat.model.XnatStatisticsdataAdditionalstatisticsI
-	 */
-	public <A extends org.nrg.xdat.model.XnatStatisticsdataAdditionalstatisticsI> void addAdditionalstatistics(A item) throws Exception{
-	setAdditionalstatistics((ItemI)item);
-	}
-
-	/**
-	 * Removes the additionalStatistics of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeAdditionalstatistics(int index) throws java.lang.IndexOutOfBoundsException {
-		_Additionalstatistics =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/additionalStatistics",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield> _Addfield =null;
-
-	/**
-	 * addField
-	 * @return Returns an List of org.nrg.xdat.om.XnatStatisticsdataAddfield
-	 */
-	public <A extends org.nrg.xdat.model.XnatStatisticsdataAddfieldI> List<A> getAddfield() {
-		try{
-			if (_Addfield==null){
-				_Addfield=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("addField"));
-			}
-			return (List<A>) _Addfield;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield>();}
-	}
-
-	/**
-	 * Sets the value for addField.
-	 * @param v Value to Set.
-	 */
-	public void setAddfield(ItemI v) throws Exception{
-		_Addfield =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/addField",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/addField",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * addField
-	 * Adds org.nrg.xdat.model.XnatStatisticsdataAddfieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatStatisticsdataAddfieldI> void addAddfield(A item) throws Exception{
-	setAddfield((ItemI)item);
-	}
-
-	/**
-	 * Removes the addField of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeAddfield(int index) throws java.lang.IndexOutOfBoundsException {
-		_Addfield =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/addField",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdata> getAllXnatStatisticsdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdata> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdata> getXnatStatisticsdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdata> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdata> getXnatStatisticsdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdata> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatStatisticsdata getXnatStatisticsdatasByXnatAbstractstatisticsId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:statisticsData/xnat_abstractstatistics_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatStatisticsdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //abstractStatistics
-	        XnatAbstractstatistics childAbstractstatistics = (XnatAbstractstatistics)this.getAbstractstatistics();
-	            if (childAbstractstatistics!=null){
-	              for(ResourceFile rf: ((XnatAbstractstatistics)childAbstractstatistics).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("abstractStatistics[" + ((XnatAbstractstatistics)childAbstractstatistics).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("abstractStatistics/" + ((XnatAbstractstatistics)childAbstractstatistics).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //additionalStatistics
-	        for(org.nrg.xdat.model.XnatStatisticsdataAdditionalstatisticsI childAdditionalstatistics : this.getAdditionalstatistics()){
-	            if (childAdditionalstatistics!=null){
-	              for(ResourceFile rf: ((XnatStatisticsdataAdditionalstatistics)childAdditionalstatistics).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("additionalStatistics[" + ((XnatStatisticsdataAdditionalstatistics)childAdditionalstatistics).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("additionalStatistics/" + ((XnatStatisticsdataAdditionalstatistics)childAdditionalstatistics).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //addField
-	        for(org.nrg.xdat.model.XnatStatisticsdataAddfieldI childAddfield : this.getAddfield()){
-	            if (childAddfield!=null){
-	              for(ResourceFile rf: ((XnatStatisticsdataAddfield)childAddfield).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("addField[" + ((XnatStatisticsdataAddfield)childAddfield).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("addField/" + ((XnatStatisticsdataAddfield)childAddfield).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdataAddfield.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdataAddfield.java
deleted file mode 100644
index bce4e0c8..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdataAddfield.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatStatisticsdataAddfield extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatStatisticsdataAddfieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatStatisticsdataAddfield.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:statisticsData_addField";
-
-	public AutoXnatStatisticsdataAddfield(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatStatisticsdataAddfield(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatStatisticsdataAddfield(UserI user)
-	 **/
-	public AutoXnatStatisticsdataAddfield(){}
-
-	public AutoXnatStatisticsdataAddfield(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:statisticsData_addField";
-	}
-
-	//FIELD
-
-	private String _Addfield=null;
-
-	/**
-	 * @return Returns the addField.
-	 */
-	public String getAddfield(){
-		try{
-			if (_Addfield==null){
-				_Addfield=getStringProperty("addField");
-				return _Addfield;
-			}else {
-				return _Addfield;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for addField.
-	 * @param v Value to Set.
-	 */
-	public void setAddfield(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/addField",v);
-		_Addfield=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatStatisticsdataAddfieldId=null;
-
-	/**
-	 * @return Returns the xnat_statisticsData_addField_id.
-	 */
-	public Integer getXnatStatisticsdataAddfieldId() {
-		try{
-			if (_XnatStatisticsdataAddfieldId==null){
-				_XnatStatisticsdataAddfieldId=getIntegerProperty("xnat_statisticsData_addField_id");
-				return _XnatStatisticsdataAddfieldId;
-			}else {
-				return _XnatStatisticsdataAddfieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_statisticsData_addField_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatStatisticsdataAddfieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_statisticsData_addField_id",v);
-		_XnatStatisticsdataAddfieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield> getAllXnatStatisticsdataAddfields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield> getXnatStatisticsdataAddfieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield> getXnatStatisticsdataAddfieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdataAddfield>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatStatisticsdataAddfield getXnatStatisticsdataAddfieldsByXnatStatisticsdataAddfieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:statisticsData_addField/xnat_statisticsData_addField_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatStatisticsdataAddfield) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdataAdditionalstatistics.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdataAdditionalstatistics.java
deleted file mode 100644
index d59db6cc..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStatisticsdataAdditionalstatistics.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatStatisticsdataAdditionalstatistics extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatStatisticsdataAdditionalstatisticsI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatStatisticsdataAdditionalstatistics.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:statisticsData_additionalStatistics";
-
-	public AutoXnatStatisticsdataAdditionalstatistics(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatStatisticsdataAdditionalstatistics(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatStatisticsdataAdditionalstatistics(UserI user)
-	 **/
-	public AutoXnatStatisticsdataAdditionalstatistics(){}
-
-	public AutoXnatStatisticsdataAdditionalstatistics(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:statisticsData_additionalStatistics";
-	}
-
-	//FIELD
-
-	private Double _Additionalstatistics=null;
-
-	/**
-	 * @return Returns the additionalStatistics.
-	 */
-	public Double getAdditionalstatistics() {
-		try{
-			if (_Additionalstatistics==null){
-				_Additionalstatistics=getDoubleProperty("additionalStatistics");
-				return _Additionalstatistics;
-			}else {
-				return _Additionalstatistics;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for additionalStatistics.
-	 * @param v Value to Set.
-	 */
-	public void setAdditionalstatistics(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/additionalStatistics",v);
-		_Additionalstatistics=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatStatisticsdataAdditionalstatisticsId=null;
-
-	/**
-	 * @return Returns the xnat_statisticsData_additionalStatistics_id.
-	 */
-	public Integer getXnatStatisticsdataAdditionalstatisticsId() {
-		try{
-			if (_XnatStatisticsdataAdditionalstatisticsId==null){
-				_XnatStatisticsdataAdditionalstatisticsId=getIntegerProperty("xnat_statisticsData_additionalStatistics_id");
-				return _XnatStatisticsdataAdditionalstatisticsId;
-			}else {
-				return _XnatStatisticsdataAdditionalstatisticsId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_statisticsData_additionalStatistics_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatStatisticsdataAdditionalstatisticsId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_statisticsData_additionalStatistics_id",v);
-		_XnatStatisticsdataAdditionalstatisticsId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics> getAllXnatStatisticsdataAdditionalstatisticss(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics> getXnatStatisticsdataAdditionalstatisticssByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics> getXnatStatisticsdataAdditionalstatisticssByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics> al = new ArrayList<org.nrg.xdat.om.XnatStatisticsdataAdditionalstatistics>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatStatisticsdataAdditionalstatistics getXnatStatisticsdataAdditionalstatisticssByXnatStatisticsdataAdditionalstatisticsId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:statisticsData_additionalStatistics/xnat_statisticsData_additionalStatistics_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatStatisticsdataAdditionalstatistics) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocol.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocol.java
deleted file mode 100644
index dd1adb13..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocol.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatStudyprotocol extends XnatAbstractprotocol implements org.nrg.xdat.model.XnatStudyprotocolI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatStudyprotocol.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:studyProtocol";
-
-	public AutoXnatStudyprotocol(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatStudyprotocol(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatStudyprotocol(UserI user)
-	 **/
-	public AutoXnatStudyprotocol(){}
-
-	public AutoXnatStudyprotocol(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:studyProtocol";
-	}
-	 private org.nrg.xdat.om.XnatAbstractprotocol _Abstractprotocol =null;
-
-	/**
-	 * abstractProtocol
-	 * @return org.nrg.xdat.om.XnatAbstractprotocol
-	 */
-	public org.nrg.xdat.om.XnatAbstractprotocol getAbstractprotocol() {
-		try{
-			if (_Abstractprotocol==null){
-				_Abstractprotocol=((XnatAbstractprotocol)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractProtocol")));
-				return _Abstractprotocol;
-			}else {
-				return _Abstractprotocol;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractProtocol.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractprotocol(ItemI v) throws Exception{
-		_Abstractprotocol =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractProtocol",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractProtocol",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractProtocol
-	 * set org.nrg.xdat.model.XnatAbstractprotocolI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractprotocolI> void setAbstractprotocol(A item) throws Exception{
-	setAbstractprotocol((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractProtocol.
-	 * */
-	public void removeAbstractprotocol() {
-		_Abstractprotocol =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractProtocol",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition> _Acqconditions_condition =null;
-
-	/**
-	 * acqConditions/condition
-	 * @return Returns an List of org.nrg.xdat.om.XnatStudyprotocolCondition
-	 */
-	public <A extends org.nrg.xdat.model.XnatStudyprotocolConditionI> List<A> getAcqconditions_condition() {
-		try{
-			if (_Acqconditions_condition==null){
-				_Acqconditions_condition=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("acqConditions/condition"));
-			}
-			return (List<A>) _Acqconditions_condition;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition>();}
-	}
-
-	/**
-	 * Sets the value for acqConditions/condition.
-	 * @param v Value to Set.
-	 */
-	public void setAcqconditions_condition(ItemI v) throws Exception{
-		_Acqconditions_condition =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/acqConditions/condition",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/acqConditions/condition",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * acqConditions/condition
-	 * Adds org.nrg.xdat.model.XnatStudyprotocolConditionI
-	 */
-	public <A extends org.nrg.xdat.model.XnatStudyprotocolConditionI> void addAcqconditions_condition(A item) throws Exception{
-	setAcqconditions_condition((ItemI)item);
-	}
-
-	/**
-	 * Removes the acqConditions/condition of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeAcqconditions_condition(int index) throws java.lang.IndexOutOfBoundsException {
-		_Acqconditions_condition =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/acqConditions/condition",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup> _Subjectgroups_group =null;
-
-	/**
-	 * subjectGroups/group
-	 * @return Returns an List of org.nrg.xdat.om.XnatStudyprotocolGroup
-	 */
-	public <A extends org.nrg.xdat.model.XnatStudyprotocolGroupI> List<A> getSubjectgroups_group() {
-		try{
-			if (_Subjectgroups_group==null){
-				_Subjectgroups_group=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("subjectGroups/group"));
-			}
-			return (List<A>) _Subjectgroups_group;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup>();}
-	}
-
-	/**
-	 * Sets the value for subjectGroups/group.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectgroups_group(ItemI v) throws Exception{
-		_Subjectgroups_group =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectGroups/group",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectGroups/group",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectGroups/group
-	 * Adds org.nrg.xdat.model.XnatStudyprotocolGroupI
-	 */
-	public <A extends org.nrg.xdat.model.XnatStudyprotocolGroupI> void addSubjectgroups_group(A item) throws Exception{
-	setSubjectgroups_group((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectGroups/group of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSubjectgroups_group(int index) throws java.lang.IndexOutOfBoundsException {
-		_Subjectgroups_group =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectGroups/group",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable> _Subjectvariables_variable =null;
-
-	/**
-	 * subjectVariables/variable
-	 * @return Returns an List of org.nrg.xdat.om.XnatStudyprotocolVariable
-	 */
-	public <A extends org.nrg.xdat.model.XnatStudyprotocolVariableI> List<A> getSubjectvariables_variable() {
-		try{
-			if (_Subjectvariables_variable==null){
-				_Subjectvariables_variable=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("subjectVariables/variable"));
-			}
-			return (List<A>) _Subjectvariables_variable;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable>();}
-	}
-
-	/**
-	 * Sets the value for subjectVariables/variable.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectvariables_variable(ItemI v) throws Exception{
-		_Subjectvariables_variable =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectVariables/variable",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectVariables/variable",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectVariables/variable
-	 * Adds org.nrg.xdat.model.XnatStudyprotocolVariableI
-	 */
-	public <A extends org.nrg.xdat.model.XnatStudyprotocolVariableI> void addSubjectvariables_variable(A item) throws Exception{
-	setSubjectvariables_variable((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectVariables/variable of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSubjectvariables_variable(int index) throws java.lang.IndexOutOfBoundsException {
-		_Subjectvariables_variable =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectVariables/variable",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession> _Imagesessiontypes_session =null;
-
-	/**
-	 * imageSessionTypes/session
-	 * @return Returns an List of org.nrg.xdat.om.XnatStudyprotocolSession
-	 */
-	public <A extends org.nrg.xdat.model.XnatStudyprotocolSessionI> List<A> getImagesessiontypes_session() {
-		try{
-			if (_Imagesessiontypes_session==null){
-				_Imagesessiontypes_session=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("imageSessionTypes/session"));
-			}
-			return (List<A>) _Imagesessiontypes_session;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession>();}
-	}
-
-	/**
-	 * Sets the value for imageSessionTypes/session.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiontypes_session(ItemI v) throws Exception{
-		_Imagesessiontypes_session =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionTypes/session",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionTypes/session",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionTypes/session
-	 * Adds org.nrg.xdat.model.XnatStudyprotocolSessionI
-	 */
-	public <A extends org.nrg.xdat.model.XnatStudyprotocolSessionI> void addImagesessiontypes_session(A item) throws Exception{
-	setImagesessiontypes_session((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionTypes/session of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeImagesessiontypes_session(int index) throws java.lang.IndexOutOfBoundsException {
-		_Imagesessiontypes_session =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionTypes/session",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocol> getAllXnatStudyprotocols(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocol> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocol>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocol> getXnatStudyprotocolsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocol> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocol>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocol> getXnatStudyprotocolsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocol> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocol>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatStudyprotocol getXnatStudyprotocolsByXnatAbstractprotocolId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:studyProtocol/xnat_abstractprotocol_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatStudyprotocol) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //abstractProtocol
-	        XnatAbstractprotocol childAbstractprotocol = (XnatAbstractprotocol)this.getAbstractprotocol();
-	            if (childAbstractprotocol!=null){
-	              for(ResourceFile rf: ((XnatAbstractprotocol)childAbstractprotocol).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("abstractProtocol[" + ((XnatAbstractprotocol)childAbstractprotocol).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("abstractProtocol/" + ((XnatAbstractprotocol)childAbstractprotocol).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //acqConditions/condition
-	        for(org.nrg.xdat.model.XnatStudyprotocolConditionI childAcqconditions_condition : this.getAcqconditions_condition()){
-	            if (childAcqconditions_condition!=null){
-	              for(ResourceFile rf: ((XnatStudyprotocolCondition)childAcqconditions_condition).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("acqConditions/condition[" + ((XnatStudyprotocolCondition)childAcqconditions_condition).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("acqConditions/condition/" + ((XnatStudyprotocolCondition)childAcqconditions_condition).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //subjectGroups/group
-	        for(org.nrg.xdat.model.XnatStudyprotocolGroupI childSubjectgroups_group : this.getSubjectgroups_group()){
-	            if (childSubjectgroups_group!=null){
-	              for(ResourceFile rf: ((XnatStudyprotocolGroup)childSubjectgroups_group).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectGroups/group[" + ((XnatStudyprotocolGroup)childSubjectgroups_group).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectGroups/group/" + ((XnatStudyprotocolGroup)childSubjectgroups_group).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //subjectVariables/variable
-	        for(org.nrg.xdat.model.XnatStudyprotocolVariableI childSubjectvariables_variable : this.getSubjectvariables_variable()){
-	            if (childSubjectvariables_variable!=null){
-	              for(ResourceFile rf: ((XnatStudyprotocolVariable)childSubjectvariables_variable).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectVariables/variable[" + ((XnatStudyprotocolVariable)childSubjectvariables_variable).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectVariables/variable/" + ((XnatStudyprotocolVariable)childSubjectvariables_variable).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //imageSessionTypes/session
-	        for(org.nrg.xdat.model.XnatStudyprotocolSessionI childImagesessiontypes_session : this.getImagesessiontypes_session()){
-	            if (childImagesessiontypes_session!=null){
-	              for(ResourceFile rf: ((XnatStudyprotocolSession)childImagesessiontypes_session).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionTypes/session[" + ((XnatStudyprotocolSession)childImagesessiontypes_session).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionTypes/session/" + ((XnatStudyprotocolSession)childImagesessiontypes_session).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolCondition.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolCondition.java
deleted file mode 100644
index 54f8bbff..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolCondition.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatStudyprotocolCondition extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatStudyprotocolConditionI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatStudyprotocolCondition.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:studyProtocol_condition";
-
-	public AutoXnatStudyprotocolCondition(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatStudyprotocolCondition(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatStudyprotocolCondition(UserI user)
-	 **/
-	public AutoXnatStudyprotocolCondition(){}
-
-	public AutoXnatStudyprotocolCondition(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:studyProtocol_condition";
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatStudyprotocolConditionId=null;
-
-	/**
-	 * @return Returns the xnat_studyProtocol_condition_id.
-	 */
-	public Integer getXnatStudyprotocolConditionId() {
-		try{
-			if (_XnatStudyprotocolConditionId==null){
-				_XnatStudyprotocolConditionId=getIntegerProperty("xnat_studyProtocol_condition_id");
-				return _XnatStudyprotocolConditionId;
-			}else {
-				return _XnatStudyprotocolConditionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_studyProtocol_condition_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatStudyprotocolConditionId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_studyProtocol_condition_id",v);
-		_XnatStudyprotocolConditionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition> getAllXnatStudyprotocolConditions(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition> getXnatStudyprotocolConditionsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition> getXnatStudyprotocolConditionsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolCondition>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatStudyprotocolCondition getXnatStudyprotocolConditionsByXnatStudyprotocolConditionId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:studyProtocol_condition/xnat_studyProtocol_condition_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatStudyprotocolCondition) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolGroup.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolGroup.java
deleted file mode 100644
index 3d1c4f2d..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolGroup.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatStudyprotocolGroup extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatStudyprotocolGroupI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatStudyprotocolGroup.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:studyProtocol_group";
-
-	public AutoXnatStudyprotocolGroup(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatStudyprotocolGroup(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatStudyprotocolGroup(UserI user)
-	 **/
-	public AutoXnatStudyprotocolGroup(){}
-
-	public AutoXnatStudyprotocolGroup(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:studyProtocol_group";
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatStudyprotocolGroupId=null;
-
-	/**
-	 * @return Returns the xnat_studyProtocol_group_id.
-	 */
-	public Integer getXnatStudyprotocolGroupId() {
-		try{
-			if (_XnatStudyprotocolGroupId==null){
-				_XnatStudyprotocolGroupId=getIntegerProperty("xnat_studyProtocol_group_id");
-				return _XnatStudyprotocolGroupId;
-			}else {
-				return _XnatStudyprotocolGroupId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_studyProtocol_group_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatStudyprotocolGroupId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_studyProtocol_group_id",v);
-		_XnatStudyprotocolGroupId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup> getAllXnatStudyprotocolGroups(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup> getXnatStudyprotocolGroupsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup> getXnatStudyprotocolGroupsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolGroup>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatStudyprotocolGroup getXnatStudyprotocolGroupsByXnatStudyprotocolGroupId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:studyProtocol_group/xnat_studyProtocol_group_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatStudyprotocolGroup) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolSession.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolSession.java
deleted file mode 100644
index bccbc4b1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolSession.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatStudyprotocolSession extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatStudyprotocolSessionI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatStudyprotocolSession.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:studyProtocol_session";
-
-	public AutoXnatStudyprotocolSession(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatStudyprotocolSession(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatStudyprotocolSession(UserI user)
-	 **/
-	public AutoXnatStudyprotocolSession(){}
-
-	public AutoXnatStudyprotocolSession(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:studyProtocol_session";
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatStudyprotocolSessionId=null;
-
-	/**
-	 * @return Returns the xnat_studyProtocol_session_id.
-	 */
-	public Integer getXnatStudyprotocolSessionId() {
-		try{
-			if (_XnatStudyprotocolSessionId==null){
-				_XnatStudyprotocolSessionId=getIntegerProperty("xnat_studyProtocol_session_id");
-				return _XnatStudyprotocolSessionId;
-			}else {
-				return _XnatStudyprotocolSessionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_studyProtocol_session_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatStudyprotocolSessionId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_studyProtocol_session_id",v);
-		_XnatStudyprotocolSessionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession> getAllXnatStudyprotocolSessions(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession> getXnatStudyprotocolSessionsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession> getXnatStudyprotocolSessionsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolSession>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatStudyprotocolSession getXnatStudyprotocolSessionsByXnatStudyprotocolSessionId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:studyProtocol_session/xnat_studyProtocol_session_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatStudyprotocolSession) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolVariable.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolVariable.java
deleted file mode 100644
index e20f20cf..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatStudyprotocolVariable.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatStudyprotocolVariable extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatStudyprotocolVariableI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatStudyprotocolVariable.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:studyProtocol_variable";
-
-	public AutoXnatStudyprotocolVariable(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatStudyprotocolVariable(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatStudyprotocolVariable(UserI user)
-	 **/
-	public AutoXnatStudyprotocolVariable(){}
-
-	public AutoXnatStudyprotocolVariable(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:studyProtocol_variable";
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Description=null;
-
-	/**
-	 * @return Returns the description.
-	 */
-	public String getDescription(){
-		try{
-			if (_Description==null){
-				_Description=getStringProperty("description");
-				return _Description;
-			}else {
-				return _Description;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for description.
-	 * @param v Value to Set.
-	 */
-	public void setDescription(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/description",v);
-		_Description=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatStudyprotocolVariableId=null;
-
-	/**
-	 * @return Returns the xnat_studyProtocol_variable_id.
-	 */
-	public Integer getXnatStudyprotocolVariableId() {
-		try{
-			if (_XnatStudyprotocolVariableId==null){
-				_XnatStudyprotocolVariableId=getIntegerProperty("xnat_studyProtocol_variable_id");
-				return _XnatStudyprotocolVariableId;
-			}else {
-				return _XnatStudyprotocolVariableId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_studyProtocol_variable_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatStudyprotocolVariableId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_studyProtocol_variable_id",v);
-		_XnatStudyprotocolVariableId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable> getAllXnatStudyprotocolVariables(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable> getXnatStudyprotocolVariablesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable> getXnatStudyprotocolVariablesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable> al = new ArrayList<org.nrg.xdat.om.XnatStudyprotocolVariable>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatStudyprotocolVariable getXnatStudyprotocolVariablesByXnatStudyprotocolVariableId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:studyProtocol_variable/xnat_studyProtocol_variable_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatStudyprotocolVariable) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectassessordata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectassessordata.java
deleted file mode 100644
index 93c1dcf7..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectassessordata.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSubjectassessordata extends XnatExperimentdata implements org.nrg.xdat.model.XnatSubjectassessordataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSubjectassessordata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:subjectAssessorData";
-
-	public AutoXnatSubjectassessordata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSubjectassessordata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSubjectassessordata(UserI user)
-	 **/
-	public AutoXnatSubjectassessordata(){}
-
-	public AutoXnatSubjectassessordata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:subjectAssessorData";
-	}
-	 private org.nrg.xdat.om.XnatExperimentdata _Experimentdata =null;
-
-	/**
-	 * experimentData
-	 * @return org.nrg.xdat.om.XnatExperimentdata
-	 */
-	public org.nrg.xdat.om.XnatExperimentdata getExperimentdata() {
-		try{
-			if (_Experimentdata==null){
-				_Experimentdata=((XnatExperimentdata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("experimentData")));
-				return _Experimentdata;
-			}else {
-				return _Experimentdata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for experimentData.
-	 * @param v Value to Set.
-	 */
-	public void setExperimentdata(ItemI v) throws Exception{
-		_Experimentdata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/experimentData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/experimentData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * experimentData
-	 * set org.nrg.xdat.model.XnatExperimentdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatExperimentdataI> void setExperimentdata(A item) throws Exception{
-	setExperimentdata((ItemI)item);
-	}
-
-	/**
-	 * Removes the experimentData.
-	 * */
-	public void removeExperimentdata() {
-		_Experimentdata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/experimentData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _SubjectId=null;
-
-	/**
-	 * @return Returns the subject_ID.
-	 */
-	public String getSubjectId(){
-		try{
-			if (_SubjectId==null){
-				_SubjectId=getStringProperty("subject_ID");
-				return _SubjectId;
-			}else {
-				return _SubjectId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for subject_ID.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/subject_ID",v);
-		_SubjectId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Age=null;
-
-	/**
-	 * @return Returns the age.
-	 */
-	public Double getAge() {
-		try{
-			if (_Age==null){
-				_Age=getDoubleProperty("age");
-				return _Age;
-			}else {
-				return _Age;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for age.
-	 * @param v Value to Set.
-	 */
-	public void setAge(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/age",v);
-		_Age=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectassessordata> getAllXnatSubjectassessordatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectassessordata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectassessordata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectassessordata> getXnatSubjectassessordatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectassessordata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectassessordata> getXnatSubjectassessordatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectassessordata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectassessordata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSubjectassessordata getXnatSubjectassessordatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:subjectAssessorData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSubjectassessordata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //experimentData
-	        XnatExperimentdata childExperimentdata = (XnatExperimentdata)this.getExperimentdata();
-	            if (childExperimentdata!=null){
-	              for(ResourceFile rf: ((XnatExperimentdata)childExperimentdata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("experimentData[" + ((XnatExperimentdata)childExperimentdata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("experimentData/" + ((XnatExperimentdata)childExperimentdata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdata.java
deleted file mode 100644
index 56e535d2..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdata.java
+++ /dev/null
@@ -1,890 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSubjectdata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatSubjectdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSubjectdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:subjectData";
-
-	public AutoXnatSubjectdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSubjectdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSubjectdata(UserI user)
-	 **/
-	public AutoXnatSubjectdata(){}
-
-	public AutoXnatSubjectdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:subjectData";
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatProjectparticipant> _Sharing_share =null;
-
-	/**
-	 * sharing/share
-	 * @return Returns an List of org.nrg.xdat.om.XnatProjectparticipant
-	 */
-	public <A extends org.nrg.xdat.model.XnatProjectparticipantI> List<A> getSharing_share() {
-		try{
-			if (_Sharing_share==null){
-				_Sharing_share=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("sharing/share"));
-			}
-			return (List<A>) _Sharing_share;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatProjectparticipant>();}
-	}
-
-	/**
-	 * Sets the value for sharing/share.
-	 * @param v Value to Set.
-	 */
-	public void setSharing_share(ItemI v) throws Exception{
-		_Sharing_share =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sharing/share",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/sharing/share",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * sharing/share
-	 * Adds org.nrg.xdat.model.XnatProjectparticipantI
-	 */
-	public <A extends org.nrg.xdat.model.XnatProjectparticipantI> void addSharing_share(A item) throws Exception{
-	setSharing_share((ItemI)item);
-	}
-
-	/**
-	 * Removes the sharing/share of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSharing_share(int index) throws java.lang.IndexOutOfBoundsException {
-		_Sharing_share =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/sharing/share",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatAbstractresource> _Resources_resource =null;
-
-	/**
-	 * resources/resource
-	 * @return Returns an List of org.nrg.xdat.om.XnatAbstractresource
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> List<A> getResources_resource() {
-		try{
-			if (_Resources_resource==null){
-				_Resources_resource=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("resources/resource"));
-			}
-			return (List<A>) _Resources_resource;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatAbstractresource>();}
-	}
-
-	/**
-	 * Sets the value for resources/resource.
-	 * @param v Value to Set.
-	 */
-	public void setResources_resource(ItemI v) throws Exception{
-		_Resources_resource =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resources/resource",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/resources/resource",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * resources/resource
-	 * Adds org.nrg.xdat.model.XnatAbstractresourceI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractresourceI> void addResources_resource(A item) throws Exception{
-	setResources_resource((ItemI)item);
-	}
-
-	/**
-	 * Removes the resources/resource of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeResources_resource(int index) throws java.lang.IndexOutOfBoundsException {
-		_Resources_resource =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/resources/resource",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatInvestigatordata _Investigator =null;
-
-	/**
-	 * investigator
-	 * @return org.nrg.xdat.om.XnatInvestigatordata
-	 */
-	public org.nrg.xdat.om.XnatInvestigatordata getInvestigator() {
-		try{
-			if (_Investigator==null){
-				_Investigator=((XnatInvestigatordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("investigator")));
-				return _Investigator;
-			}else {
-				return _Investigator;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for investigator.
-	 * @param v Value to Set.
-	 */
-	public void setInvestigator(ItemI v) throws Exception{
-		_Investigator =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/investigator",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/investigator",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * investigator
-	 * set org.nrg.xdat.model.XnatInvestigatordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatInvestigatordataI> void setInvestigator(A item) throws Exception{
-	setInvestigator((ItemI)item);
-	}
-
-	/**
-	 * Removes the investigator.
-	 * */
-	public void removeInvestigator() {
-		_Investigator =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/investigator",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _InvestigatorFK=null;
-
-	/**
-	 * @return Returns the xnat:subjectData/investigator_xnat_investigatordata_id.
-	 */
-	public Integer getInvestigatorFK(){
-		try{
-			if (_InvestigatorFK==null){
-				_InvestigatorFK=getIntegerProperty("xnat:subjectData/investigator_xnat_investigatordata_id");
-				return _InvestigatorFK;
-			}else {
-				return _InvestigatorFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:subjectData/investigator_xnat_investigatordata_id.
-	 * @param v Value to Set.
-	 */
-	public void setInvestigatorFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/investigator_xnat_investigatordata_id",v);
-		_InvestigatorFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatAbstractdemographicdata _Demographics =null;
-
-	/**
-	 * demographics
-	 * @return org.nrg.xdat.om.XnatAbstractdemographicdata
-	 */
-	public org.nrg.xdat.om.XnatAbstractdemographicdata getDemographics() {
-		try{
-			if (_Demographics==null){
-				_Demographics=((XnatAbstractdemographicdata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("demographics")));
-				return _Demographics;
-			}else {
-				return _Demographics;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for demographics.
-	 * @param v Value to Set.
-	 */
-	public void setDemographics(ItemI v) throws Exception{
-		_Demographics =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/demographics",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/demographics",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * demographics
-	 * set org.nrg.xdat.model.XnatAbstractdemographicdataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractdemographicdataI> void setDemographics(A item) throws Exception{
-	setDemographics((ItemI)item);
-	}
-
-	/**
-	 * Removes the demographics.
-	 * */
-	public void removeDemographics() {
-		_Demographics =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/demographics",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _DemographicsFK=null;
-
-	/**
-	 * @return Returns the xnat:subjectData/demographics_xnat_abstractdemographicdata_id.
-	 */
-	public Integer getDemographicsFK(){
-		try{
-			if (_DemographicsFK==null){
-				_DemographicsFK=getIntegerProperty("xnat:subjectData/demographics_xnat_abstractdemographicdata_id");
-				return _DemographicsFK;
-			}else {
-				return _DemographicsFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:subjectData/demographics_xnat_abstractdemographicdata_id.
-	 * @param v Value to Set.
-	 */
-	public void setDemographicsFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/demographics_xnat_abstractdemographicdata_id",v);
-		_DemographicsFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatAbstractsubjectmetadata _Metadata =null;
-
-	/**
-	 * metadata
-	 * @return org.nrg.xdat.om.XnatAbstractsubjectmetadata
-	 */
-	public org.nrg.xdat.om.XnatAbstractsubjectmetadata getMetadata() {
-		try{
-			if (_Metadata==null){
-				_Metadata=((XnatAbstractsubjectmetadata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("metadata")));
-				return _Metadata;
-			}else {
-				return _Metadata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for metadata.
-	 * @param v Value to Set.
-	 */
-	public void setMetadata(ItemI v) throws Exception{
-		_Metadata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/metadata",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/metadata",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * metadata
-	 * set org.nrg.xdat.model.XnatAbstractsubjectmetadataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractsubjectmetadataI> void setMetadata(A item) throws Exception{
-	setMetadata((ItemI)item);
-	}
-
-	/**
-	 * Removes the metadata.
-	 * */
-	public void removeMetadata() {
-		_Metadata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/metadata",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _MetadataFK=null;
-
-	/**
-	 * @return Returns the xnat:subjectData/metadata_xnat_abstractsubjectmetadata_id.
-	 */
-	public Integer getMetadataFK(){
-		try{
-			if (_MetadataFK==null){
-				_MetadataFK=getIntegerProperty("xnat:subjectData/metadata_xnat_abstractsubjectmetadata_id");
-				return _MetadataFK;
-			}else {
-				return _MetadataFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:subjectData/metadata_xnat_abstractsubjectmetadata_id.
-	 * @param v Value to Set.
-	 */
-	public void setMetadataFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/metadata_xnat_abstractsubjectmetadata_id",v);
-		_MetadataFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid> _Addid =null;
-
-	/**
-	 * addID
-	 * @return Returns an List of org.nrg.xdat.om.XnatSubjectdataAddid
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectdataAddidI> List<A> getAddid() {
-		try{
-			if (_Addid==null){
-				_Addid=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("addID"));
-			}
-			return (List<A>) _Addid;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid>();}
-	}
-
-	/**
-	 * Sets the value for addID.
-	 * @param v Value to Set.
-	 */
-	public void setAddid(ItemI v) throws Exception{
-		_Addid =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/addID",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/addID",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * addID
-	 * Adds org.nrg.xdat.model.XnatSubjectdataAddidI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectdataAddidI> void addAddid(A item) throws Exception{
-	setAddid((ItemI)item);
-	}
-
-	/**
-	 * Removes the addID of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeAddid(int index) throws java.lang.IndexOutOfBoundsException {
-		_Addid =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/addID",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatSubjectdataField> _Fields_field =null;
-
-	/**
-	 * fields/field
-	 * @return Returns an List of org.nrg.xdat.om.XnatSubjectdataField
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectdataFieldI> List<A> getFields_field() {
-		try{
-			if (_Fields_field==null){
-				_Fields_field=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("fields/field"));
-			}
-			return (List<A>) _Fields_field;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatSubjectdataField>();}
-	}
-
-	/**
-	 * Sets the value for fields/field.
-	 * @param v Value to Set.
-	 */
-	public void setFields_field(ItemI v) throws Exception{
-		_Fields_field =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/fields/field",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * fields/field
-	 * Adds org.nrg.xdat.model.XnatSubjectdataFieldI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectdataFieldI> void addFields_field(A item) throws Exception{
-	setFields_field((ItemI)item);
-	}
-
-	/**
-	 * Removes the fields/field of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeFields_field(int index) throws java.lang.IndexOutOfBoundsException {
-		_Fields_field =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/fields/field",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatSubjectassessordata> _Experiments_experiment =null;
-
-	/**
-	 * experiments/experiment
-	 * @return Returns an List of org.nrg.xdat.om.XnatSubjectassessordata
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> List<A> getExperiments_experiment() {
-		try{
-			if (_Experiments_experiment==null){
-				_Experiments_experiment=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("experiments/experiment"));
-			}
-			return (List<A>) _Experiments_experiment;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatSubjectassessordata>();}
-	}
-
-	/**
-	 * Sets the value for experiments/experiment.
-	 * @param v Value to Set.
-	 */
-	public void setExperiments_experiment(ItemI v) throws Exception{
-		_Experiments_experiment =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/experiments/experiment",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/experiments/experiment",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * experiments/experiment
-	 * Adds org.nrg.xdat.model.XnatSubjectassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> void addExperiments_experiment(A item) throws Exception{
-	setExperiments_experiment((ItemI)item);
-	}
-
-	/**
-	 * Removes the experiments/experiment of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeExperiments_experiment(int index) throws java.lang.IndexOutOfBoundsException {
-		_Experiments_experiment =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/experiments/experiment",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Id=null;
-
-	/**
-	 * @return Returns the ID.
-	 */
-	public String getId(){
-		try{
-			if (_Id==null){
-				_Id=getStringProperty("ID");
-				return _Id;
-			}else {
-				return _Id;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for ID.
-	 * @param v Value to Set.
-	 */
-	public void setId(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/ID",v);
-		_Id=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Project=null;
-
-	/**
-	 * @return Returns the project.
-	 */
-	public String getProject(){
-		try{
-			if (_Project==null){
-				_Project=getStringProperty("project");
-				return _Project;
-			}else {
-				return _Project;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for project.
-	 * @param v Value to Set.
-	 */
-	public void setProject(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/project",v);
-		_Project=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Group=null;
-
-	/**
-	 * @return Returns the group.
-	 */
-	public String getGroup(){
-		try{
-			if (_Group==null){
-				_Group=getStringProperty("group");
-				return _Group;
-			}else {
-				return _Group;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for group.
-	 * @param v Value to Set.
-	 */
-	public void setGroup(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/group",v);
-		_Group=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Label=null;
-
-	/**
-	 * @return Returns the label.
-	 */
-	public String getLabel(){
-		try{
-			if (_Label==null){
-				_Label=getStringProperty("label");
-				return _Label;
-			}else {
-				return _Label;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for label.
-	 * @param v Value to Set.
-	 */
-	public void setLabel(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/label",v);
-		_Label=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Src=null;
-
-	/**
-	 * @return Returns the src.
-	 */
-	public String getSrc(){
-		try{
-			if (_Src==null){
-				_Src=getStringProperty("src");
-				return _Src;
-			}else {
-				return _Src;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for src.
-	 * @param v Value to Set.
-	 */
-	public void setSrc(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/src",v);
-		_Src=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Initials=null;
-
-	/**
-	 * @return Returns the initials.
-	 */
-	public String getInitials(){
-		try{
-			if (_Initials==null){
-				_Initials=getStringProperty("initials");
-				return _Initials;
-			}else {
-				return _Initials;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for initials.
-	 * @param v Value to Set.
-	 */
-	public void setInitials(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/initials",v);
-		_Initials=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdata> getAllXnatSubjectdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdata> getXnatSubjectdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdata> getXnatSubjectdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSubjectdata getXnatSubjectdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:subjectData/ID",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSubjectdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //sharing/share
-	        for(org.nrg.xdat.model.XnatProjectparticipantI childSharing_share : this.getSharing_share()){
-	            if (childSharing_share!=null){
-	              for(ResourceFile rf: ((XnatProjectparticipant)childSharing_share).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("sharing/share[" + ((XnatProjectparticipant)childSharing_share).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("sharing/share/" + ((XnatProjectparticipant)childSharing_share).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //resources/resource
-	        for(org.nrg.xdat.model.XnatAbstractresourceI childResources_resource : this.getResources_resource()){
-	            if (childResources_resource!=null){
-	              int counterResources_resource=0;
-	              for(java.io.File f: ((XnatAbstractresource)childResources_resource).getCorrespondingFiles(rootPath)){
-	                 ResourceFile rf = new ResourceFile(f);
-	                 rf.setXpath("resources/resource[xnat_abstractresource_id=" + ((XnatAbstractresource)childResources_resource).getXnatAbstractresourceId() + "]/file/" + counterResources_resource +"");
-	                 rf.setXdatPath("resources/resource/" + ((XnatAbstractresource)childResources_resource).getXnatAbstractresourceId() + "/" + counterResources_resource++);
-	                 rf.setSize(f.length());
-	                 rf.setAbsolutePath(f.getAbsolutePath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //investigator
-	        XnatInvestigatordata childInvestigator = (XnatInvestigatordata)this.getInvestigator();
-	            if (childInvestigator!=null){
-	              for(ResourceFile rf: ((XnatInvestigatordata)childInvestigator).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("investigator[" + ((XnatInvestigatordata)childInvestigator).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("investigator/" + ((XnatInvestigatordata)childInvestigator).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //demographics
-	        XnatAbstractdemographicdata childDemographics = (XnatAbstractdemographicdata)this.getDemographics();
-	            if (childDemographics!=null){
-	              for(ResourceFile rf: ((XnatAbstractdemographicdata)childDemographics).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("demographics[" + ((XnatAbstractdemographicdata)childDemographics).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("demographics/" + ((XnatAbstractdemographicdata)childDemographics).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //metadata
-	        XnatAbstractsubjectmetadata childMetadata = (XnatAbstractsubjectmetadata)this.getMetadata();
-	            if (childMetadata!=null){
-	              for(ResourceFile rf: ((XnatAbstractsubjectmetadata)childMetadata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("metadata[" + ((XnatAbstractsubjectmetadata)childMetadata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("metadata/" + ((XnatAbstractsubjectmetadata)childMetadata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //addID
-	        for(org.nrg.xdat.model.XnatSubjectdataAddidI childAddid : this.getAddid()){
-	            if (childAddid!=null){
-	              for(ResourceFile rf: ((XnatSubjectdataAddid)childAddid).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("addID[" + ((XnatSubjectdataAddid)childAddid).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("addID/" + ((XnatSubjectdataAddid)childAddid).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //fields/field
-	        for(org.nrg.xdat.model.XnatSubjectdataFieldI childFields_field : this.getFields_field()){
-	            if (childFields_field!=null){
-	              for(ResourceFile rf: ((XnatSubjectdataField)childFields_field).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("fields/field[" + ((XnatSubjectdataField)childFields_field).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("fields/field/" + ((XnatSubjectdataField)childFields_field).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	        //experiments/experiment
-	        for(org.nrg.xdat.model.XnatSubjectassessordataI childExperiments_experiment : this.getExperiments_experiment()){
-	            if (childExperiments_experiment!=null){
-	              for(ResourceFile rf: ((XnatSubjectassessordata)childExperiments_experiment).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("experiments/experiment[" + ((XnatSubjectassessordata)childExperiments_experiment).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("experiments/experiment/" + ((XnatSubjectassessordata)childExperiments_experiment).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdataAddid.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdataAddid.java
deleted file mode 100644
index 84f58159..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdataAddid.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSubjectdataAddid extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatSubjectdataAddidI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSubjectdataAddid.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:subjectData_addID";
-
-	public AutoXnatSubjectdataAddid(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSubjectdataAddid(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSubjectdataAddid(UserI user)
-	 **/
-	public AutoXnatSubjectdataAddid(){}
-
-	public AutoXnatSubjectdataAddid(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:subjectData_addID";
-	}
-
-	//FIELD
-
-	private String _Addid=null;
-
-	/**
-	 * @return Returns the addID.
-	 */
-	public String getAddid(){
-		try{
-			if (_Addid==null){
-				_Addid=getStringProperty("addID");
-				return _Addid;
-			}else {
-				return _Addid;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for addID.
-	 * @param v Value to Set.
-	 */
-	public void setAddid(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/addID",v);
-		_Addid=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatSubjectdataAddidId=null;
-
-	/**
-	 * @return Returns the xnat_subjectData_addID_id.
-	 */
-	public Integer getXnatSubjectdataAddidId() {
-		try{
-			if (_XnatSubjectdataAddidId==null){
-				_XnatSubjectdataAddidId=getIntegerProperty("xnat_subjectData_addID_id");
-				return _XnatSubjectdataAddidId;
-			}else {
-				return _XnatSubjectdataAddidId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_subjectData_addID_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatSubjectdataAddidId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_subjectData_addID_id",v);
-		_XnatSubjectdataAddidId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid> getAllXnatSubjectdataAddids(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid> getXnatSubjectdataAddidsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid> getXnatSubjectdataAddidsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdataAddid>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSubjectdataAddid getXnatSubjectdataAddidsByXnatSubjectdataAddidId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:subjectData_addID/xnat_subjectData_addID_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSubjectdataAddid) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdataField.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdataField.java
deleted file mode 100644
index bb6ad583..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectdataField.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSubjectdataField extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatSubjectdataFieldI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSubjectdataField.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:subjectData_field";
-
-	public AutoXnatSubjectdataField(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSubjectdataField(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSubjectdataField(UserI user)
-	 **/
-	public AutoXnatSubjectdataField(){}
-
-	public AutoXnatSubjectdataField(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:subjectData_field";
-	}
-
-	//FIELD
-
-	private String _Field=null;
-
-	/**
-	 * @return Returns the field.
-	 */
-	public String getField(){
-		try{
-			if (_Field==null){
-				_Field=getStringProperty("field");
-				return _Field;
-			}else {
-				return _Field;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for field.
-	 * @param v Value to Set.
-	 */
-	public void setField(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/field",v);
-		_Field=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatSubjectdataFieldId=null;
-
-	/**
-	 * @return Returns the xnat_subjectData_field_id.
-	 */
-	public Integer getXnatSubjectdataFieldId() {
-		try{
-			if (_XnatSubjectdataFieldId==null){
-				_XnatSubjectdataFieldId=getIntegerProperty("xnat_subjectData_field_id");
-				return _XnatSubjectdataFieldId;
-			}else {
-				return _XnatSubjectdataFieldId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_subjectData_field_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatSubjectdataFieldId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_subjectData_field_id",v);
-		_XnatSubjectdataFieldId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdataField> getAllXnatSubjectdataFields(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdataField> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdataField>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdataField> getXnatSubjectdataFieldsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdataField> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdataField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectdataField> getXnatSubjectdataFieldsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectdataField> al = new ArrayList<org.nrg.xdat.om.XnatSubjectdataField>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSubjectdataField getXnatSubjectdataFieldsByXnatSubjectdataFieldId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:subjectData_field/xnat_subjectData_field_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSubjectdataField) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectmetadata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectmetadata.java
deleted file mode 100644
index 951e8a50..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectmetadata.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSubjectmetadata extends XnatAbstractsubjectmetadata implements org.nrg.xdat.model.XnatSubjectmetadataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSubjectmetadata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:subjectMetadata";
-
-	public AutoXnatSubjectmetadata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSubjectmetadata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSubjectmetadata(UserI user)
-	 **/
-	public AutoXnatSubjectmetadata(){}
-
-	public AutoXnatSubjectmetadata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:subjectMetadata";
-	}
-	 private org.nrg.xdat.om.XnatAbstractsubjectmetadata _Abstractsubjectmetadata =null;
-
-	/**
-	 * abstractSubjectMetadata
-	 * @return org.nrg.xdat.om.XnatAbstractsubjectmetadata
-	 */
-	public org.nrg.xdat.om.XnatAbstractsubjectmetadata getAbstractsubjectmetadata() {
-		try{
-			if (_Abstractsubjectmetadata==null){
-				_Abstractsubjectmetadata=((XnatAbstractsubjectmetadata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("abstractSubjectMetadata")));
-				return _Abstractsubjectmetadata;
-			}else {
-				return _Abstractsubjectmetadata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for abstractSubjectMetadata.
-	 * @param v Value to Set.
-	 */
-	public void setAbstractsubjectmetadata(ItemI v) throws Exception{
-		_Abstractsubjectmetadata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractSubjectMetadata",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/abstractSubjectMetadata",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * abstractSubjectMetadata
-	 * set org.nrg.xdat.model.XnatAbstractsubjectmetadataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatAbstractsubjectmetadataI> void setAbstractsubjectmetadata(A item) throws Exception{
-	setAbstractsubjectmetadata((ItemI)item);
-	}
-
-	/**
-	 * Removes the abstractSubjectMetadata.
-	 * */
-	public void removeAbstractsubjectmetadata() {
-		_Abstractsubjectmetadata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/abstractSubjectMetadata",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Cohort=null;
-
-	/**
-	 * @return Returns the cohort.
-	 */
-	public String getCohort(){
-		try{
-			if (_Cohort==null){
-				_Cohort=getStringProperty("cohort");
-				return _Cohort;
-			}else {
-				return _Cohort;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for cohort.
-	 * @param v Value to Set.
-	 */
-	public void setCohort(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/cohort",v);
-		_Cohort=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectmetadata> getAllXnatSubjectmetadatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectmetadata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectmetadata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectmetadata> getXnatSubjectmetadatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectmetadata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectmetadata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectmetadata> getXnatSubjectmetadatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectmetadata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectmetadata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSubjectmetadata getXnatSubjectmetadatasByXnatAbstractsubjectmetadataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:subjectMetadata/xnat_abstractsubjectmetadata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSubjectmetadata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //abstractSubjectMetadata
-	        XnatAbstractsubjectmetadata childAbstractsubjectmetadata = (XnatAbstractsubjectmetadata)this.getAbstractsubjectmetadata();
-	            if (childAbstractsubjectmetadata!=null){
-	              for(ResourceFile rf: ((XnatAbstractsubjectmetadata)childAbstractsubjectmetadata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("abstractSubjectMetadata[" + ((XnatAbstractsubjectmetadata)childAbstractsubjectmetadata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("abstractSubjectMetadata/" + ((XnatAbstractsubjectmetadata)childAbstractsubjectmetadata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectvariablesdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectvariablesdata.java
deleted file mode 100644
index 7ce5ecb5..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectvariablesdata.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSubjectvariablesdata extends XnatSubjectassessordata implements org.nrg.xdat.model.XnatSubjectvariablesdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSubjectvariablesdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:subjectVariablesData";
-
-	public AutoXnatSubjectvariablesdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSubjectvariablesdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSubjectvariablesdata(UserI user)
-	 **/
-	public AutoXnatSubjectvariablesdata(){}
-
-	public AutoXnatSubjectvariablesdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:subjectVariablesData";
-	}
-	 private org.nrg.xdat.om.XnatSubjectassessordata _Subjectassessordata =null;
-
-	/**
-	 * subjectAssessorData
-	 * @return org.nrg.xdat.om.XnatSubjectassessordata
-	 */
-	public org.nrg.xdat.om.XnatSubjectassessordata getSubjectassessordata() {
-		try{
-			if (_Subjectassessordata==null){
-				_Subjectassessordata=((XnatSubjectassessordata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("subjectAssessorData")));
-				return _Subjectassessordata;
-			}else {
-				return _Subjectassessordata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for subjectAssessorData.
-	 * @param v Value to Set.
-	 */
-	public void setSubjectassessordata(ItemI v) throws Exception{
-		_Subjectassessordata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subjectAssessorData
-	 * set org.nrg.xdat.model.XnatSubjectassessordataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectassessordataI> void setSubjectassessordata(A item) throws Exception{
-	setSubjectassessordata((ItemI)item);
-	}
-
-	/**
-	 * Removes the subjectAssessorData.
-	 * */
-	public void removeSubjectassessordata() {
-		_Subjectassessordata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subjectAssessorData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable> _Variables_variable =null;
-
-	/**
-	 * variables/variable
-	 * @return Returns an List of org.nrg.xdat.om.XnatSubjectvariablesdataVariable
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectvariablesdataVariableI> List<A> getVariables_variable() {
-		try{
-			if (_Variables_variable==null){
-				_Variables_variable=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("variables/variable"));
-			}
-			return (List<A>) _Variables_variable;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable>();}
-	}
-
-	/**
-	 * Sets the value for variables/variable.
-	 * @param v Value to Set.
-	 */
-	public void setVariables_variable(ItemI v) throws Exception{
-		_Variables_variable =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/variables/variable",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/variables/variable",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * variables/variable
-	 * Adds org.nrg.xdat.model.XnatSubjectvariablesdataVariableI
-	 */
-	public <A extends org.nrg.xdat.model.XnatSubjectvariablesdataVariableI> void addVariables_variable(A item) throws Exception{
-	setVariables_variable((ItemI)item);
-	}
-
-	/**
-	 * Removes the variables/variable of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeVariables_variable(int index) throws java.lang.IndexOutOfBoundsException {
-		_Variables_variable =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/variables/variable",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata> getAllXnatSubjectvariablesdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata> getXnatSubjectvariablesdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata> getXnatSubjectvariablesdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata> al = new ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSubjectvariablesdata getXnatSubjectvariablesdatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:subjectVariablesData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSubjectvariablesdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //subjectAssessorData
-	        XnatSubjectassessordata childSubjectassessordata = (XnatSubjectassessordata)this.getSubjectassessordata();
-	            if (childSubjectassessordata!=null){
-	              for(ResourceFile rf: ((XnatSubjectassessordata)childSubjectassessordata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subjectAssessorData[" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subjectAssessorData/" + ((XnatSubjectassessordata)childSubjectassessordata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //variables/variable
-	        for(org.nrg.xdat.model.XnatSubjectvariablesdataVariableI childVariables_variable : this.getVariables_variable()){
-	            if (childVariables_variable!=null){
-	              for(ResourceFile rf: ((XnatSubjectvariablesdataVariable)childVariables_variable).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("variables/variable[" + ((XnatSubjectvariablesdataVariable)childVariables_variable).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("variables/variable/" + ((XnatSubjectvariablesdataVariable)childVariables_variable).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectvariablesdataVariable.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectvariablesdataVariable.java
deleted file mode 100644
index e4bbe1fa..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatSubjectvariablesdataVariable.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatSubjectvariablesdataVariable extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatSubjectvariablesdataVariableI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatSubjectvariablesdataVariable.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:subjectVariablesData_variable";
-
-	public AutoXnatSubjectvariablesdataVariable(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatSubjectvariablesdataVariable(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatSubjectvariablesdataVariable(UserI user)
-	 **/
-	public AutoXnatSubjectvariablesdataVariable(){}
-
-	public AutoXnatSubjectvariablesdataVariable(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:subjectVariablesData_variable";
-	}
-
-	//FIELD
-
-	private String _Variable=null;
-
-	/**
-	 * @return Returns the variable.
-	 */
-	public String getVariable(){
-		try{
-			if (_Variable==null){
-				_Variable=getStringProperty("variable");
-				return _Variable;
-			}else {
-				return _Variable;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for variable.
-	 * @param v Value to Set.
-	 */
-	public void setVariable(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/variable",v);
-		_Variable=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatSubjectvariablesdataVariableId=null;
-
-	/**
-	 * @return Returns the xnat_subjectVariablesData_variable_id.
-	 */
-	public Integer getXnatSubjectvariablesdataVariableId() {
-		try{
-			if (_XnatSubjectvariablesdataVariableId==null){
-				_XnatSubjectvariablesdataVariableId=getIntegerProperty("xnat_subjectVariablesData_variable_id");
-				return _XnatSubjectvariablesdataVariableId;
-			}else {
-				return _XnatSubjectvariablesdataVariableId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_subjectVariablesData_variable_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatSubjectvariablesdataVariableId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_subjectVariablesData_variable_id",v);
-		_XnatSubjectvariablesdataVariableId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable> getAllXnatSubjectvariablesdataVariables(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable> al = new ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable> getXnatSubjectvariablesdataVariablesByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable> al = new ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable> getXnatSubjectvariablesdataVariablesByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable> al = new ArrayList<org.nrg.xdat.om.XnatSubjectvariablesdataVariable>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatSubjectvariablesdataVariable getXnatSubjectvariablesdataVariablesByXnatSubjectvariablesdataVariableId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:subjectVariablesData_variable/xnat_subjectVariablesData_variable_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatSubjectvariablesdataVariable) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatUsscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatUsscandata.java
deleted file mode 100644
index cb9d18a4..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatUsscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatUsscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatUsscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatUsscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:usScanData";
-
-	public AutoXnatUsscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatUsscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatUsscandata(UserI user)
-	 **/
-	public AutoXnatUsscandata(){}
-
-	public AutoXnatUsscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:usScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatUsscandata> getAllXnatUsscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatUsscandata> al = new ArrayList<org.nrg.xdat.om.XnatUsscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatUsscandata> getXnatUsscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatUsscandata> al = new ArrayList<org.nrg.xdat.om.XnatUsscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatUsscandata> getXnatUsscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatUsscandata> al = new ArrayList<org.nrg.xdat.om.XnatUsscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatUsscandata getXnatUsscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:usScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatUsscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatUssessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatUssessiondata.java
deleted file mode 100644
index b691146c..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatUssessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatUssessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatUssessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatUssessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:usSessionData";
-
-	public AutoXnatUssessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatUssessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatUssessiondata(UserI user)
-	 **/
-	public AutoXnatUssessiondata(){}
-
-	public AutoXnatUssessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:usSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatUssessiondata> getAllXnatUssessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatUssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatUssessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatUssessiondata> getXnatUssessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatUssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatUssessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatUssessiondata> getXnatUssessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatUssessiondata> al = new ArrayList<org.nrg.xdat.om.XnatUssessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatUssessiondata getXnatUssessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:usSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatUssessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatValidationdata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatValidationdata.java
deleted file mode 100644
index 75b516dc..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatValidationdata.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatValidationdata extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatValidationdataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatValidationdata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:validationData";
-
-	public AutoXnatValidationdata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatValidationdata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatValidationdata(UserI user)
-	 **/
-	public AutoXnatValidationdata(){}
-
-	public AutoXnatValidationdata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:validationData";
-	}
-
-	//FIELD
-
-	private String _Method=null;
-
-	/**
-	 * @return Returns the method.
-	 */
-	public String getMethod(){
-		try{
-			if (_Method==null){
-				_Method=getStringProperty("method");
-				return _Method;
-			}else {
-				return _Method;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for method.
-	 * @param v Value to Set.
-	 */
-	public void setMethod(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/method",v);
-		_Method=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Object _Date=null;
-
-	/**
-	 * @return Returns the date.
-	 */
-	public Object getDate(){
-		try{
-			if (_Date==null){
-				_Date=getProperty("date");
-				return _Date;
-			}else {
-				return _Date;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for date.
-	 * @param v Value to Set.
-	 */
-	public void setDate(Object v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/date",v);
-		_Date=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Notes=null;
-
-	/**
-	 * @return Returns the notes.
-	 */
-	public String getNotes(){
-		try{
-			if (_Notes==null){
-				_Notes=getStringProperty("notes");
-				return _Notes;
-			}else {
-				return _Notes;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for notes.
-	 * @param v Value to Set.
-	 */
-	public void setNotes(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/notes",v);
-		_Notes=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _ValidatedBy=null;
-
-	/**
-	 * @return Returns the validated_by.
-	 */
-	public String getValidatedBy(){
-		try{
-			if (_ValidatedBy==null){
-				_ValidatedBy=getStringProperty("validated_by");
-				return _ValidatedBy;
-			}else {
-				return _ValidatedBy;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for validated_by.
-	 * @param v Value to Set.
-	 */
-	public void setValidatedBy(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/validated_by",v);
-		_ValidatedBy=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Status=null;
-
-	/**
-	 * @return Returns the status.
-	 */
-	public String getStatus(){
-		try{
-			if (_Status==null){
-				_Status=getStringProperty("status");
-				return _Status;
-			}else {
-				return _Status;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for status.
-	 * @param v Value to Set.
-	 */
-	public void setStatus(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/status",v);
-		_Status=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatValidationdataId=null;
-
-	/**
-	 * @return Returns the xnat_validationData_id.
-	 */
-	public Integer getXnatValidationdataId() {
-		try{
-			if (_XnatValidationdataId==null){
-				_XnatValidationdataId=getIntegerProperty("xnat_validationData_id");
-				return _XnatValidationdataId;
-			}else {
-				return _XnatValidationdataId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_validationData_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatValidationdataId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_validationData_id",v);
-		_XnatValidationdataId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatValidationdata> getAllXnatValidationdatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatValidationdata> al = new ArrayList<org.nrg.xdat.om.XnatValidationdata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatValidationdata> getXnatValidationdatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatValidationdata> al = new ArrayList<org.nrg.xdat.om.XnatValidationdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatValidationdata> getXnatValidationdatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatValidationdata> al = new ArrayList<org.nrg.xdat.om.XnatValidationdata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatValidationdata getXnatValidationdatasByXnatValidationdataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:validationData/xnat_validationData_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatValidationdata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVoiceaudioscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVoiceaudioscandata.java
deleted file mode 100644
index 9a2c1195..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVoiceaudioscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatVoiceaudioscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatVoiceaudioscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatVoiceaudioscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:voiceAudioScanData";
-
-	public AutoXnatVoiceaudioscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatVoiceaudioscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatVoiceaudioscandata(UserI user)
-	 **/
-	public AutoXnatVoiceaudioscandata(){}
-
-	public AutoXnatVoiceaudioscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:voiceAudioScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata> getAllXnatVoiceaudioscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata> al = new ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata> getXnatVoiceaudioscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata> al = new ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata> getXnatVoiceaudioscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata> al = new ArrayList<org.nrg.xdat.om.XnatVoiceaudioscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatVoiceaudioscandata getXnatVoiceaudioscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:voiceAudioScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatVoiceaudioscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVolumetricregion.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVolumetricregion.java
deleted file mode 100644
index 53788542..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVolumetricregion.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatVolumetricregion extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatVolumetricregionI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatVolumetricregion.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:volumetricRegion";
-
-	public AutoXnatVolumetricregion(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatVolumetricregion(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatVolumetricregion(UserI user)
-	 **/
-	public AutoXnatVolumetricregion(){}
-
-	public AutoXnatVolumetricregion(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:volumetricRegion";
-	}
-	 private ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion> _Subregions_subregion =null;
-
-	/**
-	 * subregions/subregion
-	 * @return Returns an List of org.nrg.xdat.om.XnatVolumetricregionSubregion
-	 */
-	public <A extends org.nrg.xdat.model.XnatVolumetricregionSubregionI> List<A> getSubregions_subregion() {
-		try{
-			if (_Subregions_subregion==null){
-				_Subregions_subregion=org.nrg.xdat.base.BaseElement.WrapItems(getChildItems("subregions/subregion"));
-			}
-			return (List<A>) _Subregions_subregion;
-		} catch (Exception e1) {return (List<A>) new ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion>();}
-	}
-
-	/**
-	 * Sets the value for subregions/subregion.
-	 * @param v Value to Set.
-	 */
-	public void setSubregions_subregion(ItemI v) throws Exception{
-		_Subregions_subregion =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subregions/subregion",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/subregions/subregion",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * subregions/subregion
-	 * Adds org.nrg.xdat.model.XnatVolumetricregionSubregionI
-	 */
-	public <A extends org.nrg.xdat.model.XnatVolumetricregionSubregionI> void addSubregions_subregion(A item) throws Exception{
-	setSubregions_subregion((ItemI)item);
-	}
-
-	/**
-	 * Removes the subregions/subregion of the given index.
-	 * @param index Index of child to remove.
-	 */
-	public void removeSubregions_subregion(int index) throws java.lang.IndexOutOfBoundsException {
-		_Subregions_subregion =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/subregions/subregion",index);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Units=null;
-
-	/**
-	 * @return Returns the units.
-	 */
-	public String getUnits(){
-		try{
-			if (_Units==null){
-				_Units=getStringProperty("units");
-				return _Units;
-			}else {
-				return _Units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for units.
-	 * @param v Value to Set.
-	 */
-	public void setUnits(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/units",v);
-		_Units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Voxels=null;
-
-	/**
-	 * @return Returns the voxels.
-	 */
-	public Integer getVoxels() {
-		try{
-			if (_Voxels==null){
-				_Voxels=getIntegerProperty("voxels");
-				return _Voxels;
-			}else {
-				return _Voxels;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxels.
-	 * @param v Value to Set.
-	 */
-	public void setVoxels(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxels",v);
-		_Voxels=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Hemisphere=null;
-
-	/**
-	 * @return Returns the hemisphere.
-	 */
-	public String getHemisphere(){
-		try{
-			if (_Hemisphere==null){
-				_Hemisphere=getStringProperty("hemisphere");
-				return _Hemisphere;
-			}else {
-				return _Hemisphere;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for hemisphere.
-	 * @param v Value to Set.
-	 */
-	public void setHemisphere(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/hemisphere",v);
-		_Hemisphere=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatVolumetricregionId=null;
-
-	/**
-	 * @return Returns the xnat_volumetricRegion_id.
-	 */
-	public Integer getXnatVolumetricregionId() {
-		try{
-			if (_XnatVolumetricregionId==null){
-				_XnatVolumetricregionId=getIntegerProperty("xnat_volumetricRegion_id");
-				return _XnatVolumetricregionId;
-			}else {
-				return _XnatVolumetricregionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_volumetricRegion_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatVolumetricregionId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_volumetricRegion_id",v);
-		_XnatVolumetricregionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVolumetricregion> getAllXnatVolumetricregions(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVolumetricregion> al = new ArrayList<org.nrg.xdat.om.XnatVolumetricregion>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVolumetricregion> getXnatVolumetricregionsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVolumetricregion> al = new ArrayList<org.nrg.xdat.om.XnatVolumetricregion>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVolumetricregion> getXnatVolumetricregionsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVolumetricregion> al = new ArrayList<org.nrg.xdat.om.XnatVolumetricregion>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatVolumetricregion getXnatVolumetricregionsByXnatVolumetricregionId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:volumetricRegion/xnat_volumetricRegion_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatVolumetricregion) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //subregions/subregion
-	        for(org.nrg.xdat.model.XnatVolumetricregionSubregionI childSubregions_subregion : this.getSubregions_subregion()){
-	            if (childSubregions_subregion!=null){
-	              for(ResourceFile rf: ((XnatVolumetricregionSubregion)childSubregions_subregion).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("subregions/subregion[" + ((XnatVolumetricregionSubregion)childSubregions_subregion).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("subregions/subregion/" + ((XnatVolumetricregionSubregion)childSubregions_subregion).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	        }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVolumetricregionSubregion.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVolumetricregionSubregion.java
deleted file mode 100644
index 66ada576..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatVolumetricregionSubregion.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:05 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatVolumetricregionSubregion extends org.nrg.xdat.base.BaseElement implements org.nrg.xdat.model.XnatVolumetricregionSubregionI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatVolumetricregionSubregion.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:volumetricRegion_subregion";
-
-	public AutoXnatVolumetricregionSubregion(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatVolumetricregionSubregion(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatVolumetricregionSubregion(UserI user)
-	 **/
-	public AutoXnatVolumetricregionSubregion(){}
-
-	public AutoXnatVolumetricregionSubregion(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:volumetricRegion_subregion";
-	}
-
-	//FIELD
-
-	private String _Name=null;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName(){
-		try{
-			if (_Name==null){
-				_Name=getStringProperty("name");
-				return _Name;
-			}else {
-				return _Name;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for name.
-	 * @param v Value to Set.
-	 */
-	public void setName(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/name",v);
-		_Name=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Double _Voxels=null;
-
-	/**
-	 * @return Returns the voxels.
-	 */
-	public Double getVoxels() {
-		try{
-			if (_Voxels==null){
-				_Voxels=getDoubleProperty("voxels");
-				return _Voxels;
-			}else {
-				return _Voxels;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for voxels.
-	 * @param v Value to Set.
-	 */
-	public void setVoxels(Double v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/voxels",v);
-		_Voxels=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _XnatVolumetricregionSubregionId=null;
-
-	/**
-	 * @return Returns the xnat_volumetricRegion_subregion_id.
-	 */
-	public Integer getXnatVolumetricregionSubregionId() {
-		try{
-			if (_XnatVolumetricregionSubregionId==null){
-				_XnatVolumetricregionSubregionId=getIntegerProperty("xnat_volumetricRegion_subregion_id");
-				return _XnatVolumetricregionSubregionId;
-			}else {
-				return _XnatVolumetricregionSubregionId;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat_volumetricRegion_subregion_id.
-	 * @param v Value to Set.
-	 */
-	public void setXnatVolumetricregionSubregionId(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/xnat_volumetricRegion_subregion_id",v);
-		_XnatVolumetricregionSubregionId=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion> getAllXnatVolumetricregionSubregions(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion> al = new ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion> getXnatVolumetricregionSubregionsByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion> al = new ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion> getXnatVolumetricregionSubregionsByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion> al = new ArrayList<org.nrg.xdat.om.XnatVolumetricregionSubregion>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatVolumetricregionSubregion getXnatVolumetricregionSubregionsByXnatVolumetricregionSubregionId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:volumetricRegion_subregion/xnat_volumetricRegion_subregion_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatVolumetricregionSubregion) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXa3dscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXa3dscandata.java
deleted file mode 100644
index 8a669c34..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXa3dscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatXa3dscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatXa3dscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatXa3dscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:xa3DScanData";
-
-	public AutoXnatXa3dscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatXa3dscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatXa3dscandata(UserI user)
-	 **/
-	public AutoXnatXa3dscandata(){}
-
-	public AutoXnatXa3dscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:xa3DScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXa3dscandata> getAllXnatXa3dscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXa3dscandata> al = new ArrayList<org.nrg.xdat.om.XnatXa3dscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXa3dscandata> getXnatXa3dscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXa3dscandata> al = new ArrayList<org.nrg.xdat.om.XnatXa3dscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXa3dscandata> getXnatXa3dscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXa3dscandata> al = new ArrayList<org.nrg.xdat.om.XnatXa3dscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatXa3dscandata getXnatXa3dscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:xa3DScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatXa3dscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXa3dsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXa3dsessiondata.java
deleted file mode 100644
index 381954bf..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXa3dsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatXa3dsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatXa3dsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatXa3dsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:xa3DSessionData";
-
-	public AutoXnatXa3dsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatXa3dsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatXa3dsessiondata(UserI user)
-	 **/
-	public AutoXnatXa3dsessiondata(){}
-
-	public AutoXnatXa3dsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:xa3DSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata> getAllXnatXa3dsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata> getXnatXa3dsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata> getXnatXa3dsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXa3dsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatXa3dsessiondata getXnatXa3dsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:xa3DSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatXa3dsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXascandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXascandata.java
deleted file mode 100644
index ca5f3b64..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXascandata.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatXascandata extends XnatImagescandata implements org.nrg.xdat.model.XnatXascandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatXascandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:xaScanData";
-
-	public AutoXnatXascandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatXascandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatXascandata(UserI user)
-	 **/
-	public AutoXnatXascandata(){}
-
-	public AutoXnatXascandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:xaScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_pixelres_units=null;
-
-	/**
-	 * @return Returns the parameters/pixelRes/units.
-	 */
-	public String getParameters_pixelres_units(){
-		try{
-			if (_Parameters_pixelres_units==null){
-				_Parameters_pixelres_units=getStringProperty("parameters/pixelRes/units");
-				return _Parameters_pixelres_units;
-			}else {
-				return _Parameters_pixelres_units;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/pixelRes/units.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_pixelres_units(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/pixelRes/units",v);
-		_Parameters_pixelres_units=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_pixelres_x=null;
-
-	/**
-	 * @return Returns the parameters/pixelRes/x.
-	 */
-	public Integer getParameters_pixelres_x() {
-		try{
-			if (_Parameters_pixelres_x==null){
-				_Parameters_pixelres_x=getIntegerProperty("parameters/pixelRes/x");
-				return _Parameters_pixelres_x;
-			}else {
-				return _Parameters_pixelres_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/pixelRes/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_pixelres_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/pixelRes/x",v);
-		_Parameters_pixelres_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_pixelres_y=null;
-
-	/**
-	 * @return Returns the parameters/pixelRes/y.
-	 */
-	public Integer getParameters_pixelres_y() {
-		try{
-			if (_Parameters_pixelres_y==null){
-				_Parameters_pixelres_y=getIntegerProperty("parameters/pixelRes/y");
-				return _Parameters_pixelres_y;
-			}else {
-				return _Parameters_pixelres_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/pixelRes/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_pixelres_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/pixelRes/y",v);
-		_Parameters_pixelres_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_orientation=null;
-
-	/**
-	 * @return Returns the parameters/orientation.
-	 */
-	public String getParameters_orientation(){
-		try{
-			if (_Parameters_orientation==null){
-				_Parameters_orientation=getStringProperty("parameters/orientation");
-				return _Parameters_orientation;
-			}else {
-				return _Parameters_orientation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/orientation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_orientation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/orientation",v);
-		_Parameters_orientation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_fov_x=null;
-
-	/**
-	 * @return Returns the parameters/fov/x.
-	 */
-	public Integer getParameters_fov_x() {
-		try{
-			if (_Parameters_fov_x==null){
-				_Parameters_fov_x=getIntegerProperty("parameters/fov/x");
-				return _Parameters_fov_x;
-			}else {
-				return _Parameters_fov_x;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fov/x.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_fov_x(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fov/x",v);
-		_Parameters_fov_x=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_fov_y=null;
-
-	/**
-	 * @return Returns the parameters/fov/y.
-	 */
-	public Integer getParameters_fov_y() {
-		try{
-			if (_Parameters_fov_y==null){
-				_Parameters_fov_y=getIntegerProperty("parameters/fov/y");
-				return _Parameters_fov_y;
-			}else {
-				return _Parameters_fov_y;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/fov/y.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_fov_y(Integer v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/fov/y",v);
-		_Parameters_fov_y=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_imagetype=null;
-
-	/**
-	 * @return Returns the parameters/imageType.
-	 */
-	public String getParameters_imagetype(){
-		try{
-			if (_Parameters_imagetype==null){
-				_Parameters_imagetype=getStringProperty("parameters/imageType");
-				return _Parameters_imagetype;
-			}else {
-				return _Parameters_imagetype;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/imageType.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_imagetype(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/imageType",v);
-		_Parameters_imagetype=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_options=null;
-
-	/**
-	 * @return Returns the parameters/options.
-	 */
-	public String getParameters_options(){
-		try{
-			if (_Parameters_options==null){
-				_Parameters_options=getStringProperty("parameters/options");
-				return _Parameters_options;
-			}else {
-				return _Parameters_options;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/options.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_options(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/options",v);
-		_Parameters_options=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private String _Parameters_derivation=null;
-
-	/**
-	 * @return Returns the parameters/derivation.
-	 */
-	public String getParameters_derivation(){
-		try{
-			if (_Parameters_derivation==null){
-				_Parameters_derivation=getStringProperty("parameters/derivation");
-				return _Parameters_derivation;
-			}else {
-				return _Parameters_derivation;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/derivation.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_derivation(String v){
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters/derivation",v);
-		_Parameters_derivation=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-	 private org.nrg.xdat.om.XnatContrastbolus _Parameters_contrastbolus =null;
-
-	/**
-	 * parameters/contrastBolus
-	 * @return org.nrg.xdat.om.XnatContrastbolus
-	 */
-	public org.nrg.xdat.om.XnatContrastbolus getParameters_contrastbolus() {
-		try{
-			if (_Parameters_contrastbolus==null){
-				_Parameters_contrastbolus=((XnatContrastbolus)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("parameters/contrastBolus")));
-				return _Parameters_contrastbolus;
-			}else {
-				return _Parameters_contrastbolus;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for parameters/contrastBolus.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_contrastbolus(ItemI v) throws Exception{
-		_Parameters_contrastbolus =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/contrastBolus",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/parameters/contrastBolus",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * parameters/contrastBolus
-	 * set org.nrg.xdat.model.XnatContrastbolusI
-	 */
-	public <A extends org.nrg.xdat.model.XnatContrastbolusI> void setParameters_contrastbolus(A item) throws Exception{
-	setParameters_contrastbolus((ItemI)item);
-	}
-
-	/**
-	 * Removes the parameters/contrastBolus.
-	 * */
-	public void removeParameters_contrastbolus() {
-		_Parameters_contrastbolus =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/parameters/contrastBolus",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	//FIELD
-
-	private Integer _Parameters_contrastbolusFK=null;
-
-	/**
-	 * @return Returns the xnat:xaScanData/parameters_contrastbolus_xnat_contrastbolus_id.
-	 */
-	public Integer getParameters_contrastbolusFK(){
-		try{
-			if (_Parameters_contrastbolusFK==null){
-				_Parameters_contrastbolusFK=getIntegerProperty("xnat:xaScanData/parameters_contrastbolus_xnat_contrastbolus_id");
-				return _Parameters_contrastbolusFK;
-			}else {
-				return _Parameters_contrastbolusFK;
-			}
-		} catch (Exception e1) {logger.error(e1);return null;}
-	}
-
-	/**
-	 * Sets the value for xnat:xaScanData/parameters_contrastbolus_xnat_contrastbolus_id.
-	 * @param v Value to Set.
-	 */
-	public void setParameters_contrastbolusFK(Integer v) {
-		try{
-		setProperty(SCHEMA_ELEMENT_NAME + "/parameters_contrastbolus_xnat_contrastbolus_id",v);
-		_Parameters_contrastbolusFK=null;
-		} catch (Exception e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXascandata> getAllXnatXascandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXascandata> al = new ArrayList<org.nrg.xdat.om.XnatXascandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXascandata> getXnatXascandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXascandata> al = new ArrayList<org.nrg.xdat.om.XnatXascandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXascandata> getXnatXascandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXascandata> al = new ArrayList<org.nrg.xdat.om.XnatXascandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatXascandata getXnatXascandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:xaScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatXascandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	        //parameters/contrastBolus
-	        XnatContrastbolus childParameters_contrastbolus = (XnatContrastbolus)this.getParameters_contrastbolus();
-	            if (childParameters_contrastbolus!=null){
-	              for(ResourceFile rf: ((XnatContrastbolus)childParameters_contrastbolus).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("parameters/contrastBolus[" + ((XnatContrastbolus)childParameters_contrastbolus).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("parameters/contrastBolus/" + ((XnatContrastbolus)childParameters_contrastbolus).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXasessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXasessiondata.java
deleted file mode 100644
index 024491b7..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXasessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:06 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatXasessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatXasessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatXasessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:xaSessionData";
-
-	public AutoXnatXasessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatXasessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatXasessiondata(UserI user)
-	 **/
-	public AutoXnatXasessiondata(){}
-
-	public AutoXnatXasessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:xaSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXasessiondata> getAllXnatXasessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXasessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXasessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXasessiondata> getXnatXasessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXasessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXasessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXasessiondata> getXnatXasessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXasessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXasessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatXasessiondata getXnatXasessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:xaSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatXasessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcscandata.java
deleted file mode 100644
index 5e66e35d..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatXcscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatXcscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatXcscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:xcScanData";
-
-	public AutoXnatXcscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatXcscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatXcscandata(UserI user)
-	 **/
-	public AutoXnatXcscandata(){}
-
-	public AutoXnatXcscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:xcScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcscandata> getAllXnatXcscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcscandata> al = new ArrayList<org.nrg.xdat.om.XnatXcscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcscandata> getXnatXcscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcscandata> al = new ArrayList<org.nrg.xdat.om.XnatXcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcscandata> getXnatXcscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcscandata> al = new ArrayList<org.nrg.xdat.om.XnatXcscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatXcscandata getXnatXcscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:xcScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatXcscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcsessiondata.java
deleted file mode 100644
index f0fb22ef..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatXcsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatXcsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatXcsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:xcSessionData";
-
-	public AutoXnatXcsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatXcsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatXcsessiondata(UserI user)
-	 **/
-	public AutoXnatXcsessiondata(){}
-
-	public AutoXnatXcsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:xcSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcsessiondata> getAllXnatXcsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXcsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcsessiondata> getXnatXcsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXcsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcsessiondata> getXnatXcsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXcsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatXcsessiondata getXnatXcsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:xcSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatXcsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcvscandata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcvscandata.java
deleted file mode 100644
index 42345ec1..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcvscandata.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatXcvscandata extends XnatImagescandata implements org.nrg.xdat.model.XnatXcvscandataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatXcvscandata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:xcvScanData";
-
-	public AutoXnatXcvscandata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatXcvscandata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatXcvscandata(UserI user)
-	 **/
-	public AutoXnatXcvscandata(){}
-
-	public AutoXnatXcvscandata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:xcvScanData";
-	}
-	 private org.nrg.xdat.om.XnatImagescandata _Imagescandata =null;
-
-	/**
-	 * imageScanData
-	 * @return org.nrg.xdat.om.XnatImagescandata
-	 */
-	public org.nrg.xdat.om.XnatImagescandata getImagescandata() {
-		try{
-			if (_Imagescandata==null){
-				_Imagescandata=((XnatImagescandata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageScanData")));
-				return _Imagescandata;
-			}else {
-				return _Imagescandata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageScanData.
-	 * @param v Value to Set.
-	 */
-	public void setImagescandata(ItemI v) throws Exception{
-		_Imagescandata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageScanData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageScanData
-	 * set org.nrg.xdat.model.XnatImagescandataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagescandataI> void setImagescandata(A item) throws Exception{
-	setImagescandata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageScanData.
-	 * */
-	public void removeImagescandata() {
-		_Imagescandata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageScanData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcvscandata> getAllXnatXcvscandatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcvscandata> al = new ArrayList<org.nrg.xdat.om.XnatXcvscandata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcvscandata> getXnatXcvscandatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcvscandata> al = new ArrayList<org.nrg.xdat.om.XnatXcvscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcvscandata> getXnatXcvscandatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcvscandata> al = new ArrayList<org.nrg.xdat.om.XnatXcvscandata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatXcvscandata getXnatXcvscandatasByXnatImagescandataId(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:xcvScanData/xnat_imagescandata_id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatXcvscandata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageScanData
-	        XnatImagescandata childImagescandata = (XnatImagescandata)this.getImagescandata();
-	            if (childImagescandata!=null){
-	              for(ResourceFile rf: ((XnatImagescandata)childImagescandata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageScanData[" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageScanData/" + ((XnatImagescandata)childImagescandata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
diff --git a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcvsessiondata.java b/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcvsessiondata.java
deleted file mode 100644
index 5dc6c9f5..00000000
--- a/src/main/java/org/nrg/xdat/om/base/auto/AutoXnatXcvsessiondata.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * GENERATED FILE
- * Created on Thu Jan 28 18:10:09 UTC 2016
- *
- */
-package org.nrg.xdat.om.base.auto;
-import org.nrg.xft.*;
-import org.nrg.xft.security.UserI;
-import org.nrg.xdat.om.*;
-import org.nrg.xft.utils.ResourceFile;
-import org.nrg.xft.exception.*;
-
-import java.util.*;
-
-/**
- * @author XDAT
- *
- */
-@SuppressWarnings({"unchecked","rawtypes"})
-public abstract class AutoXnatXcvsessiondata extends XnatImagesessiondata implements org.nrg.xdat.model.XnatXcvsessiondataI {
-	public static org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(AutoXnatXcvsessiondata.class);
-	public static String SCHEMA_ELEMENT_NAME="xnat:xcvSessionData";
-
-	public AutoXnatXcvsessiondata(ItemI item)
-	{
-		super(item);
-	}
-
-	public AutoXnatXcvsessiondata(UserI user)
-	{
-		super(user);
-	}
-
-	/*
-	 * @deprecated Use AutoXnatXcvsessiondata(UserI user)
-	 **/
-	public AutoXnatXcvsessiondata(){}
-
-	public AutoXnatXcvsessiondata(Hashtable properties,UserI user)
-	{
-		super(properties,user);
-	}
-
-	public String getSchemaElementName(){
-		return "xnat:xcvSessionData";
-	}
-	 private org.nrg.xdat.om.XnatImagesessiondata _Imagesessiondata =null;
-
-	/**
-	 * imageSessionData
-	 * @return org.nrg.xdat.om.XnatImagesessiondata
-	 */
-	public org.nrg.xdat.om.XnatImagesessiondata getImagesessiondata() {
-		try{
-			if (_Imagesessiondata==null){
-				_Imagesessiondata=((XnatImagesessiondata)org.nrg.xdat.base.BaseElement.GetGeneratedItem((XFTItem)getProperty("imageSessionData")));
-				return _Imagesessiondata;
-			}else {
-				return _Imagesessiondata;
-			}
-		} catch (Exception e1) {return null;}
-	}
-
-	/**
-	 * Sets the value for imageSessionData.
-	 * @param v Value to Set.
-	 */
-	public void setImagesessiondata(ItemI v) throws Exception{
-		_Imagesessiondata =null;
-		try{
-			if (v instanceof XFTItem)
-			{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v,true);
-			}else{
-				getItem().setChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",v.getItem(),true);
-			}
-		} catch (Exception e1) {logger.error(e1);throw e1;}
-	}
-
-	/**
-	 * imageSessionData
-	 * set org.nrg.xdat.model.XnatImagesessiondataI
-	 */
-	public <A extends org.nrg.xdat.model.XnatImagesessiondataI> void setImagesessiondata(A item) throws Exception{
-	setImagesessiondata((ItemI)item);
-	}
-
-	/**
-	 * Removes the imageSessionData.
-	 * */
-	public void removeImagesessiondata() {
-		_Imagesessiondata =null;
-		try{
-			getItem().removeChild(SCHEMA_ELEMENT_NAME + "/imageSessionData",0);
-		} catch (FieldNotFoundException e1) {logger.error(e1);}
-		catch (java.lang.IndexOutOfBoundsException e1) {logger.error(e1);}
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcvsessiondata> getAllXnatXcvsessiondatas(org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXcvsessiondata>();
-
-		try{
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetAllItems(SCHEMA_ELEMENT_NAME,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcvsessiondata> getXnatXcvsessiondatasByField(String xmlPath, Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXcvsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(xmlPath,value,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList<org.nrg.xdat.om.XnatXcvsessiondata> getXnatXcvsessiondatasByField(org.nrg.xft.search.CriteriaCollection criteria, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		ArrayList<org.nrg.xdat.om.XnatXcvsessiondata> al = new ArrayList<org.nrg.xdat.om.XnatXcvsessiondata>();
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems(criteria,user,preLoad);
-			al = org.nrg.xdat.base.BaseElement.WrapItems(items.getItems());
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		al.trimToSize();
-		return al;
-	}
-
-	public static XnatXcvsessiondata getXnatXcvsessiondatasById(Object value, org.nrg.xft.security.UserI user,boolean preLoad)
-	{
-		try {
-			org.nrg.xft.collections.ItemCollection items = org.nrg.xft.search.ItemSearch.GetItems("xnat:xcvSessionData/id",value,user,preLoad);
-			ItemI match = items.getFirst();
-			if (match!=null)
-				return (XnatXcvsessiondata) org.nrg.xdat.base.BaseElement.GetGeneratedItem(match);
-			else
-				 return null;
-		} catch (Exception e) {
-			logger.error("",e);
-		}
-
-		return null;
-	}
-
-	public static ArrayList wrapItems(ArrayList items)
-	{
-		ArrayList al = new ArrayList();
-		al = org.nrg.xdat.base.BaseElement.WrapItems(items);
-		al.trimToSize();
-		return al;
-	}
-
-	public static ArrayList wrapItems(org.nrg.xft.collections.ItemCollection items)
-	{
-		return wrapItems(items.getItems());
-	}
-
-	public org.w3c.dom.Document toJoinedXML() throws Exception
-	{
-		ArrayList al = new ArrayList();
-		al.add(this.getItem());
-		al.add(org.nrg.xft.search.ItemSearch.GetItem("xnat:subjectData.ID",this.getItem().getProperty("xnat:mrSessionData.subject_ID"),getItem().getUser(),false));
-		al.trimToSize();
-		return org.nrg.xft.schema.Wrappers.XMLWrapper.XMLWriter.ItemListToDOM(al);
-	}
-	public ArrayList<ResourceFile> getFileResources(String rootPath, boolean preventLoop){
-ArrayList<ResourceFile> _return = new ArrayList<ResourceFile>();
-	 boolean localLoop = preventLoop;
-	        localLoop = preventLoop;
-	
-	        //imageSessionData
-	        XnatImagesessiondata childImagesessiondata = (XnatImagesessiondata)this.getImagesessiondata();
-	            if (childImagesessiondata!=null){
-	              for(ResourceFile rf: ((XnatImagesessiondata)childImagesessiondata).getFileResources(rootPath, localLoop)) {
-	                 rf.setXpath("imageSessionData[" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "]/" + rf.getXpath());
-	                 rf.setXdatPath("imageSessionData/" + ((XnatImagesessiondata)childImagesessiondata).getItem().getPKString() + "/" + rf.getXpath());
-	                 _return.add(rf);
-	              }
-	            }
-	
-	        localLoop = preventLoop;
-	
-	return _return;
-}
-}
-- 
GitLab