From: Cherian Mathew <c.mathew@bgbm.org>
Date: Wed, 25 Sep 2013 14:07:04 +0000 (+0000)
Subject: reintegrated model changes from branch 3.3-MC-SNAPSHOT
X-Git-Tag: 3.6.0~960
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/46c12f4926951d085d15fd2f85e89da7ef5ea1a1?hp=5c3e7cc764a774493349ba627655ac6ce7a5d281

reintegrated model changes from branch 3.3-MC-SNAPSHOT
---

diff --git a/.gitattributes b/.gitattributes
index f19d32bc9..cadffbe93 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1060,6 +1060,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/UsageTe
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDragListener.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDropAdapter.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermMenuFactory.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermBasePropertyTester.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java -text
@@ -1068,16 +1069,8 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/defined
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermMenu.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/StateEditorInput.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java -text
@@ -1232,6 +1225,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumC
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/LoginDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ClassificationSelectionDialog.java -text
@@ -1246,10 +1240,12 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/sele
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NameSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorTeamSelectionDialog.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PersonSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PolytomousKeySelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java -text
@@ -1263,6 +1259,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/Cdm
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmPropertyChangeEvent.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/GatheringEventUnitElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ICdmFormElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEnableableFormElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEntityElement.java -text
@@ -1279,6 +1276,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/Key
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LabelElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LanguageStringWithLabelElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/LayoutConstants.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java -text
diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml
index 61f897c86..92ca4981b 100644
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -31,11 +31,12 @@
             id="eu.etaxonomy.taxeditor.application.perspective.polytomous"
             name="Polytomous Key">
       </perspective>
-       <perspective
+      <!-- FIXME:3.3MC -->
+       <!--perspective
             class="eu.etaxonomy.taxeditor.perspective.Uses"
             id="eu.etaxonomy.taxeditor.application.perspective.uses"
             name="Uses">
-      </perspective>
+      </perspective-->
      
    </extension>
    <!--extension
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java
index dd461e780..906531256 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java
@@ -24,9 +24,12 @@ import org.eclipse.ui.texteditor.IDocumentProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
  * A list-based editor, where each line in the editor's document is associated with a domain object.
@@ -148,18 +151,38 @@ public class AnnotatedLineEditor extends TextEditor implements IConversationEnab
 	 */
 	public LineAnnotation createAnnotatedLineNewObject(Object key, String titleCache) {
 		
+		
+
 		// Create new object
 		Object entity = ((AnnotatedLineDocumentProvider) getDocumentProvider()).
 							getEntityCreator(getEditorInput()).createEntity(key, titleCache);
-
+		// checks if the creator also saves the entity (in a different conversation), in which case 
+		// we need to bind back this editors conversation
+		// we also need to reload the entity because the conversation used to
+		// to create / save the entity may have been closed
+		if(entity != null && ((AnnotatedLineDocumentProvider) getDocumentProvider()).getEntityCreator(getEditorInput()).savesEntity()) {		
+			getConversationHolder().bind();
+			Object object = CdmStore.getService(IOccurrenceService.class).load(((CdmBase)entity).getUuid());			
+			entity = HibernateProxyHelper.deproxy(object);			
+		}
+		
+		if(entity == null) {
+			return null;
+		}
 		LineAnnotation annotation = createAnnotatedLine(entity);
 		if (annotation != null) {
 			annotation.markAsNew(true);
 		}
+
 		return annotation;
 		
 	}
 	
+	  @Override
+	  public boolean isDirty() {
+		return super.isDirty();		  
+	  }
+	
 	/**
 	 * Creates an annotated line at the end of the document. The annotation contains the entity.
 	 *
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IEntityCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IEntityCreator.java
index 0ea3e38e4..40572208f 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IEntityCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IEntityCreator.java
@@ -49,4 +49,13 @@ public interface IEntityCreator<T> {
 	 * @return a {@link java.util.Map} object.
 	 */
 	Map<Object, String> getKeyLabelPairs();
+	
+	/**
+	 * Return a flag indicating whether this creator also saves the entities
+	 *
+	 * @return true or false
+	 */
+	boolean savesEntity();
+	
+
 }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java
index 43b4b8e5e..99c564097 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java
@@ -44,13 +44,8 @@ public class NewObjectHandler extends AbstractHandler {
 			
 			Object key = ((Event)event.getTrigger()).data;
 			if (key != null) {
-				
-				
-				String text = ((Event)event.getTrigger()).text;
-				InputDialog dialog = new InputDialog(HandlerUtil.getActiveShell(event), "Create " + text, "Enter new " + text, "", null);
-				if (dialog.open() != Window.CANCEL) {
-					((AnnotatedLineEditor) editor).createAnnotatedLineNewObject(key, dialog.getValue());
-				}
+
+				((AnnotatedLineEditor) editor).createAnnotatedLineNewObject(key, "Untitled");
 				
 			} else {
 				((AnnotatedLineEditor) editor).createAnnotatedLineNewObject();
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
index 60535de12..cf09eda13 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
@@ -26,6 +26,7 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.CompoundContributionItem;
 import org.eclipse.ui.handlers.IHandlerService;
 
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants;
@@ -83,6 +84,11 @@ public class DynamicNewObjectMenu extends CompoundContributionItem {
 				}
 			}				
 		});
+		
+		//FIXME:3.3MC Need corresponding Details Viewer section for FieldUnit
+		if(key == SpecimenOrObservationType.FieldUnit){
+			menuItem.setEnabled(false);
+		}
 	}
 	
 	/**
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java
index fe74a3d13..a1b78438c 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java
@@ -21,7 +21,7 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 import eu.etaxonomy.taxeditor.bulkeditor.derivedunit.operation.AddDerivedUnitFacadeMediaOperation;
@@ -55,10 +55,10 @@ public abstract class AbstractAddDerivedUnitFacadeMediaHandler extends AbstractH
 			
 			if(selection instanceof IStructuredSelection){
 				Object element = ((IStructuredSelection) selection).getFirstElement();
-				if(element instanceof DerivedUnitBase){
+				if(element instanceof DerivedUnit){
 					
 					try{
-						AbstractPostOperation operation = new AddDerivedUnitFacadeMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnitBase) element, getMode(), postOperationEnabled);
+						AbstractPostOperation operation = new AddDerivedUnitFacadeMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnit) element, getMode(), postOperationEnabled);
 						BulkEditorUtil.executeOperation(operation);
 					} catch (NotDefinedException e) {
 						BulkEditorUtil.warn(getClass(), "Command name not set.");
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java
index 179f2a5f5..5b5e8e213 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
@@ -36,7 +36,7 @@ public class AddDerivedUnitFacadeMediaOperation extends
 	public static final int DERIVED_UNIT_MEDIA = 0;
 	public static final int FIELD_OBJECT_MEDIA = 1;
 	
-	private DerivedUnitBase derivedUnit;
+	private DerivedUnit derivedUnit;
 	private int mode;
 	
 	/**
@@ -44,7 +44,7 @@ public class AddDerivedUnitFacadeMediaOperation extends
 	 * @param undoContext
 	 * @param postOperationEnabled
 	 */
-	public AddDerivedUnitFacadeMediaOperation(String label, IUndoContext undoContext, DerivedUnitBase derivedUnit,
+	public AddDerivedUnitFacadeMediaOperation(String label, IUndoContext undoContext, DerivedUnit derivedUnit,
 			int mode, IPostOperationEnabled postOperationEnabled) {
 		super(label, undoContext, postOperationEnabled);
 		
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
index 3281cc226..015b24a28 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
@@ -76,4 +76,10 @@ public class AgentCreator implements IEntityCreator<AgentBase> {
 		result.put(Person.class, "Author");
 		return result;
 	}
+
+	@Override
+	public boolean savesEntity() {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
index e5f2deb9a..86dbde2e5 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
@@ -49,4 +49,10 @@ public class GroupCreator implements IEntityCreator<Group> {
 		return result;
 	}
 
+	@Override
+	public boolean savesEntity() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
index 12fe3a4e3..776b223ea 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
@@ -62,4 +62,10 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
 		}
 		return result;
 	}
+
+	@Override
+	public boolean savesEntity() {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
index f77a675bc..db3d60f77 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
@@ -10,20 +10,21 @@
 
 package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
 
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.wizard.WizardDialog;
 
-import eu.etaxonomy.cdm.model.molecular.DnaSample;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
-import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
-import eu.etaxonomy.cdm.model.occurrence.Fossil;
-import eu.etaxonomy.cdm.model.occurrence.LivingBeing;
-import eu.etaxonomy.cdm.model.occurrence.Observation;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
+import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
+import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
 
 /**
  * <p>
@@ -42,33 +43,25 @@ public class OccurrenceCreator implements
 	/** {@inheritDoc} */
 	@Override
 	public SpecimenOrObservationBase createEntity(String text) {
-		return createEntity(Specimen.class, text);
+
+		return createEntity(DerivedUnit.class, text);
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public SpecimenOrObservationBase createEntity(Object key, String text) {
+		
 		SpecimenOrObservationBase specimenOrObservation = null;
+		NewDerivedUnitBaseWizard wizard = new NewDerivedUnitBaseWizard((SpecimenOrObservationType)key);
+		wizard.init(null, null);
+		if(wizard.getEntity() != null) {
+			WizardDialog dialog = new WizardDialog(BulkEditorUtil.getShell(), wizard);
+			int status = dialog.open();
 
-		if (FieldObservation.class.equals((key))) {
-			specimenOrObservation = FieldObservation.NewInstance();
-		} else if (DerivedUnit.class.equals((key))) {
-			specimenOrObservation = DerivedUnit.NewInstance();
-		} else if (LivingBeing.class.equals((key))) {
-			specimenOrObservation = LivingBeing.NewInstance();
-		} else if (Observation.class.equals((key))) {
-			specimenOrObservation = Observation.NewInstance();
-		} else if (Specimen.class.equals((key))) {
-			specimenOrObservation = Specimen.NewInstance();
-		} else if (DnaSample.class.equals((key))) {
-			specimenOrObservation = DnaSample.NewInstance();
-		} else if (Fossil.class.equals((key))) {
-			specimenOrObservation = Fossil.NewInstance();
-		}
-
-		if (specimenOrObservation != null) {
-			specimenOrObservation.setTitleCache(text, true);
-		}
+			if (status == IStatus.OK) {
+				specimenOrObservation = wizard.getEntity();								
+			}
+		} 
 		return specimenOrObservation;
 	}
 
@@ -81,21 +74,27 @@ public class OccurrenceCreator implements
 	 */
 	@Override
 	public Map<Object, String> getKeyLabelPairs() {
-		Map<Object, String> result = new HashMap<Object, String>();
-
-		result.put(Specimen.class, "Specimen");
-		result.put(Observation.class, "Observation");
-		result.put(LivingBeing.class, "Living Being");
-		result.put(Fossil.class, "Fossil");
-		result.put(DerivedUnit.class, "Derived Unit");
-
-		// Omitted at the moment see #2266
-		// result.put(DnaSample.class, "Dna Sample");
+		Comparator<Object> comparator = new Comparator<Object>() {
+			  public int compare(Object o1, Object o2) {
+			    String key1 = ((SpecimenOrObservationType)o1).getKey();
+			    String key2 = ((SpecimenOrObservationType)o2).getKey();
+			    return key1.compareTo(key2);
+			  }
+			};
+		Map<Object, String> result = new TreeMap<Object, String>(comparator);
 
-		// Omitted see #2266
-		// result.put(FieldObservation.class, "Field Observation");
-		// result.put(Observation.class, "Observation");
+		for(SpecimenOrObservationType sooType : SpecimenOrObservationType.values()) {				
+			result.put(sooType, sooType.getMessage());				
+		}
 
 		return result;
 	}
+
+	@Override
+	public boolean savesEntity() {
+		// TODO Auto-generated method stub
+		return true;
+	}
+	
+
 }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
index cee07a264..92d94ee4a 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
@@ -115,4 +115,10 @@ public class ReferenceCreator implements IEntityCreator<Reference> {
 		}
 		return result;
 	}
+
+	@Override
+	public boolean savesEntity() {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
index 2d8750ab3..d092ce03a 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
@@ -61,4 +61,10 @@ public class UserCreator  implements IEntityCreator<User>{
 		return result;
 	}
 
+	@Override
+	public boolean savesEntity() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
 }
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 9d8630de0..e333dba50 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -25,22 +25,22 @@
 	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.2.3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.2.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.2.3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.2.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.2.3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.2.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.2.3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.2.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.2.3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.2.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.2.3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.2.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.2.3-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.2.3-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.2.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.2.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.2.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.2.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.2.4-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.2.4-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
index 9fb167cc8..4cf488ee3 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
index 25f118068..f131a431c 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar differ
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index df7875ca6..a951ef903 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -26,8 +26,8 @@ import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditorInput;
 import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditor;
+import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditorInput;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.key.KeyEditor;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditorInput;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java
index d9c202c99..aa6dc659c 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditorDataChangeBehaviour.java
@@ -17,8 +17,8 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent;
-import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;
+import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.AbstractDataChangeBehaviour;
 import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
index 6db78f03d..6a295e64e 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
@@ -37,6 +37,7 @@ import eu.etaxonomy.taxeditor.model.DataChangeBridge;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
+
 /**
  * <p>TaxonEditorInput class.</p>
  *
@@ -47,20 +48,20 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPersistableElement {
 
 	private ConversationHolder conversation;
-	
+
 	private TaxonNode taxonNode;
 
 	private TaxonEditorInputDataChangeBehaviour dataChangeBehavior;
-	
+
 	private TaxonBase initiallySelectedTaxonBase;
-	
+
 	private TaxonEditorInput(TaxonNode taxonNode, ConversationHolder conversation){
 		this.conversation = conversation;
 		this.taxonNode = taxonNode;
 	}
-	
 
-	
+
+
 	/**
 	 * <p>NewInstance</p>
 	 *
@@ -76,26 +77,26 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 			throw e;
 		}
 	}
-	
+
     /**
-     * 
+     *
      * @param taxonNodeUuid
      * @param conversation
      * @return
      */
     private static TaxonEditorInput NewInstance(UUID taxonNodeUuid, ConversationHolder conversation){
-    	
-    	
+
+
     	TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNodeUuid, null);
-		
+
 		if(taxonNode == null){
 			EditorUtil.warningDialog("Not yet implemented", TaxonEditorInput.class, "Selected element is not type TaxonBase.");
 			return null;
-		}	
-		
+		}
+
     	return new TaxonEditorInput(taxonNode, conversation);
     }
-    
+
     /**
      * <p>NewInstanceFromTaxonBase</p>
      *
@@ -104,20 +105,20 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
      */
     public static TaxonEditorInput NewInstanceFromTaxonBase(UUID taxonBaseUuid){
     	ConversationHolder conversation = CdmStore.createConversation();
-    	
+
     	TaxonEditorInput input = null;
-    	
+
     	TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).find(taxonBaseUuid);
     	if(taxonBase.isOrphaned()) {
     		EditorUtil.warningDialog("Orphaned Taxon", TaxonEditorInput.class, "This is an orphaned taxon i.e. a taxon that is not connected to a classification and not having any taxonomic relationships. Editing of orphaned taxon is currently not supported.");
     	}
     	else if(taxonBase.isInstanceOf(Taxon.class)){
     		Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class);
-    		
+
     		if (taxon.isMisapplication()){
     			// TODO get accepted taxon
     			EditorUtil.info("trying to open Mispplied Name ");
-    			
+
     			Set<Taxon> acceptedTaxa = new HashSet<Taxon>();
     			Set<TaxonRelationship> relations = taxon.getRelationsFromThisTaxon();
     			for(TaxonRelationship relation : relations){
@@ -126,22 +127,22 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
     				}
     			}
     			input =  getInputForMultipleTaxa(conversation, acceptedTaxa);
-    			
+
     		}else{
     			input = getInputForMultipleNodes(conversation, taxon.getTaxonNodes());
     		}
     	}else if(taxonBase instanceof Synonym){
     		Synonym synonym = (Synonym) taxonBase;
-    		
+
     		Set<Taxon> taxa = synonym.getAcceptedTaxa();
     		input = getInputForMultipleTaxa(conversation, taxa);
     	}
-    	
+
     	input.setInitiallySelectedTaxonBase(taxonBase);
-    	
+
     	return input;
     }
-    
+
 	private static TaxonEditorInput getInputForMultipleNodes(ConversationHolder conversation, Set<TaxonNode> taxonNodes){
     	if(taxonNodes.size() == 1){
     		TaxonNode taxonNode = taxonNodes.iterator().next();
@@ -149,7 +150,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
     	}else if(taxonNodes.size() > 1){
 			TaxonNode taxonNode = ChooseFromMultipleTaxonNodesDialog.choose(taxonNodes);
 			if(taxonNode != null){
-				return NewInstance(taxonNode.getUuid(), conversation);			
+				return NewInstance(taxonNode.getUuid(), conversation);
 			}
 		}else if(taxonNodes.size() == 0){
 			// this is an undesired state
@@ -157,7 +158,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 		}
     	return null;
     }
-    
+
     private static TaxonEditorInput getInputForMultipleTaxa(ConversationHolder conversation, Set<Taxon> taxa){
     	if(taxa.size() == 1){
     		Taxon taxon = taxa.iterator().next();
@@ -176,7 +177,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 		}
     	return null;
     }
-    
+
     /**
      * <p>NewEmptyInstance</p>
      *
@@ -185,19 +186,19 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
      */
     public static TaxonEditorInput NewEmptyInstance(UUID parentNodeUuid){
     	ConversationHolder conversation = CdmStore.createConversation();
-		
+
 		TaxonNameBase<?, ?> name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
-		ITreeNode parentNode = CdmStore.getService(IClassificationService.class).getTreeNodeByUuid(parentNodeUuid);
-		
+		ITaxonTreeNode parentNode = CdmStore.getService(IClassificationService.class).getTreeNodeByUuid(parentNodeUuid);
+
 		Taxon newTaxon = Taxon.NewInstance(name, parentNode.getReference());
-		TaxonNode newTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference(), null);
-		
+		TaxonNode newTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference());
+
 		// add the new taxon to the editors persistence context
 		UUID newTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).save(newTaxonNode);
-		
+
 		return new TaxonEditorInput(newTaxonNode, conversation);
     }
-	
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IEditorInput#exists()
 	 */
@@ -206,7 +207,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 *
 	 * @return a boolean.
 	 */
-	public boolean exists() {
+	@Override
+    public boolean exists() {
 		return taxonNode != null;
 	}
 
@@ -218,7 +220,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 *
 	 * @return a {@link org.eclipse.jface.resource.ImageDescriptor} object.
 	 */
-	public ImageDescriptor getImageDescriptor() {
+	@Override
+    public ImageDescriptor getImageDescriptor() {
 		return null;
 	}
 
@@ -230,7 +233,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 *
 	 * @return a {@link java.lang.String} object.
 	 */
-	public String getName() {
+	@Override
+    public String getName() {
 		if(getTaxon() == null){
 			return null;
 		}
@@ -239,7 +243,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 			return "New taxon";
 		} else {
 			return name.getTitleCache();
-		}	
+		}
 	}
 
 	/* (non-Javadoc)
@@ -250,7 +254,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 *
 	 * @return a {@link org.eclipse.ui.IPersistableElement} object.
 	 */
-	public IPersistableElement getPersistable() {
+	@Override
+    public IPersistableElement getPersistable() {
 //		if(CdmStore.isActive()){
 //			TaxonNode test = CdmStore.getTaxonTreeService().getTaxonNodeByUuid(taxonNode.getUuid());
 //			boolean isPersistable = CdmStore.getTaxonTreeService().getTaxonNodeByUuid(taxonNode.getUuid()) != null;
@@ -269,7 +274,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 *
 	 * @return a {@link java.lang.String} object.
 	 */
-	public String getToolTipText() {
+	@Override
+    public String getToolTipText() {
 		return getName();
 	}
 
@@ -277,27 +283,29 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
 	/** {@inheritDoc} */
-	public Object getAdapter(Class adapter) {
+	@Override
+    public Object getAdapter(Class adapter) {
 
 		if (adapter == Taxon.class) {
 			return taxonNode.getTaxon();
 		}
-		
+
 		if (adapter == TaxonNode.class) {
 			return taxonNode;
 		}
-		
+
 		return null;
 	}
-	
+
 	/**
 	 * {@inheritDoc}
 	 *
 	 * Overrides equals to ensure that a taxon can only be edited by
 	 * one editor at a time.
 	 */
-	public boolean equals(Object obj) {
-		if (TaxonEditorInput.class.equals(obj.getClass()) 
+	@Override
+    public boolean equals(Object obj) {
+		if (TaxonEditorInput.class.equals(obj.getClass())
 				&& getTaxon() != null
 				&& getTaxon().equals(((TaxonEditorInput) obj).getTaxon())){
 			if(((TaxonEditorInput) obj).getInitiallySelectedTaxonBase() != null){
@@ -316,7 +324,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	public Taxon getTaxon(){
 		return taxonNode.getTaxon();
 	}
-	
+
 	/**
 	 * <p>Getter for the field <code>taxonNode</code>.</p>
 	 *
@@ -325,7 +333,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	public TaxonNode getTaxonNode() {
 		return taxonNode;
 	}
-	
+
 	/*
 	 * (non-Javadoc)
 	 * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
@@ -335,7 +343,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 *
 	 * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
 	 */
-	public ConversationHolder getConversationHolder() {
+	@Override
+    public ConversationHolder getConversationHolder() {
 		return conversation;
 	}
 
@@ -344,11 +353,12 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostCrudObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmCrudEvent)
 	 */
 	/** {@inheritDoc} */
-	public void update(CdmDataChangeMap events) {
+	@Override
+    public void update(CdmDataChangeMap events) {
 		if(dataChangeBehavior == null){
 			dataChangeBehavior = new TaxonEditorInputDataChangeBehaviour(this);
 		}
-		
+
 		DataChangeBridge.handleDataChange(events, dataChangeBehavior);
 	}
 
@@ -360,7 +370,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 *
 	 * @return a {@link java.lang.String} object.
 	 */
-	public String getFactoryId() {
+	@Override
+    public String getFactoryId() {
 		return TaxonEditorInputFactory.getFactoryId();
 	}
 
@@ -368,11 +379,12 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	 * @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
 	 */
 	/** {@inheritDoc} */
-	public void saveState(IMemento memento) {
+	@Override
+    public void saveState(IMemento memento) {
 		TaxonEditorInputFactory.saveState(memento, this);
 	}
 
-    
+
     /**
      * <p>Setter for the field <code>initiallySelectedTaxonBase</code>.</p>
      *
@@ -390,7 +402,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
 	public TaxonBase getInitiallySelectedTaxonBase() {
 		return initiallySelectedTaxonBase;
 	}
-	
+
 	@Override
 	public String toString() {
 		return String.format("%s[%s]", this.getClass().getSimpleName(), getTaxon());
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java
index b4dafb7e7..a12ebd3bf 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java
@@ -18,12 +18,12 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
-import eu.etaxonomy.cdm.model.description.Modifier;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -122,21 +122,34 @@ public class UseObjectManager extends ContextListenerAdapter{
 
 
 	private void createHumanGroupVocabulary(IProgressMonitor monitor,ConversationHolder conversation) {
-		TermVocabulary<Modifier> humanGroupVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);
+		TermVocabulary<DefinedTerm> humanGroupVocabulary =  (TermVocabulary<DefinedTerm>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);
 		if (humanGroupVocabulary == null){
 			monitor.subTask("create human group vocabulary");
 			URI termSourceUri = null;
 			try {
-				termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");
+				termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm");
 			} catch (URISyntaxException e) {
 				e.printStackTrace();
 			}
-			humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri);
+			
+			//FIXME:3.3MC----
+			//humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri);
+			humanGroupVocabulary = null;
 			humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary);
-			Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			//FIXME:3.3MC----
+			
+			//FIXME:3.3MC----
+			//DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			DefinedTerm newDummyModifier = null;
 			newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy);
-			Modifier newSubDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			//FIXME:3.3MC----
+			
+			//FIXME:3.3MC----
+			//DefinedTerm newSubDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			DefinedTerm newSubDummyModifier = null;
 			newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy);
+			//FIXME:3.3MC----
+			
 			newDummyModifier.addIncludes(newSubDummyModifier);
 			humanGroupVocabulary.addTerm(newDummyModifier);
 			CdmStore.getService(IVocabularyService.class).saveOrUpdate(humanGroupVocabulary);
@@ -146,20 +159,28 @@ public class UseObjectManager extends ContextListenerAdapter{
 
 
 	private void createPlantVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {
-		TermVocabulary<Modifier> plantPartVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);
+		TermVocabulary<DefinedTerm> plantPartVocabulary =  (TermVocabulary<DefinedTerm>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);
 		if (plantPartVocabulary == null){
 			monitor.subTask("create plant part vocabulary");
 			URI termSourceUri = null;
 			try {
-				termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");
+				termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm");
 			} catch (URISyntaxException e) {
 				e.printStackTrace();
 			}
-			plantPartVocabulary = TermVocabulary.NewInstance(UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri);
+			//FIXME:3.3MC----
+			//plantPartVocabulary = TermVocabulary.NewInstance(UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri);
+			plantPartVocabulary = null;
 			plantPartVocabulary.setUuid(UsageTermCollection.uuidPlantPartVocabulary);
-			Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			//FIXME:3.3MC----
+			
+			//FIXME:3.3MC----
+			//DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			DefinedTerm newDummyModifier = null;
 			newDummyModifier.setUuid(UsageTermCollection.uuidPlantPartDummy);
 			plantPartVocabulary.addTerm(newDummyModifier);
+			//FIXME:3.3MC----
+			
 			CdmStore.getService(IVocabularyService.class).saveOrUpdate(plantPartVocabulary);
 			conversation.commit(true);
 		}
@@ -167,19 +188,26 @@ public class UseObjectManager extends ContextListenerAdapter{
 
 
 	private void createCountryVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {
-		TermVocabulary<Modifier> countryVocabulary =  (TermVocabulary<Modifier>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);
+		TermVocabulary<DefinedTerm> countryVocabulary =  (TermVocabulary<DefinedTerm>) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);
 		if (countryVocabulary == null){
 			monitor.subTask("create country vocabulary");
 			URI termSourceUri = null;
 			try {
-				termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier");
+				termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm");
 			} catch (URISyntaxException e) {
 				e.printStackTrace();
 			}
-			countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri);
+			//FIXME:3.3MC----
+			//countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri);
+			countryVocabulary = null;
 			countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary);
-			Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			//FIXME:3.3MC----
+			
+			//FIXME:3.3MC----
+			//DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
+			DefinedTerm newDummyModifier = null;
 			newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy);
+			//FIXME:3.3MC----
 			countryVocabulary.addTerm(newDummyModifier);
 			CdmStore.getService(IVocabularyService.class).saveOrUpdate(countryVocabulary);
 			conversation.commit(true);
@@ -197,8 +225,11 @@ public class UseObjectManager extends ContextListenerAdapter{
 			} catch (URISyntaxException e) {
 				e.printStackTrace();
 			}
-			stateVocabulary = TermVocabulary.NewInstance(UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri);
+			//FIXME:3.3MC----
+			//stateVocabulary = TermVocabulary.NewInstance(UsageTermCollection.useCategoryVocabularyLabel, UsageTermCollection.useCategoryVocabularyLabel, null, termSourceUri);
+			stateVocabulary = null;
 			stateVocabulary.setUuid(UsageTermCollection.uuidUseCategoryVocabulary);
+			//FIXME:3.3MC----
 			State newDummyState = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
 			newDummyState.setUuid(UsageTermCollection.uuidUseCategoryDummy);
 			State newDummySubCat = State.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
index 648e35a6a..0f7cadb8a 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
@@ -43,8 +43,10 @@ public class TaxeditorEditorPlugin extends AbstractUIPlugin {
 		EditorStateManager stateManager = new EditorStateManager();
 		CdmStore.getContextManager().addContextListener(stateManager);
 		
-		UseObjectManager useManager = new UseObjectManager();
-		CdmStore.getContextManager().addContextListener(useManager);
+		//FIXME:3.3MC----
+		//UseObjectManager useManager = new UseObjectManager();
+		//CdmStore.getContextManager().addContextListener(useManager);
+		//FIXME:3.3MC----
 		
 		plugin = this;
 		logger.trace("Plugin started: " + this.getBundle().getSymbolicName());
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
index 0e1e3be37..492e597fb 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
@@ -23,13 +23,11 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTarget;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SwapSynonymAndAcceptedHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SwapSynonymAndAcceptedHandler.java
index 507d44cf7..55c685bdf 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SwapSynonymAndAcceptedHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SwapSynonymAndAcceptedHandler.java
@@ -18,14 +18,11 @@ import org.eclipse.core.commands.IHandler;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.forms.editor.FormEditor;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.operation.SwapSynonymAndAcceptedOperation;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
index fa39cab53..5d8b351fd 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -36,37 +36,37 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPostOperation {
-	
+
 	private Taxon newTaxon;
 	private Synonym synonym;
-	private ITreeNode parentNode;
+	private ITaxonTreeNode parentNode;
 
 	private TaxonNode newNode;
 
 	private Synonym[] synonymsInHomotypicalGroup;
-	
+
 	/**
 	 * <p>Constructor for ChangeSynonymToAcceptedTaxonOperation.</p>
 	 *
 	 * @param label a {@link java.lang.String} object.
 	 * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
 	 * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
-	 * @param parentNode a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+	 * @param parentNode a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
 	 * @param synonym a {@link eu.etaxonomy.cdm.model.taxon.Synonym} object.
 	 * @param synonymsInHomotypicalGroup an array of {@link eu.etaxonomy.cdm.model.taxon.Synonym} objects.
 	 * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
 	 * @param conversationEnabled a {@link eu.etaxonomy.cdm.api.conversation.IConversationEnabled} object.
 	 */
 	public ChangeSynonymToAcceptedTaxonOperation(String label, IUndoContext undoContext,
-			Taxon taxon, ITreeNode parentNode, Synonym synonym, Synonym[] synonymsInHomotypicalGroup, IPostOperationEnabled postOperationEnabled, IConversationEnabled conversationEnabled) {
+			Taxon taxon, ITaxonTreeNode parentNode, Synonym synonym, Synonym[] synonymsInHomotypicalGroup, IPostOperationEnabled postOperationEnabled, IConversationEnabled conversationEnabled) {
 		super(label, undoContext, postOperationEnabled, conversationEnabled);
 
 		this.taxon = taxon;
 		this.parentNode = parentNode;
-		this.synonym = synonym; 
+		this.synonym = synonym;
 		this.synonymsInHomotypicalGroup = synonymsInHomotypicalGroup;
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
 	 */
@@ -74,7 +74,7 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
-		
+
 		try {
 			newTaxon = CdmStore.getService(ITaxonService.class).changeSynonymToAcceptedTaxon(synonym, taxon, true, true, null, null);
 		} catch (HomotypicalGroupChangeException e) {
@@ -82,17 +82,17 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 			return postExecute(null);
 		}
 		monitor.worked(20);
-		
+
 		synonym.setSec(null);
-		newNode = parentNode.addChildTaxon(newTaxon, null, null, null);
-		
+		newNode = parentNode.addChildTaxon(newTaxon, null, null);
+
 		if(synonymsInHomotypicalGroup != null){
 			Taxon taxon = newNode.getTaxon();
 			for (Synonym synonym : synonymsInHomotypicalGroup){
 				taxon.addHomotypicSynonym(synonym, null, null);
 			}
 		}
-		
+
 		monitor.worked(40);
 
 		return postExecute(newNode);
@@ -115,10 +115,10 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
-		
+
 		// TODO implement - biggest problem is that any window open for new taxon must be closed first
 		StoreUtil.warn(this.getClass(), "Not yet implemented");
-		
+
 		return postExecute(taxon);
 	}
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
index 766c5cf8d..0c10b9ad7 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * European Distributed Institute of Taxonomy
  * http://www.e-taxonomy.eu
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
@@ -31,7 +31,6 @@ import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.UsageTermCollection;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateDescriptionElementOperation;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -42,7 +41,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * <p>
  * DynamicFeatureMenu class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created 17.04.2009
  * @version 1.0
@@ -56,7 +55,7 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()
 	 */
@@ -65,7 +64,8 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
 	protected IContributionItem[] getContributionItems() {
 
 		return new IContributionItem[] { new ContributionItem() {
-			public void fill(Menu menu, int index) {
+			@Override
+            public void fill(Menu menu, int index) {
 
 				ISelection selection = selectionService
 						.getSelection(DescriptiveViewPart.ID);
@@ -90,7 +90,7 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
 						createMenuItem(menu, featureNode.getFeature());
 
 						// add possible children to the menu
-						for (FeatureNode childNode : featureNode.getChildren()) {
+						for (FeatureNode childNode : featureNode.getChildNodes()) {
 							createMenuItem(menu, childNode.getFeature());
 						}
 					} else if (selectedElement instanceof DescriptionElementBase) {
@@ -111,10 +111,12 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
 		menuItem.setText(deproxiedFeature.getLabel());
 		menuItem.addSelectionListener(new SelectionListener() {
 
-			public void widgetDefaultSelected(SelectionEvent e) {
+			@Override
+            public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
-			public void widgetSelected(SelectionEvent ev) {
+			@Override
+            public void widgetSelected(SelectionEvent ev) {
 				Event event = new Event();
 				event.data = deproxiedFeature;
 				try {
@@ -130,10 +132,10 @@ public class DynamicFeatureMenu extends CompoundContributionItem {
 
 	/**
 	 * Retrieves the feature tree associated with the given description
-	 * 
+	 *
 	 * TODO as of now this is always the same thing because feature trees may
 	 * not be associated to descriptions yet.
-	 * 
+	 *
 	 * @param description
 	 * @return
 	 */
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
index 94643dbcc..bddcfbfea 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
@@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
@@ -63,9 +63,9 @@ public class MediaContentProvider implements ITreeContentProvider{
 				return getImages((DescriptionBase) parentElement).toArray();
 			} 
 		}
-		else if (parentElement instanceof DerivedUnitBase){
+		else if (parentElement instanceof DerivedUnit){
 			try {
-				DerivedUnitFacade facade = DerivedUnitFacade.NewInstance((DerivedUnitBase) parentElement);
+				DerivedUnitFacade facade = DerivedUnitFacade.NewInstance((DerivedUnit) parentElement);
 		
 				// TODO at the moment we always create image galleries because the facade is like so.
 				// this should definitely change and we want to use normal getters and setters here
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java
index 234dfb238..a18a10293 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java
@@ -7,22 +7,12 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
-import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.SpecimenDescription;
-import eu.etaxonomy.cdm.model.description.TextData;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
-import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
index 1858c850a..6f85e5202 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
@@ -15,11 +15,11 @@ import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
-import eu.etaxonomy.cdm.model.description.Modifier;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -49,9 +49,9 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 			}
 		}
 		else if (element instanceof CategoricalData) {
-			if (!((CategoricalData) element).getStates().isEmpty()) {
+			if (!((CategoricalData) element).getStateData().isEmpty()) {
 				boolean isUseCategoryAbsent = true;
-				for (StateData statedata : ((CategoricalData) element).getStates()) {
+				for (StateData statedata : ((CategoricalData) element).getStateData()) {
 					if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) {
 						text = text + statedata.getState().getTitleCache() + ";";
 						isUseCategoryAbsent = false;
@@ -62,7 +62,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 				}
 				
 				boolean isUseSubCategoryAbsent = true;
-				for (StateData statedata : ((CategoricalData) element).getStates()) {
+				for (StateData statedata : ((CategoricalData) element).getStateData()) {
 					if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useSubCategoryVocabularyLabel)) {
 						text = text + statedata.getState().getTitleCache() + ";";
 						isUseSubCategoryAbsent = false;
@@ -76,13 +76,13 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 				text = text + UsageTermCollection.notAvailableLabel + ";" + UsageTermCollection.notAvailableLabel + ";";
 			}
 			if (!((CategoricalData) element).getModifiers().isEmpty()) {
-				for (Modifier modifier: ((CategoricalData) element).getModifiers()){
+				for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
 					modifier.getPartOf();
 					modifier.getVocabulary();
 				}
 				
 				boolean isPlantPartAbsent = true;
-				for (Modifier modifier: ((CategoricalData) element).getModifiers()){
+				for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
 					if(GetVocabularyType(modifier, UsageTermCollection.plantPartLabel)) {
 						text = text +  modifier.getTitleCache()+ ";";
 						isPlantPartAbsent = false;
@@ -94,7 +94,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 				}
 				
 				boolean isHumanGroupAbsent = true;
-				for (Modifier modifier: ((CategoricalData) element).getModifiers()){
+				for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
 					if(GetVocabularyType(modifier, UsageTermCollection.humanGroupLabel)) {
 						text = text +  modifier.getTitleCache()+ ";";
 						isHumanGroupAbsent = false;
@@ -105,7 +105,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 				}
 				
 				boolean isEthnicGroupAbsent = true;
-				for (Modifier modifier: ((CategoricalData) element).getModifiers()){
+				for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
 					if(GetVocabularyType(modifier, UsageTermCollection.ethnicGroupLabel)) {
 						text = text +  modifier.getTitleCache()+ ";";
 						isEthnicGroupAbsent = false;
@@ -116,7 +116,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 				}
 				
 				boolean isCountryAbsent = true;
-				for (Modifier modifier: ((CategoricalData) element).getModifiers()){
+				for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){
 					if(GetVocabularyType(modifier, UsageTermCollection.countryLabel)) {
 						text = text +  modifier.getTitleCache()+ ";";
 						isCountryAbsent = false;
@@ -164,7 +164,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 	 * @param vocabularyExpected
 	 * @return
 	 */
-	private boolean GetVocabularyType(Modifier term, String vocabularyExpected) {
+	private boolean GetVocabularyType(DefinedTerm term, String vocabularyExpected) {
 		if ((term.getPartOf() != null)  && (term.getPartOf().getTitleCache().equals(vocabularyExpected))) {
 			return true;
 		}
diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java
index f3dae1afb..c30009bd6 100644
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java
@@ -49,10 +49,10 @@ public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTestBase {
 		newParentTaxon = Taxon.NewInstance(null, null);
 		
 		tree = Classification.NewInstance(null);
-		oldParentTaxonNode = tree.addChildTaxon(oldParentTaxon, null, null, null);
-		newParentTaxonNode = tree.addChildTaxon(newParentTaxon, null, null, null);
+		oldParentTaxonNode = tree.addChildTaxon(oldParentTaxon, null, null);
+		newParentTaxonNode = tree.addChildTaxon(newParentTaxon, null, null);
 		
-		taxonNode = oldParentTaxonNode.addChildTaxon(taxon, null, null, null);
+		taxonNode = oldParentTaxonNode.addChildTaxon(taxon, null, null);
 		
 		operation = null;//new MoveTaxonOperation("Move Taxon To Different Parent", undoContext, taxonNode, newParentTaxonNode, postOperation);
 	}
diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
index 7f4d1d485..37065b5d6 100644
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
@@ -107,7 +107,7 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
 		
 		// Create a concept relation
 		concept = Taxon.NewInstance(NonViralName.NewInstance(null), null);
-		conceptRelationshipType = new TaxonRelationshipType();
+		conceptRelationshipType = TaxonRelationshipType.CONGRUENT_TO();
 		concept.addTaxonRelation(taxon, conceptRelationshipType, null, null);	
 		
 		// Create a description
diff --git a/eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html b/eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html
index e0c765462..ed033aadb 100644
--- a/eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html
+++ b/eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html
@@ -34,7 +34,7 @@ The <strong>"Create New Datasource"</strong> panel will appear.
 		The <strong>"Enter credentials for embedded H2 database"</strong> pop-up box will open.
  	</li>
 	<li>Enter a Database name (for example the name of a user or a taxonomic group).</li>
-	<li>Select <strong>ICBN</strong> or <strong>ICZN</strong> as appropriate.</li>
+	<li>Select <strong>ICNAFP</strong> or <strong>ICZN</strong> as appropriate.</li>
 	<li>Click <strong>Finish</strong>.</li>
 	<p><img src="../img/2_10f.jpg" alt="" /></p> 
 </ol>
@@ -45,4 +45,4 @@ The <strong>"Create New Datasource"</strong> panel will appear.
 <p>The new Datasource will appear in the Datasource panel: <p><img src="../img/2_10g.jpg" alt="" /></p></p> 
  
 <p>The process to create new datasources can be repeated as many times as desired.</p>
- 
\ No newline at end of file
+ 
diff --git a/eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html b/eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html
index 95549cea6..5a03b8094 100644
--- a/eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html
+++ b/eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html
@@ -25,7 +25,7 @@
 					<li><strong>Matching:</strong> Experimental feature, not yet fully functional.</li>
 					<li><strong>Taxonomic:</strong> Name Relationships Type: for example "misspelling for", "basionym for".</li>
 					<li><strong>Name Type Designation Status:</strong> for example "monotypy", "present designation"</li>
-					<li><strong>Nomenclatural Code:</strong> ICBN or ICZN.</li>
+					<li><strong>Nomenclatural Code:</strong> ICNAFP or ICZN.</li>
 					<li><strong>Nomenclatural Status Type:</strong> for example "invalid", "conserved".</li>
 					<li><strong>Ranks:</strong> for example "cultivar", "tribe".</li>
 					<li><strong>Specimen Type Designation Status:</strong> for example "epitype", "holotype".</li>
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/ClassificationLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/ClassificationLabelProvider.java
index 7d16f1904..76f8bc0ab 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/ClassificationLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/ClassificationLabelProvider.java
@@ -18,8 +18,6 @@ import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.navigator.IDescriptionProvider;
 
-import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 
 /**
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/SynonymLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/SynonymLabelProvider.java
index de5a60595..158423da0 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/SynonymLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/SynonymLabelProvider.java
@@ -12,9 +12,9 @@ package eu.etaxonomy.taxeditor.navigation.navigator;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.navigator.IDescriptionProvider;
 
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
index b50082362..9816d777b 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -21,7 +21,7 @@ import org.eclipse.ui.IEditorPart;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent.EventType;
@@ -38,13 +38,13 @@ import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
  * @created 01.04.2009
  * @version 1.0
  */
-public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviour implements 
+public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviour implements
 		IDataChangeBehavior {
 
 	private TaxonNavigator source;
 
 	private Set<CdmBase> staleObjects;
-	
+
 	/**
 	 * <p>Constructor for TaxonNavigatorDataChangeBehavior.</p>
 	 *
@@ -53,7 +53,7 @@ public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviou
 	public TaxonNavigatorDataChangeBehavior(TaxonNavigator taxonNavigator) {
 		source = taxonNavigator;
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#isRelevant(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmCrudEvent)
 	 */
@@ -64,22 +64,22 @@ public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviou
 	 * @return a boolean.
 	 */
 	public boolean isRelevant(CdmDataChangeMap events) {
-		
+
 		// TODO react only on insert/update/delete of taxon and synonym objects
 		// and on update of name objects
 		boolean relevant = false;
 		staleObjects = new HashSet<CdmBase>();
-		
+
 		for(CdmDataChangeEvent event : events.getAllEvents()){
 			EventType eventType = event.getEventType();
 			CdmBase eventEntity = event.getEntity();
-			
+
 			// all tree node changes are relevant
-			if((eventType == EventType.INSERT || eventType == EventType.DELETE || eventType == EventType.UPDATE) 
-					&& event.getEntity() instanceof ITreeNode){
+			if((eventType == EventType.INSERT || eventType == EventType.DELETE || eventType == EventType.UPDATE)
+					&& event.getEntity() instanceof ITaxonTreeNode){
 				return true;
 			}
-			
+
 			// name updates of the accepted taxon of open editors are relevant
 			if(eventType == EventType.UPDATE){
 				TaxonNameBase name = null;
@@ -90,17 +90,17 @@ public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviou
 				}else{
 					continue;
 				}
-				
+
 				Set<IEditorPart> openEditors = NavigationUtil.getOpenEditors();
 				for(IEditorPart editor : openEditors){
-					
+
 					if(name.equals(((TaxonEditorInput) editor.getEditorInput()).getTaxon().getName())){
 						return true;
 					}
 				}
 			}
-			
-			
+
+
 //			if(eventType == EventType.UPDATE){
 //				relevant = true;
 //				CdmBase entity = event.getEntity();
@@ -111,9 +111,9 @@ public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviou
 //				}
 //			}
 		}
-		
+
 		return false;
-		
+
 		// @deprecated
 		// react on everything except load
 //		if(events.sizeByEventType(EventType.INSERT) > 0){
@@ -131,25 +131,27 @@ public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviou
 	 * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#reactOnDataChange(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmCrudEvent)
 	 */
 	/** {@inheritDoc} */
-	public void reactOnDataChange(CdmDataChangeMap events) {
+	@Override
+    public void reactOnDataChange(CdmDataChangeMap events) {
 		if(isRelevant(events)){
 
 			final Display display = Display.getCurrent();
 			Job job = new Job("Updating Taxon Navigator") {
-				
+
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					monitor.beginTask("Updating Taxon Navigator", 3);
 					monitor.worked(1);
-					
+
 					// clear the session completely
 					monitor.subTask("Clearing Taxon Navigators session");
 					display.asyncExec(new Runnable() {
-						 public void run() {
+						 @Override
+                        public void run() {
 							 source.getConversationHolder().clear();
 						 }
-					});					
-					// FIXME completely clearing the session is a brute force approach. 
+					});
+					// FIXME completely clearing the session is a brute force approach.
 					// It would be much more elegant to clear only those elements that have been changed.
 					// I could not get that to work but we should consider workin on this because we might
 					// run into serious performance issues, especially when it comes to large trees
@@ -157,26 +159,27 @@ public class TaxonNavigatorDataChangeBehavior extends AbstractDataChangeBehaviou
 					// at least, we moved this to a job so it can run in a background thred
 					// seems to improve the situation but not sure if final solution
 					monitor.worked(1);
-					
+
 					monitor.subTask("Refreshing viewer");
-					
+
 					display.asyncExec(new Runnable() {
-					    public void run() {
+					    @Override
+                        public void run() {
 					    	source.refresh();
 					    }
 					});
-					
-					
-					
+
+
+
 					monitor.worked(1);
 					monitor.done();
 					return Status.OK_STATUS;
 				}
 			};
-			
+
 			job.setPriority(Job.SHORT);
 			job.schedule();
-			
+
 		}
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
index 7819132c1..c7a431daf 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 
 /**
@@ -30,29 +30,32 @@ public class TaxonNodeContentProvider implements ITreeContentProvider {
 			.getLogger(TaxonNodeContentProvider.class);
 
 	private static final Object[] NO_CHILDREN = new Object[0];
-	
+
 	/** {@inheritDoc} */
-	public Object[] getChildren(Object parentElement) {
-		Object[] children = null;		
-		
-		if(parentElement instanceof ITreeNode){
-			ITreeNode treeNode = (ITreeNode) HibernateProxyHelper.deproxy(parentElement);
+	@Override
+    public Object[] getChildren(Object parentElement) {
+		Object[] children = null;
+
+		if(parentElement instanceof ITaxonTreeNode){
+		    ITaxonTreeNode treeNode = (ITaxonTreeNode) HibernateProxyHelper.deproxy(parentElement);
 			children = treeNode.getChildNodes().toArray();
 		}
-		
+
 		return children != null ? children : NO_CHILDREN;
 	}
 
 	/** {@inheritDoc} */
-	public Object getParent(Object element) {
+	@Override
+    public Object getParent(Object element) {
 		if(element instanceof TaxonNode){
 			return ((TaxonNode) element).getParent();
-		}		
+		}
 		return null;
 	}
 
 	/** {@inheritDoc} */
-	public boolean hasChildren(Object element) {
+	@Override
+    public boolean hasChildren(Object element) {
 		if(element instanceof TaxonNode){
 			return ((TaxonNode) element).getCountChildren() > 0;
 		}
@@ -60,17 +63,20 @@ public class TaxonNodeContentProvider implements ITreeContentProvider {
 	}
 
 	/** {@inheritDoc} */
-	public Object[] getElements(Object inputElement) {
+	@Override
+    public Object[] getElements(Object inputElement) {
 		return this.getChildren(inputElement);
 	}
 
 	/**
 	 * <p>dispose</p>
 	 */
-	public void dispose() {
+	@Override
+    public void dispose() {
 	}
 
 	/** {@inheritDoc} */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+	@Override
+    public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
index 7774c2c1e..d4b243b01 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
@@ -10,13 +10,11 @@
 
 package eu.etaxonomy.taxeditor.navigation.navigator;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.StyledString.Styler;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.TextStyle;
 import org.eclipse.ui.navigator.IDescriptionProvider;
@@ -27,7 +25,6 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.Operation;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.security.RequiredPermissions;
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
index b0d7bb74f..dd7c51520 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -28,7 +28,7 @@ import org.eclipse.ui.navigator.CommonDropAdapter;
 import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.navigation.navigator.operation.MoveTaxonOperation;
@@ -48,7 +48,7 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 
 	/** Constant <code>ID="eu.etaxonomy.taxeditor.navigation.navig"{trunked}</code> */
 	public static final String ID = "eu.etaxonomy.taxeditor.navigation.navigator.dropassistant"; //$NON-NLS-1$
-	
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.navigator.CommonDropAdapterAssistant#handleDrop(org.eclipse.ui.navigator.CommonDropAdapter, org.eclipse.swt.dnd.DropTargetEvent, java.lang.Object)
 	 */
@@ -56,25 +56,26 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 	@Override
 	public IStatus handleDrop(CommonDropAdapter dropAdapter,
 			DropTargetEvent dropTargetEvent, Object target) {
-			
-		if (target instanceof ITreeNode) {
+
+		if (target instanceof ITaxonTreeNode) {
 			Set<TaxonNode> taxonNodes = getSelectedTaxa();
-			ITreeNode targetTreeNode = (ITreeNode) target;
-			if(taxonNodes != null)
-				return moveTaxon(taxonNodes, targetTreeNode);
+			ITaxonTreeNode targetTreeNode = (ITaxonTreeNode) target;
+			if(taxonNodes != null) {
+                return moveTaxon(taxonNodes, targetTreeNode);
+            }
 		}
-							
+
 		return Status.CANCEL_STATUS;
 	}
-	
+
 	private Set<TaxonNode> getSelectedTaxa(){
-		HashSet<TaxonNode> taxonNodes = new HashSet<TaxonNode>();		
-		
+		HashSet<TaxonNode> taxonNodes = new HashSet<TaxonNode>();
+
 		ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
 		if (selection instanceof TreeSelection) {
-		
+
 			Iterator selectionIterator = ((TreeSelection) selection).iterator();
-				
+
 			while (selectionIterator.hasNext()){
 				Object object = selectionIterator.next();
 				if(object instanceof TaxonNode){
@@ -92,8 +93,8 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 	/** {@inheritDoc} */
 	@Override
 	public IStatus validateDrop(Object target, int operation,
-			TransferData transferType) {	
-		if (target instanceof ITreeNode) {
+			TransferData transferType) {
+		if (target instanceof ITaxonTreeNode) {
 			// do not allow to drop onto itself
 			for(TaxonNode taxonNode : getSelectedTaxa()){
 				if (taxonNode.equals(target)) {
@@ -101,53 +102,53 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 				}
 			}
 			return Status.OK_STATUS;
-		}		
+		}
 		return Status.CANCEL_STATUS;
 	}
-	
+
 
 	/**
 	 * @param childTaxonNode
 	 * @param parentTaxon
 	 * @return
 	 */
-	private IStatus moveTaxon(Set<TaxonNode> taxonNodes, ITreeNode targetITreeNode) {
-		
+	private IStatus moveTaxon(Set<TaxonNode> taxonNodes, ITaxonTreeNode targetITaxonTreeNode) {
+
 		TaxonNavigator taxonNavigator;
 		taxonNavigator = (TaxonNavigator) NavigationUtil.showView(TaxonNavigator.ID);
-		
-		if(targetITreeNode instanceof TaxonNode){
-		
-			TaxonNode targetTaxonNode = (TaxonNode) targetITreeNode;
-			
+
+		if(targetITaxonTreeNode instanceof TaxonNode){
+
+			TaxonNode targetTaxonNode = (TaxonNode) targetITaxonTreeNode;
+
 //			for(TaxonNode taxonNode : taxonNodes){
 //				if (taxonNode.equals(targetTaxonNode)) {
 //					return Status.CANCEL_STATUS;
 //				}
 //			}
-			
+
 			// Make sure parent taxon does not have unsaved changes
 			if (NavigationUtil.isDirty(targetTaxonNode)){
 				MessageDialog.openWarning(NavigationUtil.getShell(), "Unsaved Parent Taxon", "There are unsaved " +
 				"changes in the parent taxon. Pleas save first.");
 				return Status.CANCEL_STATUS;
 			}
-			
-			
+
+
 			// Make sure parentTaxon is not the drop target
 //			if (!childTaxonNode.isTopmostNode() && childTaxonNode.getParent().equals(targetTaxonNode)){
 //				return Status.CANCEL_STATUS;
 //			}
-			
+
 			// Make sure taxon is not being dropped onto itself
 //			if (childTaxonNode.equals(targetTaxonNode)) {
 //				return Status.CANCEL_STATUS;
 //			}
-			
-			
 
-		}	
-		
+
+
+		}
+
 		IUndoContext workspaceUndoContext = NavigationUtil.getWorkbenchUndoContext();
 		if (workspaceUndoContext == null) {
 			logger.error("Workspace undo context is null. DND operation cancelled");
@@ -155,10 +156,10 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 		}
 
 		AbstractPostOperation operation = new MoveTaxonOperation
-				("Move Taxon", workspaceUndoContext, taxonNodes, targetITreeNode, this, taxonNavigator);
-		NavigationUtil.executeOperation(operation);	
-		
-		logger.info("Moved taxa to new parent " + targetITreeNode);
+				("Move Taxon", workspaceUndoContext, taxonNodes, targetITaxonTreeNode, this, taxonNavigator);
+		NavigationUtil.executeOperation(operation);
+
+		logger.info("Moved taxa to new parent " + targetITaxonTreeNode);
 		return Status.OK_STATUS;
 	}
 
@@ -166,7 +167,8 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 	 * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)
 	 */
 	/** {@inheritDoc} */
-	public boolean postOperation(CdmBase objectAffectedByOperation) {
+	@Override
+    public boolean postOperation(CdmBase objectAffectedByOperation) {
 		return true;
 	}
 
@@ -175,7 +177,8 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp
 	 *
 	 * @return a boolean.
 	 */
-	public boolean onComplete() {
+	@Override
+    public boolean onComplete() {
 		// TODO Auto-generated method stub
 		return false;
 	}
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java
index aaf3e6de8..7e0b59b63 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java
@@ -9,8 +9,6 @@
 */
 package eu.etaxonomy.taxeditor.navigation.navigator.handler;
 
-import java.util.Iterator;
-
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -20,11 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.cdm.model.common.TermBase;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
 import eu.etaxonomy.taxeditor.navigation.navigator.operation.CopyOperation;
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
index 86ed939b6..a1a4425b5 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -29,7 +29,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
@@ -50,57 +50,59 @@ public class DeleteHandler extends AbstractHandler implements IHandler{
 	private TaxonNavigator taxonNavigator;
 
 	/** {@inheritDoc} */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		
+	@Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+
 		activePage = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage();
-		
+
 		taxonNavigator = NavigationUtil.showNavigator();
-				
+
 		TreeSelection selection = (TreeSelection) HandlerUtil.getCurrentSelection(event);
-		
+
 		String plural = selection.size() > 1 ? "s" : "";
 		// Prompt user for confirmation
 		if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Are you sure you want to delete the selected node" + plural +"?")){
 			return null;
 		}
-		
+
 		Iterator selectionIterator = selection.iterator();
-		Set<ITreeNode> treeNodes = new HashSet<ITreeNode>();
-		
+		Set<ITaxonTreeNode> treeNodes = new HashSet<ITaxonTreeNode>();
+
 		while (selectionIterator.hasNext()){
 			Object object = selectionIterator.next();
-			if(object instanceof ITreeNode)
-				treeNodes.add((ITreeNode) object);
+			if(object instanceof ITaxonTreeNode) {
+                treeNodes.add((ITaxonTreeNode) object);
+            }
 		}
-			
+
 		AbstractPostOperation operation = null;
 		try {
 			operation = new DeleteOperation(
-					event.getCommand().getName(), NavigationUtil.getUndoContext(), 
+					event.getCommand().getName(), NavigationUtil.getUndoContext(),
 					treeNodes, taxonNavigator, taxonNavigator);
-			
+
 			IStatus status = NavigationUtil.executeOperation(operation);
-			
-			
+
+
 			// FIXME is there a better place for this code?
 			if (status == Status.OK_STATUS){
-				for (ITreeNode treeNode : treeNodes){
+				for (ITaxonTreeNode treeNode : treeNodes){
 					if(treeNode instanceof TaxonNode) {
 						closeObsoleteEditor((TaxonNode) treeNode);
 					}
 				}
 			}
-		
+
 		} catch (NotDefinedException e) {
 			NavigationUtil.warn(getClass(), "Command name not set");
 		}
 		return null;
 	}
-	
+
 	private void closeObsoleteEditor(TaxonNode taxonNode){
 		for (IEditorReference ref : activePage.getEditorReferences()) {
 			try {
-				IEditorInput input = ref.getEditorInput(); 
+				IEditorInput input = ref.getEditorInput();
 				if (input instanceof TaxonEditorInput) {
 					TaxonNode node = ((TaxonEditorInput) input).getTaxonNode();
 					if (taxonNode.equals(node)) {
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java
index a514c8ce3..25c8632a1 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java
@@ -11,11 +11,6 @@ package eu.etaxonomy.taxeditor.navigation.navigator.operation;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
-
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
-import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
-
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -23,6 +18,10 @@ import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+
 
 /**
  * @author l.morris
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
index 381dbf6b1..eab39d5f0 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
@@ -36,10 +36,10 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class DeleteOperation extends AbstractPersistentPostOperation{
-	
-	private Set<ITreeNode> treeNodes;
 
-	
+	private Set<ITaxonTreeNode> treeNodes;
+
+
 	/**
 	 * <p>Constructor for DeleteTreeNodeOperation.</p>
 	 *
@@ -50,14 +50,14 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
 	 * @param treeNodes a {@link java.util.Set} object.
 	 */
 	public DeleteOperation(String label, IUndoContext undoContext,
-			Set<ITreeNode> treeNodes,
+			Set<ITaxonTreeNode> treeNodes,
 			IPostOperationEnabled postOperationEnabled,
 			IConversationEnabled conversationEnabled) {
 		super(label, undoContext, postOperationEnabled, conversationEnabled);
 		this.treeNodes = treeNodes;
 	}
 
-	
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
 	 */
@@ -68,7 +68,7 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
 
 		bind();
 		monitor.worked(20);
-        for (ITreeNode treeNode : treeNodes){
+        for (ITaxonTreeNode treeNode : treeNodes){
 			if(treeNode instanceof TaxonNode){
 				((TaxonNode) treeNode).delete();
 			}else if(treeNode instanceof Classification){
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
index 6bf1a5deb..87df0560e 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.IllegalAncestryException;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation;
@@ -36,16 +36,16 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class MoveTaxonOperation extends AbstractPersistentPostOperation {
-	
+
 	/**
 	 * A reference to the new taxonomical parent.
 	 */
-	private ITreeNode newParentTreeNode;
+	private ITaxonTreeNode newParentTreeNode;
 	/**
 	 * A reference to the former taxonomical parents
 	 */
-	private Map<TaxonNode, ITreeNode> oldParentTreeNodes;
-	
+	private Map<TaxonNode, ITaxonTreeNode> oldParentTreeNodes;
+
 	private Set<TaxonNode> taxonNodes;
 
 	/**
@@ -54,25 +54,25 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
 	 * @param label a {@link java.lang.String} object.
 	 * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
 	 * @param taxonNodes a {@link java.util.Set} object.
-	 * @param newParentTreeNode a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+	 * @param newParentTreeNode a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
 	 * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
 	 * @param conversationEnabled a {@link eu.etaxonomy.cdm.api.conversation.IConversationEnabled} object.
 	 */
 	public MoveTaxonOperation(String label, IUndoContext undoContext,
-			Set<TaxonNode> taxonNodes, ITreeNode newParentTreeNode, IPostOperationEnabled postOperationEnabled, IConversationEnabled conversationEnabled) {
+			Set<TaxonNode> taxonNodes, ITaxonTreeNode newParentTreeNode, IPostOperationEnabled postOperationEnabled, IConversationEnabled conversationEnabled) {
 		super(label, undoContext, postOperationEnabled, conversationEnabled);
 
 		this.taxonNodes = taxonNodes;
-		
+
 		this.newParentTreeNode = newParentTreeNode;
-		
-		// Save old parent ITreeNodes for undo
-		oldParentTreeNodes = new HashMap<TaxonNode, ITreeNode>();
+
+		// Save old parent ITaxonTreeNodes for undo
+		oldParentTreeNodes = new HashMap<TaxonNode, ITaxonTreeNode>();
 		for(TaxonNode taxonNode : taxonNodes){
 			this.oldParentTreeNodes.put(taxonNode, taxonNode.getParent());
 		}
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
 	 */
@@ -82,12 +82,11 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
 			throws ExecutionException {
 		bind();
 		monitor.worked(20);
-		
+
 		try {
 			for (TaxonNode taxonNode : taxonNodes){
-				TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode, 
-						newParentTreeNode.getReference(), newParentTreeNode.getMicroReference(), 
-						taxonNode.getSynonymToBeUsed());
+				TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode,
+						newParentTreeNode.getReference(), newParentTreeNode.getMicroReference());
 				taxonNodes.add(newTaxonNode);
 				monitor.worked(2);
 			}
@@ -95,7 +94,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
 			StoreUtil.warningDialog("Illegal ancestry", this, e.getMessage());
 		}
 		monitor.worked(40);
-		
+
 		return postExecute(null);
 	}
 
@@ -117,9 +116,9 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		StoreUtil.warn(this.getClass(), "Not implemented yet.");
-		
-		// iterate over oldParentTreeNodes, delete each TaxonNode from its actual parent and add to its former parent		
-		
+
+		// iterate over oldParentTreeNodes, delete each TaxonNode from its actual parent and add to its former parent
+
 		return Status.OK_STATUS;
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
index 3ae83c87f..98915188d 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.Status;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
@@ -38,11 +38,11 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  */
 @Deprecated // we do not undo creation of elements
 public class CreateTaxonNode extends AbstractPersistentPostOperation {
-	
+
 	private Taxon newTaxon;
-	
+
 	private TaxonNode childTaxonNode;
-	
+
 	/**
 	 * Add a name to a taxonomic tree
 	 *
@@ -50,17 +50,17 @@ public class CreateTaxonNode extends AbstractPersistentPostOperation {
 	 * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
 	 * @param name a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
 	 * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-	 * @param parentNode a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+	 * @param parentNode a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
 	 * @param conversationEnabled a {@link eu.etaxonomy.cdm.api.conversation.IConversationEnabled} object.
 	 */
 	public CreateTaxonNode(String label, IUndoContext undoContext,
-			ITreeNode parentNode, TaxonNameBase<?, ?> name, IPostOperationEnabled postOperationEnabled,
+	        ITaxonTreeNode parentNode, TaxonNameBase<?, ?> name, IPostOperationEnabled postOperationEnabled,
 			IConversationEnabled conversationEnabled) {
 		super(label, undoContext, parentNode, postOperationEnabled, conversationEnabled);
-		
+
 		newTaxon = Taxon.NewInstance(name, null);
 	}
-	
+
 	/**
 	 * Add a taxon to a taxonomic tree
 	 *
@@ -68,14 +68,14 @@ public class CreateTaxonNode extends AbstractPersistentPostOperation {
 	 * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
 	 * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
 	 * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-	 * @param parentNode a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+	 * @param parentNode a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
 	 * @param conversationEnabled a {@link eu.etaxonomy.cdm.api.conversation.IConversationEnabled} object.
 	 */
 	public CreateTaxonNode(String label, IUndoContext undoContext,
-			ITreeNode parentNode, Taxon taxon, IPostOperationEnabled postOperationEnabled,
+	        ITaxonTreeNode parentNode, Taxon taxon, IPostOperationEnabled postOperationEnabled,
 			IConversationEnabled conversationEnabled) {
 		super(label, undoContext, parentNode, postOperationEnabled, conversationEnabled);
-		
+
 		this.newTaxon = taxon;
 	}
 
@@ -92,17 +92,17 @@ public class CreateTaxonNode extends AbstractPersistentPostOperation {
 			// add the taxon
 			bind();
 			monitor.worked(20);
-			childTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference(), null);
-		
+			childTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference());
+
 			monitor.worked(40);
 
 			CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(childTaxonNode);
-			
+
 			return postExecute(childTaxonNode);
 		}catch(Exception e){
 			NavigationUtil.errorDialog("Could not create taxon node", getClass(), e.getLocalizedMessage(), e);
 			return Status.CANCEL_STATUS;
-		}		
+		}
 	}
 
 	/* (non-Javadoc)
@@ -122,7 +122,7 @@ public class CreateTaxonNode extends AbstractPersistentPostOperation {
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
-		
+
 		StoreUtil.warn(this.getClass(), "Not yet implemented.");
 		return null;
 	}
diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index b65b04547..0f385a5af 100644
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -304,81 +304,10 @@
                </visibleWhen>
             </command>
          </menu>
-         <menu
-               id="eu.etaxonomy.taxeditor.store.definedTermEditorMenu"
-               label="Term Editor">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
-                  label="Named Area"
-                  style="push">
-               <parameter
-                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
-                     value="eu.etaxonomy.cdm.model.location.NamedArea">
-               </parameter>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
-                  label="Named Area Level"
-                  style="push">
-               <parameter
-                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
-                     value="eu.etaxonomy.cdm.model.location.NamedAreaLevel">
-               </parameter>
-            </command>
-            <separator
-                  name="eu.etaxonomy.taxeditor.store.definedTermEditorMenu.separator2"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
-                  label="Extension Type"
-                  style="push">
-               <parameter
-                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
-                     value="eu.etaxonomy.cdm.model.common.ExtensionType">
-               </parameter>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
-                  label="Marker Type"
-                  style="push">
-               <parameter
-                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
-                     value="eu.etaxonomy.cdm.model.common.MarkerType">
-               </parameter>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
-                  label="State"
-                  style="push">
-               <parameter
-                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
-                     value="eu.etaxonomy.cdm.model.description.State">
-               </parameter>
-            </command>
-            <separator
-                  name="eu.etaxonomy.taxeditor.store.definedTermEditorMenu.separator3"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
-                  label="Feature"
-                  style="push">
-               <parameter
-                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
-                     value="eu.etaxonomy.cdm.model.description.Feature">
-               </parameter>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
-                  label="Modifier"
-                  style="push">
-               <parameter
-                     name="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter"
-                     value="eu.etaxonomy.cdm.model.description.Modifier">
-               </parameter>
-            </command>
-         </menu>
+      </menuContribution>
+      <menuContribution
+            class="eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermMenuFactory"
+            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">
       </menuContribution>
       <menuContribution
             locationURI="menu:org.eclipse.ui.main.menu.file?after=eu.etaxonomy.taxeditor.application.filemenu.io">
@@ -496,6 +425,11 @@
                name="inputType"
                optional="true">
          </commandParameter>
+         <commandParameter
+               id="eu.etaxonomy.taxeditor.store.openDefinedTermEditor.termTypeUuid"
+               name="inputType"
+               optional="true">
+         </commandParameter>
       </command>
    </extension>
    <extension
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
index 31a3165ba..059990f6b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java
@@ -41,9 +41,11 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput;
+import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -64,7 +66,8 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
 	protected ConversationHolder conversation;
 	private ISelectionService selectionService;
 	private boolean dirty;
-	Set<TermVocabulary<? extends DefinedTermBase>> inMemoryVocabularies = new HashSet<TermVocabulary<? extends DefinedTermBase>>();
+
+
 
 	private int dndOperations = DND.DROP_COPY | DND.DROP_MOVE;
 	/**
@@ -95,10 +98,9 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
 			Transfer[] transfers = new Transfer[] { TermTransfer.getInstance() };
 			viewer.addDragSupport(dndOperations, transfers, new DefinedTermDragListener(viewer));
 			viewer.addDropSupport(dndOperations, transfers, new DefinedTermDropAdapter(this));
-
-					
-			initialiseVocabularies();		
-			viewer.setInput(inMemoryVocabularies);
+									
+			getDefinedTermEditorInput().initialiseVocabularies();
+			viewer.setInput(getDefinedTermEditorInput().getVocabularies());
 						
 			getSite().setSelectionProvider(viewer);
 			
@@ -110,28 +112,13 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
 		}
 	
 	
-	protected void initialiseVocabularies() {
-		inMemoryVocabularies.clear();
-		//List<TermVocabulary> vocabularies = CdmStore.getService(IVocabularyService.class).list(null, null, null, null, null);
 
-//		for (TermVocabulary vocabulary : vocabularies){
-//			if(vocabulary.getTerms().isEmpty()){
-//				inMemoryVocabularies.add(vocabulary);
-//			}
-//		}
-
-		
-		List<TermVocabulary<? extends DefinedTermBase>> termVocabularies = CdmStore.getService(IVocabularyService.class).listByTermClass(getDefinedTermEditorInput().getTermClass(), true, true, null, null, null, null);
-		
-		
-		inMemoryVocabularies.addAll(termVocabularies);
-	}
 	
 	/**
 	 * 
 	 */
-	public AbstractDefinedTermEditorInput getDefinedTermEditorInput() {
-		return (AbstractDefinedTermEditorInput) getEditorInput();
+	public TermEditorInput getDefinedTermEditorInput() {
+		return (TermEditorInput) getEditorInput();
 	}
 
 	/* (non-Javadoc)
@@ -139,24 +126,9 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
 	 */
 	@Override
 	public boolean postOperation(CdmBase objectAffectedByOperation) {
-
-		if(objectAffectedByOperation instanceof DefinedTermBase){
-			viewer.refresh();
-		} else if (objectAffectedByOperation instanceof TermVocabulary){
-//			if (inMemoryVocabularies.contains(objectAffectedByOperation)){
-//				inMemoryVocabularies.remove((TermVocabulary) objectAffectedByOperation);
-//			}else{
-//				inMemoryVocabularies.add((TermVocabulary) objectAffectedByOperation);
-//				DetailsViewPart view = (DetailsViewPart) StoreUtil.getView(DetailsViewPart.ID, true);
-//				view.setFocus();
-//			}
 			
-//			viewer.setInput(inMemoryVocabularies);
-			viewer.refresh();
-			
-		}
-		
 		
+		viewer.refresh();		
 		
 		if(objectAffectedByOperation != null){
 			viewer.setSelection(new StructuredSelection(objectAffectedByOperation));
@@ -185,7 +157,7 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
 	public void doSave(IProgressMonitor monitor) {
 		getConversationHolder().commit();
 		setDirty(false);
-		initialiseVocabularies();
+		getDefinedTermEditorInput().initialiseVocabularies();
 	}
 	
 
@@ -259,12 +231,6 @@ public class DefinedTermEditor extends EditorPart implements IConversationEnable
 		return viewer;
 	}
 
-	/**
-	 * @return 
-	 * 
-	 */
-	public Set<TermVocabulary<? extends DefinedTermBase>> getInMemoryVocabularies() {
-		return inMemoryVocabularies;
-	}
+
 
 }
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermMenuFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermMenuFactory.java
new file mode 100644
index 000000000..07365cad8
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermMenuFactory.java
@@ -0,0 +1,157 @@
+// $Id$
+/**
+* Copyright (C) 2009 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.editor.definedterm;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.swt.SWT;
+import org.eclipse.ui.menus.CommandContributionItem;
+import org.eclipse.ui.menus.CommandContributionItemParameter;
+import org.eclipse.ui.menus.ExtensionContributionFactory;
+import org.eclipse.ui.menus.IContributionRoot;
+import org.eclipse.ui.services.IServiceLocator;
+
+import eu.etaxonomy.cdm.model.common.TermType;
+
+/**
+ * Menu factory used in the store plugin xml to dynamically generate menu (sub-menu) contribution items
+ * for term types which when clicked open the defined term editor for the chosen term type
+ * 
+ * @author c.mathew
+ * @date 18 Jul 2013
+ *
+ */
+
+public class DefinedTermMenuFactory extends ExtensionContributionFactory {	
+	
+	@Override
+	public void createContributionItems(IServiceLocator serviceLocator,
+			IContributionRoot additions) {
+		
+		MenuManager dtMenuManager = 
+				new MenuManager("Term Editor","eu.etaxonomy.taxeditor.store.definedTermEditorMenu"); 
+		
+		dtMenuManager.setVisible(true);
+        
+		additions.addContributionItem(dtMenuManager, null);
+		List<TermType> ttList = new ArrayList<TermType>(EnumSet.allOf(TermType.class));
+		Collections.sort(ttList,new SortByTermTypeMessage());
+        for (TermType tt : ttList)
+        {
+        	// if term type has a parent, do not add it
+        	// it will be added in the recursive call
+        	if(tt.getKindOf() == null) {
+        		IContributionItem ici = addChildTermsToMenuManager(tt, serviceLocator);        		
+        		if(ici != null) {        			 	        	
+        			dtMenuManager.add(ici);
+        		}
+        	}
+        }				       
+	}
+	
+	private IContributionItem addChildTermsToMenuManager(TermType termType, IServiceLocator serviceLocator) {
+	
+		Set<TermType> children = termType.getGeneralizationOf();
+		// term type has no children, so create menu item
+		if(children.isEmpty()) {			
+			return createMenuItem(termType, serviceLocator);
+		}
+		// term type has children, so create sub menu		
+		MenuManager dtMenuManager = 
+				new MenuManager(termType.getMessage(),"eu.etaxonomy.taxeditor.store." + termType.getKey() + "Menu"); 
+		dtMenuManager.setVisible(true);
+		dtMenuManager.add(createDefaultMenuItem(termType, serviceLocator));
+		
+		Separator sep = new Separator();
+		dtMenuManager.add(sep);
+		// add child items to the sub menu
+		for(TermType tt : children) {			
+			IContributionItem item = addChildTermsToMenuManager(tt,serviceLocator);
+			if(item != null) {				
+				dtMenuManager.add(item);
+			}					
+		}		
+		return dtMenuManager;
+		
+	}
+	
+	private CommandContributionItem createMenuItem(TermType termType, IServiceLocator serviceLocator) {
+		
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.termTypeUuid",
+				termType.getUuid().toString());		
+		
+        CommandContributionItemParameter p = new CommandContributionItemParameter(
+                serviceLocator, 
+                "",
+                "eu.etaxonomy.taxeditor.store.openDefinedTermEditor",
+                params,
+                null,
+                null,
+                null,
+                termType.getMessage(),
+                "",
+                "",                
+                SWT.PUSH,
+                "",
+                true);
+   
+        CommandContributionItem item = new CommandContributionItem(p);   
+        return item;
+		
+	}
+	
+	private CommandContributionItem createDefaultMenuItem(TermType termType, IServiceLocator serviceLocator) {
+		
+		Map<String, String> params = new HashMap<String, String>();
+		params.put("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.termTypeUuid",
+				termType.getUuid().toString());		
+		
+        CommandContributionItemParameter p = new CommandContributionItemParameter(
+                serviceLocator, 
+                "",
+                "eu.etaxonomy.taxeditor.store.openDefinedTermEditor",
+                params,
+                null,
+                null,
+                null,
+                "Other " + termType.getMessage() + "s",
+                "",
+                "",                
+                SWT.PUSH,
+                "",
+                true);
+        
+        
+   
+        CommandContributionItem item = new CommandContributionItem(p);   
+        return item;
+		
+	}
+	
+	private class SortByTermTypeMessage implements Comparator<TermType> {
+	    public int compare(TermType t1, TermType t2) {
+	        return t1.getMessage().compareTo(t2.getMessage());
+	    }
+	}
+	
+
+}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java
index 3b6241ace..e7ca0c28d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java
@@ -17,7 +17,9 @@ import java.util.SortedSet;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -54,7 +56,7 @@ public class TermContentProvider implements ITreeContentProvider {
 	
 		Collection<TermVocabulary> inputElements = (Collection<TermVocabulary>) inputElement;
 		return inputElements.toArray();
-		//return null;
+
 	}
 
 	/* (non-Javadoc)
@@ -63,8 +65,8 @@ public class TermContentProvider implements ITreeContentProvider {
 	@Override
 	public Object[] getChildren(Object parentElement) {
 		
-		if(parentElement instanceof TermVocabulary){
-			return getTopLevelElements((TermVocabulary) parentElement);
+		if(parentElement instanceof TermVocabulary){			
+			return getTopLevelElements((TermVocabulary)parentElement);
 		} else if (parentElement instanceof DefinedTermBase) {
 			return ((DefinedTermBase) parentElement).getIncludes().toArray();
 		}
@@ -86,10 +88,8 @@ public class TermContentProvider implements ITreeContentProvider {
 		for (DefinedTermBase term : terms){
 			 if (term.getPartOf() == null){
 				 topLevelTerms.add(term);
-			 }
-				
-		}
-	 
+			 }				
+		}	 
 	 	return topLevelTerms.toArray();
 	}
 
@@ -98,27 +98,25 @@ public class TermContentProvider implements ITreeContentProvider {
 	 */
 	@Override
 	public Object getParent(Object element) {
-		
+
 		if(element instanceof DefinedTermBase){
-			
-			DefinedTermBase definedTerm = (DefinedTermBase)element;
-			if (definedTerm.getPartOf() == null) {
-				return definedTerm.getVocabulary();
+			DefinedTermBase definedTermBase = (DefinedTermBase)element;
+			if (definedTermBase.getPartOf() == null) {
+				return definedTermBase.getVocabulary();
 			} else {
-				return definedTerm.getPartOf();
-			}
-		} 	
+				return definedTermBase.getPartOf();
+			}			
+		}
 		return null;
+
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
 	 */
 	@Override
-	public boolean hasChildren(Object element) {
-		
-		if (getChildren(element) != null){
-			
+	public boolean hasChildren(Object element) {		
+		if (getChildren(element) != null){			
 			return getChildren(element).length > 0;
 		}
 		return false;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
index ea647af18..7e3e8f9eb 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
@@ -10,39 +10,91 @@
 package eu.etaxonomy.taxeditor.editor.definedterm;
 
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+import org.eclipse.jface.viewers.StyledString.Styler;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StyledCellLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.TextStyle;
+import org.eclipse.swt.widgets.Display;
 
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 
 /**
  * @author l.morris
  * @date 9 Dec 2011
  *
  */
-public class TermLabelProvider extends LabelProvider implements
-		IStyledLabelProvider {
+public class TermLabelProvider extends StyledCellLabelProvider {
 
+	private static Color vocColor = Display.getCurrent().getSystemColor(
+			SWT.COLOR_BLUE);
+	private Styler vocStyler;
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
 	 */
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.jface.viewers.StyledCellLabelProvider#update(org.eclipse.
+	 * jface.viewers.ViewerCell)
+	 */
 	@Override
+	public void update(ViewerCell cell) {
+		Object element = cell.getElement();
+		int columnIndex = cell.getColumnIndex();
+
+		String text = getText(element);					
+		cell.setText(text);
+		
+		if (element instanceof TermVocabulary) {		
+			StyledString styledString = new StyledString(text, getVocabularyStyler());
+			StyleRange[] styleRanges;
+			styleRanges = styledString.getStyleRanges();
+			cell.setStyleRanges(styleRanges);
+		} 
+		super.update(cell);
+	}
+	
 	public StyledString getStyledText(Object element) {
 		
+		if(element instanceof TermVocabulary){
+			new StyledString(getText(element), getVocabularyStyler());
+		}
 		return  new StyledString(getText(element), StyledString.QUALIFIER_STYLER);
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
 	 */
-	@Override
+	
 	public String getText(Object element) {
 		
 		if (element instanceof TermBase){
-			return ((TermBase)element).getLabel();
+			return ((TermBase)element).getTitleCache();
 		} 
-		return super.getText(element);
+		//FIXME : must throw an exception here
+		return element.toString();
+	}
+	
+	private Styler getVocabularyStyler() {
+		if (vocStyler == null) {
+			vocStyler = new Styler() {
+				@Override
+				public void applyStyles(TextStyle textStyle) {
+					textStyle.foreground = vocColor;
+				}
+			};
+		}
+		return vocStyler;
 	}
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java
index 24a8462c5..d60d40a78 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java
@@ -14,10 +14,13 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.TermBase;
+import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
 import eu.etaxonomy.taxeditor.editor.definedterm.operation.CreateDefinedTermOperation;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -43,22 +46,32 @@ public class CreateDefinedTermHandler extends AbstractHandler implements IHandle
 		IPostOperationEnabled editor = (IPostOperationEnabled) HandlerUtil
 				.getActiveEditor(event);
 
-		IStructuredSelection selection = (IStructuredSelection) HandlerUtil
-				.getCurrentSelection(event);
+		if (editor instanceof DefinedTermEditor){
+			DefinedTermEditor dfe = (DefinedTermEditor) editor;
+			IStructuredSelection selection = (IStructuredSelection) HandlerUtil
+					.getCurrentSelection(event);
+			if (selection.getFirstElement() instanceof TermBase) {
+				try {
+					String label = event.getCommand().getName();
+					IUndoContext undoContext = StoreUtil.getUndoContext();
 
-		TermBase selectedElement = (TermBase) selection.getFirstElement();
+					TermBase termBase = (TermBase) selection.getFirstElement();
 
-		try {
-			AbstractPostOperation operation = new CreateDefinedTermOperation(
-					event.getCommand().getName(), StoreUtil.getUndoContext(),
-					selectedElement, editor);
-			StoreUtil.executeOperation(operation);
+					AbstractPostOperation operation = 
+							new CreateDefinedTermOperation(label, 
+									undoContext, 
+									termBase, 
+									dfe.getDefinedTermEditorInput(),
+									editor);
+					StoreUtil.executeOperation(operation);
 
-		} catch (NotDefinedException e) {
-			StoreUtil.error(getClass(), e);
+				} catch (NotDefinedException e) {
+					StoreUtil.error(getClass(), e);
+				}
+			}
 		}
 
 		return null;
 	}
 
-}
+	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java
index 3ad89be9e..fb7e01f39 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java
@@ -14,12 +14,13 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.cdm.model.common.TermBase;
+import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
-import eu.etaxonomy.taxeditor.editor.definedterm.operation.CreateDefinedTermOperation;
 import eu.etaxonomy.taxeditor.editor.definedterm.operation.CreateTermVocabularyOperation;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
@@ -41,20 +42,24 @@ public class CreateTermVocabularyHandler extends AbstractHandler implements
 		IPostOperationEnabled editor = (IPostOperationEnabled) HandlerUtil
 				.getActiveEditor(event);
 
-		if (! (editor instanceof DefinedTermEditor)){
-			return null;
-		}
-		
-		try {
-			AbstractPostOperation operation = new CreateTermVocabularyOperation(
-					event.getCommand().getName(), StoreUtil.getUndoContext(), (DefinedTermEditor) editor);
-			StoreUtil.executeOperation(operation);
-
-		} catch (NotDefinedException e) {
-			StoreUtil.error(getClass(), e);
-		}
+		if (editor instanceof DefinedTermEditor){
+			DefinedTermEditor dfe = (DefinedTermEditor) editor;
+
+			try {
+				String label = event.getCommand().getName();
+				IUndoContext undoContext = StoreUtil.getUndoContext();
 
+				AbstractPostOperation operation = 
+						new CreateTermVocabularyOperation(label, 
+								undoContext, 
+								dfe.getDefinedTermEditorInput(), 
+								(DefinedTermEditor) editor);
+				StoreUtil.executeOperation(operation);
+
+			} catch (NotDefinedException e) {
+				StoreUtil.error(getClass(), e);
+			}			
+		}
 		return null;
 	}
-
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java
index ec008ea41..40bc987fa 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java
@@ -15,9 +15,11 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
@@ -41,26 +43,35 @@ public class DeleteTermBaseHandler extends AbstractHandler {
 		DefinedTermEditor editor = (DefinedTermEditor) HandlerUtil
 				.getActiveEditor(event);
 
-		IStructuredSelection selection = (IStructuredSelection) HandlerUtil
-				.getCurrentSelection(event);
+		if (editor instanceof DefinedTermEditor){
+			DefinedTermEditor dfe = (DefinedTermEditor) editor;
+			try {
+				String label = event.getCommand().getName();
+				IUndoContext undoContext = StoreUtil.getUndoContext();
 
-		Iterator<TermBase> selectionIterator = selection.iterator();
+				IStructuredSelection selection = (IStructuredSelection) HandlerUtil
+						.getCurrentSelection(event);
 
-		while (selectionIterator.hasNext()){
-			
-			TermBase term = selectionIterator.next();
-			
-			try {
-				AbstractPostOperation operation = new DeleteTermBaseOperation(
-						event.getCommand().getName(), StoreUtil.getUndoContext(),
-						term, editor);
-				StoreUtil.executeOperation(operation);
-	
+				Iterator<TermBase> selectionIterator = selection.iterator();
+
+				while (selectionIterator.hasNext()){
+
+					TermBase term = selectionIterator.next();
+
+
+					AbstractPostOperation operation = 
+							new DeleteTermBaseOperation(label, 
+									undoContext,
+									term,
+									dfe.getDefinedTermEditorInput(), 
+									editor);
+					StoreUtil.executeOperation(operation);
+
+				}	
 			} catch (NotDefinedException e) {
 				StoreUtil.error(getClass(), e);
 			}
 		}
-
 		return null;
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java
index 393a3e648..1e71fd6bb 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java
@@ -1,19 +1,16 @@
 package eu.etaxonomy.taxeditor.editor.definedterm.handler;
+import java.util.UUID;
+
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.commands.IParameter;
-import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.handlers.ShowViewHandler;
 
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
-import eu.etaxonomy.taxeditor.editor.definedterm.input.DefinedTermEditorInputFactory;
+import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 // $Id$
@@ -31,28 +28,22 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @date 8 Dec 2011
  *
  */
-public class OpenDefinedTermEditorHandler extends AbstractHandler implements
-		IHandler {
+public class OpenDefinedTermEditorHandler extends AbstractHandler implements IHandler {
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
 	 */
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		
+
+		String termTypeUuid = event.getParameter("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.termTypeUuid");
+		IWorkbenchPage activePage = StoreUtil.getActivePage();
 		try {
-			String parameter = event.getParameter("eu.etaxonomy.taxeditor.store.openDefinedTermEditor.parameter");
-			Class<? extends DefinedTermBase> clazz = (Class<? extends DefinedTermBase>) Class.forName(parameter);
-		
-			IWorkbenchPage activePage = StoreUtil.getActivePage();
-			try {
-				activePage.openEditor(DefinedTermEditorInputFactory.NewInstance(clazz), DefinedTermEditor.ID);
-			} catch (PartInitException e) {
-				StoreUtil.error(getClass(), e);
-			}
-		} catch (ClassNotFoundException e) {
+			activePage.openEditor(new TermEditorInput(TermType.getByUuid(UUID.fromString(termTypeUuid))), DefinedTermEditor.ID);
+		} catch (PartInitException e) {
 			StoreUtil.error(getClass(), e);
 		}
+
 		return null;
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermMenu.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermMenu.java
deleted file mode 100644
index 5d6e797af..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermMenu.java
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.handler;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.swt.SWT;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.CompoundContributionItem;
-import org.eclipse.ui.menus.CommandContributionItem;
-import org.eclipse.ui.menus.CommandContributionItemParameter;
-
-/**
- * @author l.morris
- * @date 4 Jan 2012
- *
- */
-public class OpenDefinedTermMenu extends CompoundContributionItem {
-
-	/**
-	 * 
-	 */
-	public OpenDefinedTermMenu() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param id
-	 */
-	public OpenDefinedTermMenu(String id) {
-		super(id);
-		// TODO Auto-generated constructor stub
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()
-	 */
-	@Override
-	protected IContributionItem[] getContributionItems() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/**
-	 * @param key
-	 * @param object
-	 * @return
-	 */
-	private IContributionItem createContributionItem(String label,
-			String inputType) {
-		CommandContributionItemParameter parameter = new CommandContributionItemParameter(
-				PlatformUI.getWorkbench().getActiveWorkbenchWindow(), null,
-				"eu.etaxonomy.taxeditor.store.definedterm.menu.open", SWT.NONE);
-
-		parameter.label = label;
-
-		Map parameters = new HashMap();
-		parameters.put("eu.etaxonomy.taxeditor.store.definedterm.menu.open", inputType);
-		parameter.parameters = parameters;
-
-		return new CommandContributionItem(parameter);
-	}
-
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java
index 49cc3d434..c18d397be 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java
@@ -59,13 +59,7 @@ public abstract class AbstractDefinedTermEditorInput<T extends DefinedTermBase>
 	/**
 	 * @return
 	 */
-	public abstract List<String> getTermClasses();
-	
-	public abstract T createTermInstance();
-	
-	public Class<? extends DefinedTermBase> getTermClass() {
-		
-		return createTermInstance().getClass();
-	}
+	public abstract List<String> getTermClasses();		
 
+	
 }
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java
deleted file mode 100644
index cdb5b68dd..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.input;
-
-import org.eclipse.ui.IEditorInput;
-
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.ExtensionType;
-import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.Modifier;
-import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
-
-/**
- * @author l.morris
- * @date 3 Jan 2012
- *
- */
-public class DefinedTermEditorInputFactory {
-
-//	public static final String NamedArea = "eu.etaxonomy.taxeditor.editor.namedArea";
-
-	/**
-	 * @param clazz
-	 * @return
-	 */
-	public static IEditorInput NewInstance(Class<? extends DefinedTermBase> clazz) {
-		if(clazz == NamedArea.class){
-			return new NamedAreaEditorInput();
-		} 
-		if (clazz == NamedAreaLevel.class){
-			return new NamedAreaLevelEditorInput();
-		}
-		if (clazz == ExtensionType.class){
-			return new ExtensionTypeEditorInput();
-		}
-		if (clazz == MarkerType.class){
-			return new MarkerTypeEditorInput();
-		}
-		if (clazz == Feature.class){
-			return new FeatureEditorInput();
-		}
-		if (clazz == State.class){
-			return new StateEditorInput();
-		}
-		if (clazz == Modifier.class){
-			return new ModifierEditorInput();
-		}
-		
-		return null;
-	}
-
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java
deleted file mode 100644
index 49d597a85..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ExtensionTypeEditorInput.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.input;
-
-import java.util.Arrays;
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.common.ExtensionType;
-
-/**
- * @author l.morris
- * @date 6 Jan 2012
- *
- */
-public class ExtensionTypeEditorInput extends AbstractDefinedTermEditorInput<ExtensionType> {
-	
-	private List<String> termClasses = Arrays.asList(new String[]{
-			ExtensionType.class.getName()
-	});
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	@Override
-	public String getName() {
-		return "Extension Type";
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#getTermClasses()
-	 */
-	@Override
-	public List<String> getTermClasses() {
-		return termClasses;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#createTermInstance()
-	 */
-	@Override
-	public ExtensionType createTermInstance() {
-		return ExtensionType.NewInstance();
-	}
-
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java
deleted file mode 100644
index da4c4d821..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/FeatureEditorInput.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.input;
-
-import java.util.Arrays;
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.Feature;
-/**
- * @author l.morris
- * @date 11 Jan 2012
- *
- */
-public class FeatureEditorInput extends AbstractDefinedTermEditorInput<Feature> {
-
-	private List<String> termClasses = Arrays.asList(new String[]{
-			Feature.class.getName()
-	});
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	@Override
-	public String getName() {
-		return "Feature";
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#getTermClasses()
-	 */
-	@Override
-	public List<String> getTermClasses() {
-		return termClasses;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#createTermInstance()
-	 */
-	@Override
-	public Feature createTermInstance() {
-		return Feature.NewInstance();
-	}
-
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java
deleted file mode 100644
index 5bc6cb592..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/MarkerTypeEditorInput.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.input;
-
-import java.util.Arrays;
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.common.MarkerType;
-
-/**
- * @author l.morris
- * @date 6 Jan 2012
- *
- */
-public class MarkerTypeEditorInput extends AbstractDefinedTermEditorInput<MarkerType> {
-	
-	private List<String> termClasses = Arrays.asList(new String[]{
-			MarkerType.class.getName()
-	});
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	@Override
-	public String getName() {
-		return "Marker Type";
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#getTermClasses()
-	 */
-	@Override
-	public List<String> getTermClasses() {
-		return termClasses;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#createTermInstance()
-	 */
-	@Override
-	public MarkerType createTermInstance() {
-		return new MarkerType();
-	}
-	
-	
-
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java
deleted file mode 100644
index da3b7727e..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.input;
-
-import java.util.Arrays;
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.Modifier;
-
-
-/**
- * @author n.hoffmann
- * @date Jan 24, 2012
- *
- */
-public class ModifierEditorInput extends AbstractDefinedTermEditorInput<Modifier> {
-
-	private List<String> termClasses = Arrays.asList(new String[]{
-			Modifier.class.getName()
-	});
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	@Override
-	public String getName() {
-		return "Modifier";
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#getTermClasses()
-	 */
-	@Override
-	public List<String> getTermClasses() {
-		return termClasses;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#createTermInstance()
-	 */
-	@Override
-	public Modifier createTermInstance() {
-		return Modifier.NewInstance();
-	}
-
-}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
deleted file mode 100644
index 2b9a52933..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.input;
-
-import java.util.Arrays;
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.location.Continent;
-import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.location.TdwgArea;
-import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;
-
-/**
- * @author l.morris
- * @date 8 Dec 2011
- *
- */
-public class NamedAreaEditorInput extends AbstractDefinedTermEditorInput<NamedArea> {
-
-	private List<String> termClasses = Arrays.asList(new String[]{
-			NamedArea.class.getName(), 
-			TdwgArea.class.getName(),
-			WaterbodyOrCountry.class.getName(),
-			Continent.class.getName()
-	});
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	@Override
-	public String getName() {
-		return "Named Area";
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#getTermClasses()
-	 */
-	@Override
-	public List<String> getTermClasses() {
-		return termClasses;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#createTermInstance()
-	 */
-	@Override
-	public NamedArea createTermInstance() {
-		 return NamedArea.NewInstance();
-	}
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java
deleted file mode 100644
index a3792395b..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaLevelEditorInput.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.input;
-
-import java.util.Arrays;
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
-
-/**
- * @author l.morris
- * @date 4 Jan 2012
- *
- */
-public class NamedAreaLevelEditorInput extends AbstractDefinedTermEditorInput<NamedAreaLevel> {
-
-	
-	private List<String> termClasses = Arrays.asList(new String[]{
-			NamedAreaLevel.class.getName()
-	});
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	@Override
-	public String getName() {
-		return "Named Area Level";
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#getTermClasses()
-	 */
-	@Override
-	public List<String> getTermClasses() {
-		return termClasses;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.AbstractDefinedTermEditorInput#createTermInstance()
-	 */
-	@Override
-	public NamedAreaLevel createTermInstance() {
-		return NamedAreaLevel.NewInstance();
-	}
-
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/StateEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/StateEditorInput.java
deleted file mode 100644
index 609dfe07c..000000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/StateEditorInput.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2009 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor.definedterm.input;
-
-import java.util.Arrays;
-import java.util.List;
-
-import eu.etaxonomy.cdm.model.description.State;
-
-/**
- * @author n.hoffmann
- * @date Jan 24, 2012
- *
- */
-public class StateEditorInput extends AbstractDefinedTermEditorInput<State> {
-
-	private List<String> termClasses = Arrays.asList(new String[]{
-			State.class.getName()
-	});
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	@Override
-	public String getName() {
-		return "State";
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#getTermClasses()
-	 */
-	@Override
-	public List<String> getTermClasses() {
-		return termClasses;
-	}
-
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#createTermInstance()
-	 */
-	@Override
-	public State createTermInstance() {
-		return State.NewInstance();
-	}
-
-}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
new file mode 100644
index 000000000..aef64fe08
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
@@ -0,0 +1,76 @@
+// $Id$
+/**
+* Copyright (C) 2009 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.editor.definedterm.input;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import eu.etaxonomy.cdm.api.service.IVocabularyService;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+
+
+/**
+ * @author n.hoffmann
+ * @date Jan 24, 2012
+ *
+ */
+public class TermEditorInput extends AbstractDefinedTermEditorInput<DefinedTerm> {
+
+	private TermType termType;
+	private Set<TermVocabulary<DefinedTermBase>> vocabularies;
+	private List<String> termClasses = Arrays.asList(new String[]{
+			DefinedTerm.class.getName()
+	});
+	
+	public TermEditorInput(TermType termType) {
+		this.termType = termType;
+		vocabularies = new HashSet<TermVocabulary<DefinedTermBase>>();
+		initialiseVocabularies();
+	}
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IEditorInput#getName()
+	 */
+	@Override
+	public String getName() {
+		return termType.getMessage();
+	}
+
+	/* (non-Javadoc)
+	 * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#getTermClasses()
+	 */
+	@Override
+	public List<String> getTermClasses() {
+		return termClasses;
+	}
+	
+	public TermType getTermType() {
+		return termType;
+	}
+	
+	public void initialiseVocabularies() {
+		if(vocabularies != null) {
+			vocabularies.clear();
+		} 
+		List<TermVocabulary<DefinedTermBase>> vocs = CdmStore.getService(IVocabularyService.class).findByTermType(termType);
+		vocabularies.addAll(vocs);			
+	}
+	
+	public Set<TermVocabulary<DefinedTermBase>> getVocabularies() {
+		return vocabularies;
+	}
+
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java
index cc2512f0d..7677096e1 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java
@@ -14,17 +14,15 @@ import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.ui.IEditorInput;
+import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
-import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
-import eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput;
-import eu.etaxonomy.taxeditor.editor.definedterm.input.NamedAreaEditorInput;
+import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author l.morris
@@ -36,7 +34,7 @@ public class CreateDefinedTermOperation extends AbstractPostOperation {
 	
 
 	private TermBase parentTermBase;
-	private AbstractDefinedTermEditorInput editorInput; 
+	private TermEditorInput definedTermInput;
 
 	/**
 	 * @param label
@@ -44,10 +42,13 @@ public class CreateDefinedTermOperation extends AbstractPostOperation {
 	 * @param postOperationEnabled
 	 */
 	public CreateDefinedTermOperation(String label,
-			IUndoContext undoContext, TermBase termBase, IPostOperationEnabled postOperationEnabled) {
+			IUndoContext undoContext, 
+			TermBase termBase,
+			TermEditorInput definedTermInput,
+			IPostOperationEnabled postOperationEnabled) {
 		super(label, undoContext, postOperationEnabled);
 		this.parentTermBase = termBase;
-		editorInput = ((DefinedTermEditor)postOperationEnabled).getDefinedTermEditorInput();
+		this.definedTermInput = definedTermInput;
 	}
 
 	/* (non-Javadoc)
@@ -57,16 +58,22 @@ public class CreateDefinedTermOperation extends AbstractPostOperation {
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		
-		DefinedTermBase newTerm = editorInput.createTermInstance();		 		
-		
-		newTerm.setLabel("Untitled");
+		DefinedTermBase newTerm = definedTermInput.getTermType().getEmptyDefinedTermBase();
+		if (newTerm == null) {
+			IStatus status = 
+					new Status(IStatus.CANCEL, 
+							StoreUtil.getPluginId(), 
+							"Creation of term corresponding to type '" + definedTermInput.getTermType().getMessage() + "' is not yet supported");
+			StoreUtil.warningDialog("Cannot create term", newTerm, status);
+			return status;
+		}
 		
 		if (parentTermBase instanceof TermVocabulary){
 			TermVocabulary vocabulary = (TermVocabulary) parentTermBase;
 			vocabulary.addTerm(newTerm);
 		} else if (parentTermBase instanceof DefinedTermBase) {
-			DefinedTermBase parent = (DefinedTermBase) parentTermBase;
-			parent.addIncludes(newTerm);
+			DefinedTermBase parent = (DefinedTermBase) parentTermBase;			
+			parent.addIncludes(newTerm);			
 			TermVocabulary vocabulary = parent.getVocabulary();
 			vocabulary.addTerm(newTerm);
 		}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java
index a8950ee64..cad587c2b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java
@@ -9,6 +9,8 @@
 */
 package eu.etaxonomy.taxeditor.editor.definedterm.operation;
 
+import java.net.URI;
+
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
@@ -16,10 +18,14 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
+import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -29,17 +35,19 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class CreateTermVocabularyOperation extends AbstractPostOperation {
 
-	private DefinedTermEditor definedTermEditor;
-
+	private TermEditorInput definedEditorInput;
+	
 	/**
 	 * @param label
 	 * @param undoContext
 	 * @param postOperationEnabled
 	 */
 	public CreateTermVocabularyOperation(String label,
-			IUndoContext undoContext, DefinedTermEditor definedTermEditor) {
-		super(label, undoContext, definedTermEditor);
-		this.definedTermEditor = definedTermEditor;
+			IUndoContext undoContext, 
+			TermEditorInput definedEditorInput, 
+			IPostOperationEnabled postOperationEnabled) {
+		super(label, undoContext, postOperationEnabled);
+		this.definedEditorInput = definedEditorInput;
 	}
 
 	/* (non-Javadoc)
@@ -48,10 +56,16 @@ public class CreateTermVocabularyOperation extends AbstractPostOperation {
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
-
-		TermVocabulary termVocabulary = OrderedTermVocabulary.NewInstance(null, "Untitled", null, null);
+	
+		TermVocabulary termVocabulary = 
+					TermVocabulary.NewInstance(definedEditorInput.getTermType(),
+						null, 
+						"Untitled", 
+						null, 
+						null);		
+		
 		CdmStore.getService(IVocabularyService.class).save(termVocabulary);
-		definedTermEditor.getInMemoryVocabularies().add(termVocabulary);
+		definedEditorInput.getVocabularies().add(termVocabulary);
 		
 		return postExecute(termVocabulary);
 	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
index 7ce678596..c5bbd9c4e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
@@ -18,11 +18,14 @@ import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
+import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
@@ -33,6 +36,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  */
 public class DeleteTermBaseOperation extends AbstractPostOperation {
 
+	private TermEditorInput definedEditorInput;
 	private TermBase termBase;
 	private DefinedTermEditor definedTermEditor;
 	/**
@@ -40,11 +44,14 @@ public class DeleteTermBaseOperation extends AbstractPostOperation {
 	 * @param undoContext
 	 * @param postOperationEnabled
 	 */
-	public DeleteTermBaseOperation(String label, IUndoContext undoContext, TermBase termBase,
-			DefinedTermEditor definedTermEditor) {
-		super(label, undoContext, definedTermEditor);
+	public DeleteTermBaseOperation(String label, 
+			IUndoContext undoContext, 
+			TermBase termBase,
+			TermEditorInput definedEditorInput,
+			IPostOperationEnabled postOperationEnabled) {
+		super(label, undoContext, postOperationEnabled);
 		this.termBase = termBase;
-		this.definedTermEditor = definedTermEditor;
+		this.definedEditorInput = definedEditorInput;		
 	}
 
 	/* (non-Javadoc)
@@ -57,25 +64,39 @@ public class DeleteTermBaseOperation extends AbstractPostOperation {
 		
 		
 		if (termBase instanceof TermVocabulary) {
+			if (((TermVocabulary)termBase).getCreatedBy() == null) {
+				IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This is a CDM system vocabulary");
+				StoreUtil.warningDialog("Cannot delete vocabulary", termBase, status);
+				return status;
+			}
 			
 			if (!((TermVocabulary)termBase).getTerms().isEmpty()) {
 				IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Delete all terms from this vocaulary before deleting the vocabulary.");
 				StoreUtil.warningDialog("Vocabulary not empty", termBase, status);
 				return status;
-			}
-			definedTermEditor.getInMemoryVocabularies().remove(termBase); 
+			}			
+
+			definedEditorInput.getVocabularies().remove((TermVocabulary)termBase); 
 			CdmStore.getService(IVocabularyService.class).delete((TermVocabulary)termBase);
 			
+			
 		} else if (termBase instanceof DefinedTermBase) {
 			
 			
 			DefinedTermBase definedTermBase = (DefinedTermBase) termBase;
+			
+			if (((DefinedTermBase)termBase).getCreatedBy() == null) {
+				IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This is a CDM system defined term");
+				StoreUtil.warningDialog("Cannot delete defined term", termBase, status);
+				return status;
+			}
 			if(!definedTermBase.getIncludes().isEmpty()){
 				IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This term includes other terms. Please delete the included terms before deleting this term.");				
 				StoreUtil.warningDialog("Term has included terms", termBase, status);
 				return status;
 			} 
 						
+
 			DefinedTermBase partOf = definedTermBase.getPartOf();
 			if(partOf != null){
 				partOf.removeIncludes(definedTermBase);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
index a8278c654..02875a7be 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -61,7 +61,7 @@ public class FeatureTreeContentProvider implements ITreeContentProvider {
 			List<FeatureNode> children = ((FeatureTree) parentElement).getRootChildren();
 			return children.toArray();
 		}else if(parentElement instanceof FeatureNode){
-			List<FeatureNode> children = ((FeatureNode) parentElement).getChildren();
+			List<FeatureNode> children = ((FeatureNode) parentElement).getChildNodes();
 			return children.toArray();
 		}else if(parentElement instanceof List){
 			return ((List) parentElement).toArray();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
index a95f420f0..c2975144f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
@@ -1,17 +1,21 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
 package eu.etaxonomy.taxeditor.io.wizard;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.net.URI;
 
+import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 
@@ -28,9 +32,11 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigurator> {
 
+    private static final Logger logger = Logger.getLogger(AbcdImportWizard.class);
+
 	private Abcd206ImportConfigurator configurator;
 	private ImportFromFileDataSourceWizardPage dataSourcePage;
-	
+
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
 	 */
@@ -47,23 +53,29 @@ public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigur
 	@Override
 	public boolean performFinish() {
 		URI source = dataSourcePage.getUri();
-		configurator.setSource(source);
+		try {
+            configurator.setSource(new FileInputStream(new File(source)));
+        } catch (FileNotFoundException e) {
+            logger.error("File not found!", e);
+            return false;
+        }
 		configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
-		
+
 		CdmStore.getImportManager().run(configurator);
 		return true;
-		
+
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
 	 */
 	/** {@inheritDoc} */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
+	@Override
+    public void init(IWorkbench workbench, IStructuredSelection selection) {
 		super.init(workbench, selection);
 		configurator =  CdmStore.getImportManager().AbcdConfigurator();
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#addPages()
 	 */
@@ -71,7 +83,7 @@ public class AbcdImportWizard extends AbstractImportWizard<Abcd206ImportConfigur
 	@Override
 	public void addPages() {
 		super.addPages();
-		
+
 		dataSourcePage = ImportFromFileDataSourceWizardPage.XML();
 		addPage(dataSourcePage);
 	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index 3072f460e..308d27587 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -49,7 +49,6 @@ import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
 import org.eclipse.ui.themes.ITheme;
 import org.eclipse.ui.themes.IThemeManager;
 
-import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
index 328f57a22..1fc1cfd18 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
@@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.api.service.DefaultCategoricalDescriptionBuilder;
 import eu.etaxonomy.cdm.api.service.DefaultQuantitativeDescriptionBuilder;
 import eu.etaxonomy.cdm.api.service.DescriptionBuilder;
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.ISourceable;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
@@ -33,6 +32,7 @@ import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java
index 900665e9e..ce88d1cbc 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -35,11 +35,11 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
  * @version 1.0
  */
 public class FeatureNodeContainer{
-	
-	
-	
+
+
+
 	private FeatureNodeContainer parent;
-	
+
 
 
 	private FeatureNode featureNode;
@@ -48,35 +48,35 @@ public class FeatureNodeContainer{
 
 	private FeatureNodeContainerTree containerTree;
 
-	
+
 	/**
 	 * @param description
 	 */
 	protected FeatureNodeContainer(FeatureNodeContainerTree containerTree) {
-		this.containerTree = containerTree; 
+		this.containerTree = containerTree;
 		this.containerTree.addContainer(this);
 	}
-	
-	
+
+
 	/**
-	 * Recursively traverse a branch of a feature tree and check if there are 
-	 * 
+	 * Recursively traverse a branch of a feature tree and check if there are
+	 *
 	 * @param featureNode
-	 * @param description 
+	 * @param description
 	 * @return
 	 */
 	protected void findLeaves(FeatureNode featureNode) {
 		if(featureNode.isLeaf()){
 			buildLeaf(featureNode);
 		}else{
-			for(FeatureNode childNode : featureNode.getChildren()){
+			for(FeatureNode childNode : featureNode.getChildNodes()){
 				findLeaves(childNode);
 			}
 		}
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @param featureNode
 	 * @param description
 	 * @return
@@ -85,12 +85,12 @@ public class FeatureNodeContainer{
 		if(featureNode.getFeature() == null){
 			throw new IllegalArgumentException("The given feature node does not have a feature.");
 		}
-		
+
 		Feature feature = (Feature) HibernateProxyHelper.deproxy(featureNode.getFeature());
-		
+
 		// get feature node container for the given feature
 		FeatureNodeContainer container = containerTree.getFeatureNodeContainer(feature);
-		
+
 		// get description elements for the given feature
 		List<DescriptionElementBase> elements = containerTree.getDescriptionsElementsForFeature(feature);
 		// no description elements, so we should also remove the feature node container
@@ -108,12 +108,12 @@ public class FeatureNodeContainer{
 				container.buildBranch();
 			}
 			// add description elements to the feature node container
-			container.setDescriptionElements(elements);		
+			container.setDescriptionElements(elements);
 		}
 	}
-	
+
 	/**
-	 * 
+	 *
 	 */
 	private void remove() {
 		if(getParent() != null){
@@ -134,15 +134,15 @@ public class FeatureNodeContainer{
 
 
 	/**
-	 * Recursively 
-	 * 
+	 * Recursively
+	 *
 	 * @param featureNodeMap
 	 * @return
 	 */
-	private void buildBranch(){	
+	private void buildBranch(){
 		if(getParent() == null){
 			FeatureNode parentFeatureNode = getFeatureNode().getParent();
-			
+
 			if(parentFeatureNode.isRoot()){
 				containerTree.getRoot().addChild(this);
 			}else{
@@ -151,15 +151,15 @@ public class FeatureNodeContainer{
 					parentContainer = new FeatureNodeContainer(containerTree);
 					parentContainer.setFeatureNode(parentFeatureNode);
 				}
-				
+
 				parentContainer.addChild(this);
-				
+
 				parentContainer.buildBranch();
-				
+
 			}
 		}
 	}
-	
+
 	/**
 	 * <p>Getter for the field <code>children</code>.</p>
 	 *
@@ -182,7 +182,7 @@ public class FeatureNodeContainer{
 			throw new IllegalStateException("Container may not have a description element set when setting children.");
 		}
 	}
-	
+
 	/**
 	 * Adds a child container to the list of this containers children
 	 *
@@ -201,11 +201,11 @@ public class FeatureNodeContainer{
 	public void addDescriptionElement(DescriptionElementBase descriptionElement){
 		descriptionElements.add(descriptionElement);
 	}
-	
+
 	public void removeDescriptionElement(DescriptionElementBase descriptionElement){
 		descriptionElements.remove(descriptionElement);
 	}
-	
+
 	/**
 	 * If {@link #isLeaf()} is true, i.e. this container should have elements, returns the list of description elements.
 	 *
@@ -225,7 +225,7 @@ public class FeatureNodeContainer{
 	public List<DescriptionElementBase> getDescriptionElementsForEntireBranch(){
 		return getDescriptionElementsRecursively(new ArrayList<DescriptionElementBase>());
 	}
-	
+
 	private List<DescriptionElementBase> getDescriptionElementsRecursively(List<DescriptionElementBase> descriptionElements){
 		if(isLeaf()){
 			descriptionElements.addAll(getDescriptionElements());
@@ -236,20 +236,20 @@ public class FeatureNodeContainer{
 		}
 		return descriptionElements;
 	}
-	
+
 	protected List<FeatureNodeContainer> getLeafs(){
 		List<FeatureNodeContainer> leafs = new ArrayList<FeatureNodeContainer>();
-		
+
 		if(isLeaf()){
 			leafs.add(this);
 		}else{
 			for(FeatureNodeContainer container : getChildren()){
 				leafs.addAll(container.getLeafs());
-			}			
+			}
 		}
 		return leafs;
 	}
-	
+
 	/**
 	 * Set the description element
 	 *
@@ -263,7 +263,7 @@ public class FeatureNodeContainer{
 			throw new IllegalStateException("Container may not contain child container when adding description elements.");
 		}
 	}
-	
+
 	/**
 	 * If the container is a leaf, it will hold a description element and no child containers
 	 *
@@ -272,7 +272,7 @@ public class FeatureNodeContainer{
 	public boolean isLeaf(){
 		return ! descriptionElements.isEmpty() && children.isEmpty();
 	}
-	
+
 	/**
 	 * <p>Setter for the field <code>featureNode</code>.</p>
 	 *
@@ -290,7 +290,7 @@ public class FeatureNodeContainer{
 	public FeatureNode getFeatureNode() {
 		return featureNode;
 	}
-	
+
 	/**
 	 * <p>getFeature</p>
 	 *
@@ -311,14 +311,14 @@ public class FeatureNodeContainer{
 	public DescriptionBase getDescription(){
 		return containerTree.getDescription();
 	}
-	
+
 	public FeatureNodeContainerTree getContainerTree(){
 		return containerTree;
 	}
 
 
 	/**
-	 * 
+	 *
 	 */
 	public void clear() {
 		children.clear();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
index f06ac99b7..86c47a77f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
@@ -21,7 +21,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 
-import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java
index 0930a3bdf..2bfcb7939 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java
@@ -55,7 +55,7 @@ public class NomenclaturalCodeHelper {
 	 * @return
 	 */
 	private static boolean isSupported(NomenclaturalCode code) {
-		if (code.equals(NomenclaturalCode.ICBN) || code.equals(NomenclaturalCode.ICZN)) {
+		if (code.equals(NomenclaturalCode.ICNAFP ) || code.equals(NomenclaturalCode.ICZN)) {
 			return true;
 		} else {
 			return false;
@@ -73,8 +73,8 @@ public class NomenclaturalCodeHelper {
 		if (code.equals(NomenclaturalCode.ICNB)) {
 			return "International Code of Nomenclature of Bacteria (ICNB)";
 		}
-		if (code.equals(NomenclaturalCode.ICBN)) {
-			return "International Code of Botanical Nomenclature (ICBN)";
+		if (code.equals(NomenclaturalCode.ICNAFP )) {
+			return "International Code of Botanical Nomenclature (ICNAFP )";
 		}
 		if (code.equals(NomenclaturalCode.ICNCP)) {
 			return "International Code of Cultivated Plants (ICNCP)";
@@ -94,6 +94,6 @@ public class NomenclaturalCodeHelper {
 	 * @return a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode} object.
 	 */
 	public static NomenclaturalCode getDefaultCode() {
-		return NomenclaturalCode.ICBN;
+		return NomenclaturalCode.ICNAFP ;
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
index d132f0544..90e1b3e78 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
@@ -13,10 +13,16 @@ package eu.etaxonomy.taxeditor.newWizard;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
+import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.dialog.selection.OriginalSourceTypeSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.dialog.selection.SpecimenOrObservationTypeSelectionDialog;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationWizardPage;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
@@ -29,8 +35,17 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralWizardPage;
  * @created Jun 16, 2010
  * @version 1.0
  */
-public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUnitBase> {
+public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUnit> {
+	private SpecimenOrObservationType specOrObsType = null;
 	
+	public NewDerivedUnitBaseWizard() {
+		super();	
+	}
+	
+	public NewDerivedUnitBaseWizard(SpecimenOrObservationType specOrObsType) {
+		super();
+		this.specOrObsType = specOrObsType;
+	}
 	/** {@inheritDoc} */
 	@Override
 	public void addPages() {
@@ -38,6 +53,7 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUni
 		addPage(new GatheringEventWizardPage(formFactory, getConversationHolder(), getFacade()));
 		addPage(new FieldObservationWizardPage(formFactory, getConversationHolder(), getFacade()));
 		addPage(new DerivedUnitBaseWizardPage(formFactory, getConversationHolder(), getFacade()));
+		
 	}
 	
 	/**
@@ -45,11 +61,14 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUni
 	 */
 	private DerivedUnitFacade getFacade() {
 		try {
-			return DerivedUnitFacade.NewInstance(getEntity(), PreferencesUtil.getDerivedUnitConfigurator());
+			if(getEntity() != null) {
+				return DerivedUnitFacade.NewInstance(getEntity(), PreferencesUtil.getDerivedUnitConfigurator());
+			}
 		} catch (DerivedUnitFacadeNotSupportedException e) {
 			// w should never get here
 			throw new IllegalStateException();
 		}
+		return null;
 	}
 
 	/* (non-Javadoc)
@@ -57,11 +76,18 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUni
 	 */
 	/** {@inheritDoc} */
 	@Override
-	protected DerivedUnitBase createNewEntity() {
-		// TODO we do want to create different derivates of DerivedUnitBase but go with specimen for testing 
-		// at the moment
-		// FIXME add wizard page that handles the selection of derived unit type
-		return Specimen.NewInstance();
+	protected DerivedUnit createNewEntity() {		
+		if(specOrObsType == null) {
+			return DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
+		} else {			
+			if(SpecimenOrObservationType.Media.equals(specOrObsType) || 
+					((((SpecimenOrObservationType)specOrObsType).getKindOf() != null) &&
+					((SpecimenOrObservationType)specOrObsType).getKindOf().equals(SpecimenOrObservationType.Media))) {
+				return MediaSpecimen.NewInstance(SpecimenOrObservationType.Media);
+			} else {
+				return DerivedUnit.NewInstance((SpecimenOrObservationType)specOrObsType);
+			}						
+		}
 	}
 
 	/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java
index 925aead2a..4ceb80fd3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java
@@ -11,7 +11,7 @@
 package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
-import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
+import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -21,14 +21,14 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Jun 17, 2010
  * @version 1.0
  */
-public class NewFieldObservationWizard extends AbstractNewEntityWizard<FieldObservation> {
+public class NewFieldObservationWizard extends AbstractNewEntityWizard<FieldUnit> {
 
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard#createNewEntity()
 	 */
 	/** {@inheritDoc} */
 	@Override
-	protected FieldObservation createNewEntity() {
+	protected FieldUnit createNewEntity() {
 		return null;
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java
index 351583132..d14e60819 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java
@@ -11,11 +11,9 @@
 package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;
-import eu.etaxonomy.cdm.api.service.IGroupService;
 import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityDetailWizardPage;
-import eu.etaxonomy.taxeditor.ui.section.group.GroupDetailWizardPage;
 
 /**
  * @author a.kohlbecker
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
index 9ab033f49..6e6ec0886 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
@@ -38,7 +38,7 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
 	@Override
 	protected NonViralName createNewEntity() {
 		NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode();
-		if(code.equals(NomenclaturalCode.ICBN)){
+		if(code.equals(NomenclaturalCode.ICNAFP )){
 			return BotanicalName.NewInstance(null);
 		}else if(code.equals(NomenclaturalCode.ICZN)){
 			return ZoologicalName.NewInstance(null);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index f0e65cbd5..194bc3c7a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.newWizard;
 
@@ -10,7 +10,7 @@ import org.apache.commons.lang.StringUtils;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -24,7 +24,7 @@ import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeWizardPage;
  * @created Sep 15, 2009
  * @version 1.0
  */
-public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
+public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITaxonTreeNode>{
 
 	private TaxonNodeWizardPage taxonNodePage;
 	private boolean openEmptyEditor;
@@ -35,17 +35,17 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
 		taxonNodePage = new TaxonNodeWizardPage(formFactory, getConversationHolder(), getEntity());
 		addPage(taxonNodePage);
 	}
-	
+
 	@Override
 	protected void saveEntity() {
 		if(taxonNodePage.getTaxon() == null || StringUtils.isEmpty(taxonNodePage.getTaxon().getName().getFullTitleCache())){
 			openEmptyEditor = true;
 		}else{
 			getConversationHolder().bind();
-			ITreeNode parent = getParentTreeNode();
+			ITaxonTreeNode parent = getParentTreeNode();
 			Taxon taxon = taxonNodePage.getTaxon();
 			try{
-				TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference(), null);
+				TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
 				generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode);
 			}catch(IllegalArgumentException e){
 				StoreUtil.warningDialog("Taxon already exists in classfication", getClass(), e.getMessage());
@@ -54,12 +54,12 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
 	}
 
 	@Override
-	protected ITreeNode createNewEntity() {		
+	protected ITaxonTreeNode createNewEntity() {
 		if(getSelection() != null){
 			Object selectedObject = getSelection().getFirstElement();
-			if(selectedObject instanceof ITreeNode){
-				ITreeNode treeNode = (ITreeNode) selectedObject;
-				
+			if(selectedObject instanceof ITaxonTreeNode){
+			    ITaxonTreeNode treeNode = (ITaxonTreeNode) selectedObject;
+
 				if(treeNode instanceof Classification){
 					return CdmStore.getService(IClassificationService.class).load(treeNode.getUuid());
 				}
@@ -68,10 +68,10 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
 				}
 			}
 		}
-		
+
 		return null;
 	}
-	
+
 	/**
 	 * <p>openInEditor</p>
 	 *
@@ -80,7 +80,7 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
 	public boolean openInEditor(){
 		return taxonNodePage.openInEditor();
 	}
-	
+
 	/**
 	 * <p>openEmpty</p>
 	 *
@@ -89,7 +89,7 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
 	public boolean openEmpty(){
 		return openInEditor() && openEmptyEditor;
 	}
-	
+
 	/**
 	 * <p>getTaxonNode</p>
 	 *
@@ -97,12 +97,12 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
 	 */
 	public TaxonNode getTaxonNode(){
 		if(generatedTaxonNodeUuid != null){
-			return CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);			
+			return CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);
 		}
 		return null;
 	}
-	
-	public ITreeNode getParentTreeNode(){
+
+	public ITaxonTreeNode getParentTreeNode(){
 		return taxonNodePage.getParentTreeNode();
 	}
 
@@ -110,5 +110,5 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
 	protected String getEntityName() {
 		return "Taxon";
 	}
-	
+
 }
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java
index ad9a0a9ab..0b2f6f0f2 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 
 /**
@@ -32,9 +32,9 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
  */
 public abstract class AbstractPersistentPostOperation extends AbstractPostOperation {
 	private IConversationEnabled conversationEnabled;
-	
-	protected ITreeNode parentNode;
-	
+
+	protected ITaxonTreeNode parentNode;
+
 	/**
 	 * <p>Constructor for AbstractPersistentPostOperation.</p>
 	 *
@@ -49,7 +49,7 @@ public abstract class AbstractPersistentPostOperation extends AbstractPostOperat
 		super(label, undoContext, postOperationEnabled);
 		this.conversationEnabled = conversationEnabled;
 	}
-	
+
 	/**
 	 * <p>Constructor for AbstractPersistentPostOperation.</p>
 	 *
@@ -66,7 +66,7 @@ public abstract class AbstractPersistentPostOperation extends AbstractPostOperat
 		super(label, undoContext, taxonNode, postOperationEnabled);
 		this.conversationEnabled = conversationEnabled;
 	}
-	
+
 	/**
 	 * <p>Constructor for AbstractPersistentPostOperation.</p>
 	 *
@@ -74,10 +74,10 @@ public abstract class AbstractPersistentPostOperation extends AbstractPostOperat
 	 * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
 	 * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
 	 * @param conversationEnabled a {@link eu.etaxonomy.cdm.api.conversation.IConversationEnabled} object.
-	 * @param parentNode a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+	 * @param parentNode a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
 	 */
 	public AbstractPersistentPostOperation(String label,
-			IUndoContext undoContext, ITreeNode parentNode,
+			IUndoContext undoContext, ITaxonTreeNode parentNode,
 			IPostOperationEnabled postOperationEnabled,
 			IConversationEnabled conversationEnabled) {
 		super(label, undoContext, postOperationEnabled);
@@ -89,21 +89,22 @@ public abstract class AbstractPersistentPostOperation extends AbstractPostOperat
 	 * @see eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(eu.etaxonomy.cdm.model.common.CdmBase)
 	 */
 	/** {@inheritDoc} */
-	protected IStatus postExecute(CdmBase objectAffectedByOperation) {	
+	@Override
+    protected IStatus postExecute(CdmBase objectAffectedByOperation) {
 		Assert.isNotNull(conversationEnabled, "Operation has to have a valid conversation attached.");
-		
+
 		conversationEnabled.getConversationHolder().commit(true);
-		
+
 		IStatus status = super.postExecute(objectAffectedByOperation);
-		
+
 		return status;
 	}
-	
+
 	/**
 	 * Binds the conversation that was attached to this operation.
 	 */
 	public void bind(){
-		conversationEnabled.getConversationHolder().bind();	
+		conversationEnabled.getConversationHolder().bind();
 	}
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
index a2382fcee..7254819d9 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
@@ -11,7 +11,6 @@
 package eu.etaxonomy.taxeditor.preference;
 
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;
-import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
 
 /**
  * <p>IPreferenceKeys interface.</p>
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index cf0133919..81ba19af3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -30,6 +30,7 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;
+import eu.etaxonomy.cdm.model.common.ISimpleTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.TermBase;
@@ -229,6 +230,25 @@ public class PreferencesUtil implements IPreferenceKeys {
 		}
 		return key;
 	}
+	
+	/**
+	 * Construct a unique key using the CdmBase object's uuid
+	 * 
+	 * @param cdmBase
+	 * @return
+	 */
+	public static String getPreferenceKey(ISimpleTerm simpleTerm) {
+		simpleTerm = (ISimpleTerm) HibernateProxyHelper.deproxy(simpleTerm);
+		String key = simpleTerm.getClass().getName().concat(".")
+				.concat(simpleTerm.getUuid().toString());
+		if (key.contains("javassist")) {
+			StoreUtil.warn(PreferencesUtil.class,
+					"Trying to persist a preference based on a proxy class.");
+		}
+		return key;
+	}
+	
+	
 
 	/**
 	 * Construct a unique key using the CdmBase object's uuid
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
index 9459ed7a6..dfaa62d7a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/PreservationMethodMenuPreferences.java
@@ -1,16 +1,16 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 
 /**
  * <p>PreservationMethodMenuPreferences class.</p>
@@ -19,14 +19,17 @@ import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
  * @created Jun 25, 2010
  * @version 1.0
  */
-public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<PreservationMethod> {
-	
+public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<DefinedTerm>  {
+//FIXME:3.3MC---- see Ticket #3732
+//extends AbstractMenuPreferences<PreservationMethod> {
+  //FIXME:3.3MC----
+
 	/**
 	 * <p>Constructor for PreservationMethodMenuPreferences.</p>
 	 */
 	public PreservationMethodMenuPreferences() {
-		super("Preservation Method Preferences", 
-				"Select preservation methods to be shown in selections", 
+		super("Preservation Method Preferences",
+				"Select preservation methods to be shown in selections",
 				false);
 	}
 
@@ -35,7 +38,7 @@ public class PreservationMethodMenuPreferences extends AbstractMenuPreferences<P
 	 */
 	/** {@inheritDoc} */
 	@Override
-	protected Class<PreservationMethod> getTermClass() {
-		return PreservationMethod.class;
+	protected Class<DefinedTerm> getTermClass() {
+		return DefinedTerm.class;
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
index 82c370725..566e9a736 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java
@@ -10,7 +10,8 @@
 
 package eu.etaxonomy.taxeditor.preference.menu;
 
-import eu.etaxonomy.cdm.model.description.Stage;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+
 
 /**
  * <p>StageMenuPreferences class.</p>
@@ -19,7 +20,7 @@ import eu.etaxonomy.cdm.model.description.Stage;
  * @created Jun 25, 2010
  * @version 1.0
  */
-public class StageMenuPreferences extends AbstractMenuPreferences<Stage> {
+public class StageMenuPreferences extends AbstractMenuPreferences<DefinedTerm> {
 	
 	/**
 	 * <p>Constructor for StageMenuPreferences.</p>
@@ -35,8 +36,8 @@ public class StageMenuPreferences extends AbstractMenuPreferences<Stage> {
 	 */
 	/** {@inheritDoc} */
 	@Override
-	protected Class<Stage> getTermClass() {
-		return Stage.class;
+	protected Class<DefinedTerm> getTermClass() {
+		return DefinedTerm.class;
 	}
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
index 2d514fa8a..8c15ccbc5 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
@@ -34,7 +34,7 @@ import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
@@ -150,7 +150,7 @@ public class SearchManager {
 		// by default we do not show field observations. This may be configured via preferences
 		boolean showFieldObservations = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_OBSERVATIONS);
 		if(! showFieldObservations){
-			configurator.setClazz(DerivedUnitBase.class);
+			configurator.setClazz(DerivedUnit.class);
 		}
 		if(checkLargeResult(CdmStore.getService(IOccurrenceService.class).countByTitle(configurator))){
 			return CdmStore.getService(IOccurrenceService.class).findByTitle(configurator).getRecords();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
index addb64ae5..3371a6ae5 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
@@ -23,7 +23,10 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;
+import eu.etaxonomy.cdm.model.common.IEnumTerm;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -44,7 +47,7 @@ import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
  * @created Mar 16, 2010
  * @version 1.0
  */
-public class EnumComboElement<T extends IDefinedTerm> extends
+public class EnumComboElement<T extends IEnumTerm> extends
 		AbstractCdmFormElement implements SelectionListener,
 		IEnableableFormElement, ISelectable {
 
@@ -84,7 +87,44 @@ public class EnumComboElement<T extends IDefinedTerm> extends
 				return ReferenceType.class;
 			}
 			
+		},
+		new CdmEnumDataHolder<SpecimenOrObservationType>(){
+
+			@Override
+			public String getName() {
+				return "Specimen / Observation Type";
+			}
+
+			@Override
+			public Collection<SpecimenOrObservationType> getElements() {
+				return Arrays.asList(SpecimenOrObservationType.values());
+			}
+
+			@Override
+			public Class<SpecimenOrObservationType> getClazz() {
+				return SpecimenOrObservationType.class;
+			}
+			
+		},
+		new CdmEnumDataHolder<OriginalSourceType>(){
+
+			@Override
+			public String getName() {
+				return "Original Source Type";
+			}
+
+			@Override
+			public Collection<OriginalSourceType> getElements() {
+				return Arrays.asList(OriginalSourceType.values());
+			}
+
+			@Override
+			public Class<OriginalSourceType> getClazz() {
+				return OriginalSourceType.class;
+			}
+			
 		}
+		
 	};
 	
 	private static final int DEFAULT_VISIBLE_ITEMS = 10;
@@ -135,8 +175,12 @@ public class EnumComboElement<T extends IDefinedTerm> extends
 	private String getDefaultLabelString() {
 		if(enumType.equals(ReferenceType.class)){
 			return "Reference Type";
-		}else if (enumType.equals(NomenclaturalCode.class)){
+		} else if (enumType.equals(NomenclaturalCode.class)){
 			return "Nomenclatural Code";
+		} else if(enumType.equals(OriginalSourceType.class)) {
+			return "Orig. Source Type";
+		} else if(enumType.equals(SpecimenOrObservationType.class)) {
+			return "Spec./Obs. Type";
 		}
 		return "No Label";
 	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
index c43ac73e0..4fe5b8359 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
@@ -19,7 +19,9 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -65,6 +67,56 @@ public class TermComboElement<T extends DefinedTermBase>
 
 	private List<T> customPreferredTerms;
 
+	/**
+	 * <p>
+	 * Constructor for AbstractTermComboElement.
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @param formFactory
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param selection
+	 *            a T object.
+	 * @param visibleItems
+	 *            a int.
+	 * @param <T>
+	 *            a T object.
+	 */
+	public TermComboElement(CdmFormFactory formFactory,
+			ICdmFormElement parentElement, TermType termType, String labelString, T selection,
+			int style) {
+		super(formFactory, parentElement);
+		
+		this.termClass =  (Class<T>) DefinedTerm.class;
+		
+		if (labelString != null) {
+			label = formFactory.createLabel(getLayoutComposite(), labelString);
+			addControl(label);
+		}
+
+		// create combo
+		combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY);
+		addControl(combo);
+		combo.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
+		combo.setVisibleItemCount(DEFAULT_VISIBLE_ITEMS);
+
+		populateTerms(filterDefinedTermByTermType(getPreferredTerms(), termType));
+
+		combo.addSelectionListener(this);
+		combo.addDisposeListener(this);
+		PreferencesUtil.getPreferenceStore().addPropertyChangeListener(this);
+
+		if (selection != null) {
+			setSelection(selection);
+		}
+	}
 
 	/**
 	 * <p>
@@ -392,4 +444,14 @@ public class TermComboElement<T extends DefinedTermBase>
 		customPreferredTerms = terms;
 		populateTerms(customPreferredTerms);
 	}
+	
+	private List<T> filterDefinedTermByTermType(List<T> terms, TermType termType) {
+		List<T> definedTerms = new ArrayList<T>();
+		for(T term : terms){
+			if(term.getTermType().equals(termType)) {
+				definedTerms.add(term);
+			}
+		}		
+		return definedTerms;
+	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java
new file mode 100644
index 000000000..641193b67
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java
@@ -0,0 +1,428 @@
+//$Id$
+
+package eu.etaxonomy.taxeditor.ui.dialog.selection;
+
+import java.lang.reflect.Field;
+import java.text.Collator;
+import java.util.Comparator;
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
+import eu.etaxonomy.cdm.model.common.IEnumTerm;
+import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
+
+/**
+* <p>Abstract AbstractFilteredCdmEnumSelectionDialog class.</p>
+*
+* @author c.mathew
+* @created 18.07.2013
+* @version 1.0
+*/
+public abstract class AbstractFilteredCdmEnumSelectionDialog<T extends IEnumTerm> extends
+		FilteredItemsSelectionDialog implements IConversationEnabled {
+
+	private ConversationHolder conversation;
+
+	protected List<T> model;	
+	private String settings;	
+	
+	
+	
+	/**
+	 * <p>Constructor for AbstractFilteredCdmResourceSelectionDialog.</p>
+	 *
+	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+	 * @param conversation 
+	 * @param title a {@link java.lang.String} object.
+	 * @param multi a boolean.
+	 * @param settings a {@link java.lang.String} object.
+	 * @param cdmEnum a T object.
+	 * @param <T> a T object.
+	 */
+	protected AbstractFilteredCdmEnumSelectionDialog(Shell shell, 
+			ConversationHolder conversation, 
+			String title, 
+			boolean multi, 
+			String settings,
+			T cdmEnum) {
+		super(shell, multi);
+		setTitle(title);
+		setMessage("Use * for wildcard, or ? to see all entries");
+		this.settings = settings;
+		
+		this.conversation = conversation;
+		
+		init();
+		
+		initModel();
+		
+		String objectTitle = getTitle(cdmEnum);
+		if (objectTitle != null) {
+			setInitialPattern(objectTitle);
+		}
+		
+		setListLabelProvider(createListLabelProvider());
+		setDetailsLabelProvider(createDetailsLabelProvider());
+		
+		setSelectionHistory(new ResourceSelectionHistory());
+	}
+	
+	/**
+	 * By default, we are returning the standard list label provider
+	 * 
+	 * Override in subclasses if you want different behavior 
+	 * 
+	 * @return
+	 */
+	protected ILabelProvider createDetailsLabelProvider() {
+		return createListLabelProvider();
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	protected ILabelProvider createListLabelProvider() {
+		return new FilteredCdmResourceLabelProvider();
+	}
+
+	/**
+	 * Override in subclasses.
+	 * Will run before initModel()
+	 */
+	protected void init() {
+		
+	}
+	
+	/**
+	 * <p>getSelectionFromDialog</p>
+	 *
+	 * @param dialog a {@link eu.etaxonomy.taxeditor.ui.dialog.selection.AbstractFilteredCdmResourceSelectionDialog} object.
+	 * @param <TYPE> a TYPE object.
+	 * @return a TYPE object.
+	 */
+	protected static <TYPE extends IEnumTerm> TYPE getSelectionFromDialog(AbstractFilteredCdmEnumSelectionDialog<TYPE> dialog) {
+		
+		int result = dialog.open();
+		
+		if (result == Window.CANCEL) {
+			return null;
+		}
+		
+		return dialog.getSelectedEnumTerm();
+	}
+
+
+	/**
+	 * <p>getTitle</p>
+	 *
+	 * @param cdmObject a T object.
+	 * @return a {@link java.lang.String} object.
+	 */
+	protected String getTitle(T cdmEnum) {
+		return cdmEnum.getMessage();
+	}
+	
+
+	/** {@inheritDoc} */
+	@Override
+	public void refresh() {
+		initModel();		
+		super.refresh();
+	}
+	
+	/**
+	 * <p>initModel</p>
+	 */
+	abstract protected void initModel();
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createFilter()
+	 */
+	/** {@inheritDoc} */
+	@Override
+	protected ItemsFilter createFilter() {
+		return new ItemsFilter() {
+
+			/**
+			 * Always returns false to enforce refiltering even if the pattern is equal
+			 */
+			@Override
+			public boolean equalsFilter(ItemsFilter filter) {
+				return false;
+			}
+			
+			@Override
+			public boolean isConsistentItem(Object item) {
+				return false;
+			}
+
+			@Override
+			public boolean matchItem(Object item) {
+				String text = null;
+				if(item instanceof IEnumTerm){
+					text = ((IEnumTerm) item).getMessage();
+				}else if(item instanceof String){
+					text = (String) item;
+				}
+				return text != null ? matches(text) : false;
+			}
+			
+		};
+	}
+	
+
+	/**
+	 * Set the filter input to the Agent's title cache
+	 *
+	 * @param cdmObject a T object.
+	 */
+	protected void setPattern(T cdmObject) {
+		// FilteredSelection does some very tricky caching to make sure it 
+		// runs with high performance. 
+		// This works for most use cases, but we want to change the model while the dialog is open
+		// and all the clever caching prevents the content provider from knowing that the model has changed
+		// I am aware, that this is a hack, but the FilteredSelectionDialog API does not offer a convenient 
+		// way to solve the problem.
+		try {
+			Field lastCompletedFilter = this.getClass().getSuperclass().getSuperclass().getDeclaredField("lastCompletedFilter");
+			lastCompletedFilter.setAccessible(true);
+			lastCompletedFilter.set(this, null);
+		} catch (SecurityException e) {
+			StoreUtil.error(getClass(), e);
+		} catch (NoSuchFieldException e) {
+			StoreUtil.error(getClass(), e);
+		} catch (IllegalArgumentException e) {
+			StoreUtil.error(getClass(), e);
+		} catch (IllegalAccessException e) {
+			StoreUtil.error(getClass(), e);
+		}
+		
+		// this also is not the nicest way to do it. 
+		// I am still amazed, that FilteredSelectionDialog does not offer any methods to change its data
+		// once it was opened. Am I doing it wrong?
+		String pattern = getTitle(cdmObject);
+		((Text) getPatternControl()).setText(pattern);
+	}
+	
+	/* (non-Javadoc)
+	* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#fillContentProvider(org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.AbstractContentProvider, org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.ItemsFilter, org.eclipse.core.runtime.IProgressMonitor)
+	*/
+	/** {@inheritDoc} */
+	@Override
+	protected void fillContentProvider(AbstractContentProvider contentProvider,
+		ItemsFilter itemsFilter, IProgressMonitor progressMonitor)
+		throws CoreException {
+		try {
+			if(model != null){				
+				progressMonitor.beginTask("Looking for entities", model.size());
+				for(T element : model){
+					contentProvider.add(element, itemsFilter);
+					if (progressMonitor.isCanceled()) {
+						throw new OperationCanceledException();
+					}
+					progressMonitor.worked(1);
+				}
+			}else{
+				StoreUtil.warn(getClass(), "Model for Filtered Selection is null:" + this.getClass().getSimpleName());
+			}
+		}
+		finally {
+			progressMonitor.done();
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getDialogSettings()
+	 */
+	/** {@inheritDoc} */
+	@Override
+	protected IDialogSettings getDialogSettings() {
+		IDialogSettings settings = TaxeditorStorePlugin.getDefault().getDialogSettings().getSection(getSettings());
+
+		if (settings == null) {
+			settings = TaxeditorStorePlugin.getDefault().getDialogSettings().addNewSection(getSettings());
+		}
+		return settings;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getElementName(java.lang.Object)
+	 */
+	/** {@inheritDoc} */
+	@Override
+	public String getElementName(Object item) {
+		return ((IEnumTerm) item).getMessage();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getItemsComparator()
+	 */
+	/** {@inheritDoc} */
+	@Override
+	protected Comparator getItemsComparator() {
+		return new Comparator<IEnumTerm>() {
+			public int compare(IEnumTerm entity1,
+					IEnumTerm entity2) {
+				Collator collator = Collator.getInstance();
+				return collator.compare(entity1.getMessage(), entity2.getMessage());
+			}
+		};
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#validateItem(java.lang.Object)
+	 */
+	/** {@inheritDoc} */
+	@Override
+	protected IStatus validateItem(Object item) {
+		return Status.OK_STATUS;
+	}
+	
+	/**
+	 * <p>getSelectedUuidAndTitleCache</p>
+	 *
+	 * @return a {@link eu.etaxonomy.cdm.model.common.UuidAndTitleCache} object.
+	 */
+	protected T getSelectedEnumTerm() {
+		Object[] result = getResult();
+		return result[0] == null ? null : (T) result[0];
+	}
+	
+	/**
+	 * <p>Getter for the field <code>settings</code>.</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	public String getSettings()  {
+		if(settings == null){
+			throw new IllegalStateException("No SETTINGS set.");
+		}
+		return settings;
+	}
+	
+	/**
+	 * 
+	 * @author n.hoffmann
+	 * @created Oct 19, 2009
+	 * @version 1.0
+	 */
+	private class ResourceSelectionHistory extends SelectionHistory {
+	    /*
+	    * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.SelectionHistory#restoreItemFromMemento(org.eclipse.ui.IMemento)
+	   	*/
+		protected Object restoreItemFromMemento(IMemento element) {
+			return element.getString("resource"); //$NON-NLS-1$
+	  	}
+	  	/*
+	  	 * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.SelectionHistory#storeItemToMemento(java.lang.Object,
+	  	 *      org.eclipse.ui.IMemento)
+	  	 */
+		protected void storeItemToMemento(Object item, IMemento element) {
+			element.putString("resource", item.toString()); //$NON-NLS-1$
+		}
+	}
+	
+	/**
+	 * <p>getNewWizardLinkText</p>
+	 *
+	 * @return a {@link java.lang.String} object.
+	 */
+	protected abstract String getNewWizardLinkText();
+	
+	/**
+	 * <p>getNewEntityWizard</p>
+	 * @param parameter 
+	 * @return a {@link eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard} object.
+	 */
+	protected abstract AbstractNewEntityWizard getNewEntityWizard(String parameter);
+	
+	public class FilteredCdmResourceLabelProvider extends LabelProvider {
+		public String getText(Object element) {
+			if (element == null) {
+				return null;
+			}
+			return ((IEnumTerm) element).getMessage();
+		}			
+	};
+
+	/* (non-Javadoc)
+	* @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite)
+	*/
+	/** {@inheritDoc} */
+	@Override
+	protected Control createExtendedContentArea(Composite parent) {
+		if(getNewWizardLinkText() != null){
+			Link link = new Link(parent, SWT.NONE);
+			link.setText(getNewWizardLinkText());
+			link.addSelectionListener(getNewWizardLinkSelectionListener());
+			return link;
+		}
+		return null;
+	}
+	
+	protected SelectionListener getNewWizardLinkSelectionListener(){
+		return new SelectionAdapter() {
+			
+			/* (non-Javadoc)
+			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 */
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				
+				AbstractNewEntityWizard wizard = getNewEntityWizard(e.text);
+				wizard.init(null, null);
+				WizardDialog dialog = new WizardDialog(getShell(), wizard);
+				int status = dialog.open();
+				
+				if (status == IStatus.OK) {
+					
+					T entity = (T) wizard.getEntity();
+
+					refresh();
+					setPattern(entity);
+					getConversationHolder().bind();
+				}
+			}
+		};
+	}
+	
+	/**
+	 * <p>getConversationHolder</p>
+	 *
+	 * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+	 */
+	public ConversationHolder getConversationHolder() {
+		return conversation;
+	}
+	
+	/** {@inheritDoc} */
+	public void update(CdmDataChangeMap changeEvents) {}
+
+}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
index 95a87cf52..1730721f1 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
@@ -468,6 +468,7 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
 			public void widgetSelected(SelectionEvent e) {
 
 				AbstractNewEntityWizard wizard = getNewEntityWizard(e.text);
+
 				wizard.init(null, null);
 				WizardDialog dialog = new WizardDialog(getShell(), wizard);
 				int status = dialog.open();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
index b09d6821d..70976a68b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
@@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
@@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class DerivedUnitSelectionDialog extends
-		AbstractFilteredCdmResourceSelectionDialog<DerivedUnitBase> {
+		AbstractFilteredCdmResourceSelectionDialog<DerivedUnit> {
 
 	/**
 	 * <p>select</p>
@@ -42,7 +42,7 @@ public class DerivedUnitSelectionDialog extends
 	 * @param unit a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
 	 * @return a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
 	 */
-	public static DerivedUnitBase select(Shell shell, ConversationHolder conversation, DerivedUnitBase unit){
+	public static DerivedUnit select(Shell shell, ConversationHolder conversation, DerivedUnit unit){
 		DerivedUnitSelectionDialog dialog = new DerivedUnitSelectionDialog(shell, conversation,
 				"Choose Unit", false, DerivedUnitSelectionDialog.class.getCanonicalName(), unit);
 		return getSelectionFromDialog(dialog);
@@ -59,19 +59,19 @@ public class DerivedUnitSelectionDialog extends
 	 * @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
 	 */
 	protected DerivedUnitSelectionDialog(Shell shell, ConversationHolder conversation, String title,
-			boolean multi, String settings, DerivedUnitBase cdmObject) {
+			boolean multi, String settings, DerivedUnit cdmObject) {
 		super(shell, conversation, title, multi, settings, cdmObject);
 	}
 	
 	/** {@inheritDoc} */
 	@Override
-	protected DerivedUnitBase getPersistentObject(UUID uuid) {
+	protected DerivedUnit getPersistentObject(UUID uuid) {
 		Object object = CdmStore.getService(IOccurrenceService.class).load(uuid);
 		
 		SpecimenOrObservationBase specimenObservationBase = (SpecimenOrObservationBase) HibernateProxyHelper.deproxy(object);
 		
-		if(specimenObservationBase instanceof DerivedUnitBase){	
-			return (DerivedUnitBase) specimenObservationBase; 
+		if(specimenObservationBase instanceof DerivedUnit){	
+			return (DerivedUnit) specimenObservationBase; 
 		}
 		StoreUtil.error(this.getClass(), "Selected unit is not a derived unit", null);
 		return null;		
@@ -80,7 +80,7 @@ public class DerivedUnitSelectionDialog extends
 	/** {@inheritDoc} */
 	@Override
 	protected void initModel() {
-		model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitBaseUuidAndTitleCache();
+		model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitUuidAndTitleCache();
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
index acd322f89..c7bbf2813 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
@@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
+import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewFieldObservationWizard;
@@ -32,17 +32,17 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class FieldObservationSelectionDialog extends
-		AbstractFilteredCdmResourceSelectionDialog<FieldObservation> {
+		AbstractFilteredCdmResourceSelectionDialog<FieldUnit> {
 	
 	/**
 	 * <p>select</p>
 	 *
 	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
 	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-	 * @param observation a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
-	 * @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
+	 * @param observation a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
+	 * @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
 	 */
-	public static FieldObservation select(Shell shell, ConversationHolder conversation, FieldObservation observation){
+	public static FieldUnit select(Shell shell, ConversationHolder conversation, FieldUnit observation){
 		FieldObservationSelectionDialog dialog = new FieldObservationSelectionDialog(shell, conversation,
 				"Choose Derived Unit", false, FieldObservationSelectionDialog.class.getCanonicalName(), observation);
 		return getSelectionFromDialog(dialog);
@@ -60,7 +60,7 @@ public class FieldObservationSelectionDialog extends
 	 */
 	protected FieldObservationSelectionDialog(Shell shell, ConversationHolder conversation, 
 			String title, boolean multi, String settings,
-			FieldObservation cdmObject) {
+			FieldUnit cdmObject) {
 		super(shell, conversation, title, multi, settings, cdmObject);
 	}
 	
@@ -69,13 +69,13 @@ public class FieldObservationSelectionDialog extends
 	 */
 	/** {@inheritDoc} */
 	@Override
-	protected FieldObservation getPersistentObject(UUID uuid) {
+	protected FieldUnit getPersistentObject(UUID uuid) {
 		Object object = CdmStore.getService(IOccurrenceService.class).load(uuid);
 		
 		SpecimenOrObservationBase specimenObservationBase = (SpecimenOrObservationBase) HibernateProxyHelper.deproxy(object);
 		
-		if(specimenObservationBase instanceof FieldObservation){	
-			return (FieldObservation) specimenObservationBase; 
+		if(specimenObservationBase instanceof FieldUnit){	
+			return (FieldUnit) specimenObservationBase; 
 		}
 		StoreUtil.error(this.getClass(), "Selected object is not a field observation", null);
 		return null;
@@ -87,7 +87,7 @@ public class FieldObservationSelectionDialog extends
 	/** {@inheritDoc} */
 	@Override
 	protected void initModel() {
-		model = CdmStore.getService(IOccurrenceService.class).getFieldObservationUuidAndTitleCache();
+		model = CdmStore.getService(IOccurrenceService.class).getFieldUnitUuidAndTitleCache();
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
index 1cd609d16..7f4ba7e51 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
@@ -19,13 +19,10 @@ import org.springframework.security.core.GrantedAuthority;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;
-import eu.etaxonomy.cdm.api.service.IGroupService;
-import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewGrantedAuthorityWizard;
-import eu.etaxonomy.taxeditor.newWizard.NewGroupWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
index cf39589ad..a8d278d3b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -55,21 +55,22 @@ public class NamedAreaSelectionDialog extends
 			super(vocabulary.getTitleCache(), IAction.AS_CHECK_BOX);
 			this.vocabulary = vocabulary;
 		}
-		
-		public void run(){
+
+		@Override
+        public void run(){
 			if(isChecked()){
 				selectedVocabularies.add(vocabulary);
 			}else{
 				selectedVocabularies.remove(vocabulary);
 			}
-			
+
 			initModel();
 		}
 	}
-	
+
 	private Collection<TermVocabulary<NamedArea>> selectedVocabularies;
-	
-	
+
+
 	/**
 	 * Creates a filtered selection dialog to select a named area.
 	 *
@@ -85,7 +86,7 @@ public class NamedAreaSelectionDialog extends
 				"Choose an area", false, namedArea);
 		return getSelectionFromDialog(dialog);
 	}
-	
+
 	/**
 	 * <p>Constructor for FilteredNamedAreaSelectionDialog.</p>
 	 *
@@ -96,22 +97,22 @@ public class NamedAreaSelectionDialog extends
 	 * @param namedArea a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.
 	 */
 	protected NamedAreaSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, NamedArea namedArea) {
-		super(shell, conversation, title, multi, NamedAreaSelectionDialog.class.getCanonicalName(), namedArea);		
+		super(shell, conversation, title, multi, NamedAreaSelectionDialog.class.getCanonicalName(), namedArea);
 	}
-	
+
 	/** {@inheritDoc} */
 	@Override
 	protected void fillViewMenu(IMenuManager menuManager) {
-				
+
 		super.fillViewMenu(menuManager);
-				
+
 		for(TermVocabulary<NamedArea> vocabulary : getVocabularies()){
 			IncludeNamedAreaVocabulary action = new IncludeNamedAreaVocabulary(vocabulary);
 			menuManager.add(action);
 			action.setChecked(true);
 		}
 	}
-	
+
 	/** {@inheritDoc} */
 	@Override
 	protected NamedArea getPersistentObject(UUID uuid) {
@@ -125,17 +126,18 @@ public class NamedAreaSelectionDialog extends
 		}
 		return null;
 	}
-	
+
 	/** {@inheritDoc} */
 	@Override
 	protected void init() {
 		selectedVocabularies = getVocabularies();
 	}
-	
+
 	private List<TermVocabulary<NamedArea>> getVocabularies(){
 		List<TermVocabulary<NamedArea>> vocabularies = CdmStore.getService(IVocabularyService.class).listByTermClass(NamedArea.class, null, null, null, null);
 		vocabularies.add(CdmStore.getService(IVocabularyService.class).getVocabulary(VocabularyEnum.TdwgArea));
-		vocabularies.add(CdmStore.getService(IVocabularyService.class).getVocabulary(VocabularyEnum.WaterbodyOrCountry));
+		vocabularies.add(CdmStore.getService(IVocabularyService.class).getVocabulary(VocabularyEnum.Country));
+		vocabularies.add(CdmStore.getService(IVocabularyService.class).getVocabulary(VocabularyEnum.Waterbody));
 		vocabularies.add(CdmStore.getService(IVocabularyService.class).getVocabulary(VocabularyEnum.Continent));
 		return vocabularies;
 	}
@@ -143,19 +145,19 @@ public class NamedAreaSelectionDialog extends
 	/** {@inheritDoc} */
 	@Override
 	protected void initModel() {
-		
+
 		Set<NamedArea> terms = new HashSet<NamedArea>();
 		for(TermVocabulary<NamedArea> vocabulary : selectedVocabularies){
 			terms.addAll(vocabulary.getTermsOrderedByLabels(CdmStore.getDefaultLanguage()));
 		}
-		
+
 		if(model == null){
 			model = new ArrayList<UuidAndTitleCache<NamedArea>>();
 		}
 		model.clear();
 		for(Object areaObject : terms){
 			NamedArea area = (NamedArea) HibernateProxyHelper.deproxy(areaObject);
-			UuidAndTitleCache<NamedArea> element = new UuidAndTitleCache<NamedArea>(NamedArea.class, area.getUuid(), getTitle(area)); 
+			UuidAndTitleCache<NamedArea> element = new UuidAndTitleCache<NamedArea>(NamedArea.class, area.getUuid(), getTitle(area));
 			model.add(element);
 		}
 	}
@@ -165,7 +167,7 @@ public class NamedAreaSelectionDialog extends
 	protected Control createExtendedContentArea(Composite parent) {
 		return null;
 	}
-	
+
 	/** {@inheritDoc} */
 	@Override
 	protected String getTitle(NamedArea namedArea) {
@@ -178,7 +180,7 @@ public class NamedAreaSelectionDialog extends
 			return namedArea.getTitleCache();
 		}
 	}
-	
+
 	/** {@inheritDoc} */
 	@Override
 	protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java
new file mode 100644
index 000000000..159e3a93d
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/OriginalSourceTypeSelectionDialog.java
@@ -0,0 +1,85 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.ui.dialog.selection;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+
+import org.eclipse.swt.widgets.Shell;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+
+/**
+ * <p>OriginalSourceTypeSelectionDialog class.</p>
+ *
+ * @author c.mathew
+ * @created 18.07.2013
+ * @version 1.0
+ */
+public class OriginalSourceTypeSelectionDialog extends
+		AbstractFilteredCdmEnumSelectionDialog<OriginalSourceType> {
+
+	/**
+	 * <p>select</p>
+	 *
+	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+	 * @return a {@link eu.etaxonomy.cdm.model.common.OriginalSourceType} object.
+	 */
+	public static OriginalSourceType select(Shell shell, ConversationHolder conversation){
+		OriginalSourceTypeSelectionDialog dialog = 
+				new OriginalSourceTypeSelectionDialog(shell, 
+						conversation,
+						"Choose Original Source Type", 
+						false, 
+						OriginalSourceTypeSelectionDialog.class.getCanonicalName());
+		return getSelectionFromDialog(dialog);
+	}
+	
+	/**
+	 * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
+	 *
+	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+	 * @param title a {@link java.lang.String} object.
+	 * @param multi a boolean.
+	 * @param settings a {@link java.lang.String} object.
+	 */
+	protected OriginalSourceTypeSelectionDialog(Shell shell, 
+			ConversationHolder conversation, 
+			String title,
+			boolean multi, 
+			String settings) {
+		super(shell, conversation, title, multi, settings, OriginalSourceType.PrimaryTaxonomicSource);
+	}
+
+
+	/** {@inheritDoc} */
+	@Override
+	protected void initModel() {
+		model = new ArrayList<OriginalSourceType>();
+		model.addAll(EnumSet.allOf(OriginalSourceType.class));		
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
+		return null;
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	protected String getNewWizardLinkText() {
+		return null;
+	}
+}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
index 7417334d9..d2858ccdd 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.cdm.strategy.cache.reference.ReferenceBaseDefaultCacheStrategy;
+import eu.etaxonomy.cdm.strategy.cache.reference.ReferenceDefaultCacheStrategy;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewReferenceWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<Reference> {
-	
+
 	/**
 	 * <p>select</p>
 	 *
@@ -41,11 +41,11 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
 	 */
 	public static Reference select(Shell shell, ConversationHolder conversation, Reference reference) {
 		ReferenceSelectionDialog dialog = new ReferenceSelectionDialog(shell, conversation,
-				"Choose a reference", false, (Reference) reference);
+				"Choose a reference", false, reference);
 		return getSelectionFromDialog(dialog);
 	}
 
-	
+
 	/**
 	 * <p>Constructor for FilteredReferenceSelectionDialog.</p>
 	 *
@@ -58,7 +58,7 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
 	protected ReferenceSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, Reference reference) {
 		super(shell, conversation, title, multi, ReferenceSelectionDialog.class.getCanonicalName(), null);
 	}
-	
+
 
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)
@@ -74,10 +74,10 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
 	 */
 	/** {@inheritDoc} */
 	@Override
-	protected void initModel() {		
+	protected void initModel() {
 		model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCache();
 	}
-	
+
 
 	/** {@inheritDoc} */
 	@Override
@@ -87,10 +87,10 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
 		}else if(cdmObject.getAuthorTeam() == null){
 			return super.getTitle(cdmObject);
 		}else{
-			return ReferenceBaseDefaultCacheStrategy.putAuthorToEndOfString(cdmObject.getTitleCache(), cdmObject.getAuthorTeam().getTitleCache());
+			return ReferenceDefaultCacheStrategy.putAuthorToEndOfString(cdmObject.getTitleCache(), cdmObject.getAuthorTeam().getTitleCache());
 		}
 	}
-	
+
 	/** {@inheritDoc} */
 	@Override
 	protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
@@ -102,5 +102,5 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
 	protected String getNewWizardLinkText() {
 		return "Click <A>here</A> to create a new reference.";
 	}
-	
+
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
index cf59a0617..fed776ba3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
@@ -27,8 +27,8 @@ import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
@@ -87,11 +87,11 @@ public class SelectionDialogFactory {
 					"This functionality is not implemented yet.");
 			return null;
 		}
-		if(clazz.equals(DerivedUnitBase.class)){
-			return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnitBase) curentSelection);
+		if(clazz.equals(DerivedUnit.class)){
+			return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnit) curentSelection);
 		}
-		if(clazz.equals(FieldObservation.class)){
-			return (T) FieldObservationSelectionDialog.select(shell, conversation, (FieldObservation) curentSelection);
+		if(clazz.equals(FieldUnit.class)){
+			return (T) FieldObservationSelectionDialog.select(shell, conversation, (FieldUnit) curentSelection);
 		}
 		if(clazz.equals(NamedArea.class)){
 			return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) curentSelection);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java
new file mode 100644
index 000000000..145ce16c6
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SpecimenOrObservationTypeSelectionDialog.java
@@ -0,0 +1,77 @@
+//$Id$
+
+package eu.etaxonomy.taxeditor.ui.dialog.selection;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+
+import org.eclipse.swt.widgets.Shell;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+
+/**
+* <p>OriginalSourceTypeSelectionDialog class.</p>
+*
+* @author c.mathew
+* @created 18.07.2013
+* @version 1.0
+*/
+public class SpecimenOrObservationTypeSelectionDialog extends
+		AbstractFilteredCdmEnumSelectionDialog<SpecimenOrObservationType> {
+
+	/**
+	 * <p>select</p>
+	 *
+	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+	 * @return a {@link eu.etaxonomy.cdm.model.common.OriginalSourceType} object.
+	 */
+	public static SpecimenOrObservationType select(Shell shell, ConversationHolder conversation){
+		SpecimenOrObservationTypeSelectionDialog dialog = 
+				new SpecimenOrObservationTypeSelectionDialog(shell, 
+						conversation,
+						"Choose Specimen / Observation Type", 
+						false, 
+						SpecimenOrObservationTypeSelectionDialog.class.getCanonicalName());
+		return getSelectionFromDialog(dialog);
+	}
+	
+	/**
+	 * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
+	 *
+	 * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
+	 * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+	 * @param title a {@link java.lang.String} object.
+	 * @param multi a boolean.
+	 * @param settings a {@link java.lang.String} object.
+	 */
+	protected SpecimenOrObservationTypeSelectionDialog(Shell shell, 
+			ConversationHolder conversation, 
+			String title,
+			boolean multi, 
+			String settings) {
+		super(shell, conversation, title, multi, settings, SpecimenOrObservationType.Unknown);
+	}
+
+
+	/** {@inheritDoc} */
+	@Override
+	protected void initModel() {
+		model = new ArrayList<SpecimenOrObservationType>();
+		model.addAll(EnumSet.allOf(SpecimenOrObservationType.class));		
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
+		return null;
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	protected String getNewWizardLinkText() {
+		return null;
+	}
+}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 408e0acfe..57681c96a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -1,5 +1,5 @@
 /**
- *
+ * 
  */
 package eu.etaxonomy.taxeditor.ui.element;
 
@@ -41,36 +41,37 @@ import org.joda.time.Partial;
 import org.springframework.security.core.GrantedAuthority;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Credit;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
-import eu.etaxonomy.cdm.model.common.IDefinedTerm;
+import eu.etaxonomy.cdm.model.common.IEnumTerm;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.KeyStatement;
-import eu.etaxonomy.cdm.model.description.Modifier;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
-import eu.etaxonomy.cdm.model.description.Scope;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
@@ -89,7 +90,6 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -97,6 +97,7 @@ import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
+import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection.UnitType;
 import eu.etaxonomy.taxeditor.ui.openurl.IOpenUrlEnabled;
 import eu.etaxonomy.taxeditor.ui.openurl.OpenUrlSelectorElement;
 import eu.etaxonomy.taxeditor.ui.password.EditPasswordElement;
@@ -257,1093 +258,1159 @@ import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
  * <p>
  * CdmFormFactory class.
  * </p>
- *
+ * 
  * @author n.hoffmann
  * @created Feb 24, 2010
  * @version 1.0
  */
 public class CdmFormFactory extends FormToolkit {
 
-    private BoldFontHolder2 boldFontHolder2;
-    private MouseListener selectionMouseHandler;
-    private FocusListener selectionFocusHandler;
+	private BoldFontHolder2 boldFontHolder2;
+	private MouseListener selectionMouseHandler;
+	private FocusListener selectionFocusHandler;
 
     private final Set<SelectionListener> selectionListenerList = new HashSet<SelectionListener>();
 
-    private final List<IPropertyChangeListener> propertyChangeListeners = new ArrayList<IPropertyChangeListener>();
-
-    private final int orientation = Window.getDefaultOrientation();
-    private ISelectionProvider selectionProvider;
-
-    /** Constant <code>EMPTY_SELECTION</code> */
-    public static ISelection EMPTY_SELECTION = new ISelection() {
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-    };
-
-    /**
-     *
-     * @author n.hoffmann
-     * @date Jan 25, 2010
-     *
-     */
-    private class SelectionMouseHandler extends MouseAdapter {
-        @Override
-        public void mouseDown(MouseEvent e) {
-            notifySelectionListeners(e);
-        }
-    }
-
-    /**
-     *
-     * @author n.hoffmann
-     * @date Jan 25, 2010
-     *
-     */
-    private class SelectionFocusHandler extends FocusAdapter {
-        @Override
-        public void focusGained(FocusEvent e) {
-            notifySelectionListeners(e);
-        }
-    }
-
-    private void notifySelectionListeners(TypedEvent e) {
-        Event event = new Event();
-        event.widget = e.widget;
-        SelectionEvent selectionEvent = new SelectionEvent(event);
+	private final List<IPropertyChangeListener> propertyChangeListeners = new ArrayList<IPropertyChangeListener>();
+
+	private final int orientation = Window.getDefaultOrientation();
+	private ISelectionProvider selectionProvider;
+
+	/** Constant <code>EMPTY_SELECTION</code> */
+	public static ISelection EMPTY_SELECTION = new ISelection() {
+		@Override
+		public boolean isEmpty() {
+			return true;
+		}
+	};
+	
+	/**
+	 * 
+	 * @author n.hoffmann
+	 * @date Jan 25, 2010
+	 *
+	 */
+	private class SelectionMouseHandler extends MouseAdapter {
+		@Override
+		public void mouseDown(MouseEvent e) {
+			notifySelectionListeners(e);
+		}
+	}
+
+	/**
+	 * 
+	 * @author n.hoffmann
+	 * @date Jan 25, 2010
+	 *
+	 */
+	private class SelectionFocusHandler extends FocusAdapter {
+		@Override
+		public void focusGained(FocusEvent e) {
+			notifySelectionListeners(e);
+		}
+	}
+
+	private void notifySelectionListeners(TypedEvent e) {
+		Event event = new Event();
+		event.widget = e.widget;
+		SelectionEvent selectionEvent = new SelectionEvent(event);
 
         for (SelectionListener listener : selectionListenerList) {
             listener.widgetSelected(selectionEvent);
-        }
-    }
+		}
+	}
+
+	/**
+	 * <p>
+	 * Constructor for CdmFormFactory.
+	 * </p>
+	 * 
+	 * @param display
+	 *            a {@link org.eclipse.swt.widgets.Display} object.
+	 * @param selectionProvider
+	 *            a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
+	 */
+	public CdmFormFactory(Display display, ISelectionProvider selectionProvider) {
+		super(display);
+		this.selectionProvider = selectionProvider;
+		init();
+	}
+
+	/**
+	 * <p>
+	 * Constructor for CdmFormFactory.
+	 * </p>
+	 * 
+	 * @param display
+	 *            a {@link org.eclipse.swt.widgets.Display} object.
+	 */
+	public CdmFormFactory(Display display) {
+		super(display);
+		init();
+	}
 
-    /**
-     * <p>
-     * Constructor for CdmFormFactory.
-     * </p>
-     *
-     * @param display
-     *            a {@link org.eclipse.swt.widgets.Display} object.
-     * @param selectionProvider
-     *            a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
-     */
-    public CdmFormFactory(Display display, ISelectionProvider selectionProvider) {
-        super(display);
-        this.selectionProvider = selectionProvider;
-        init();
-    }
-
-    /**
-     * <p>
-     * Constructor for CdmFormFactory.
-     * </p>
-     *
-     * @param display
-     *            a {@link org.eclipse.swt.widgets.Display} object.
-     */
-    public CdmFormFactory(Display display) {
-        super(display);
-        init();
-    }
-
-    /**
-	 *
+	/**
+	 * 
+	 */
+	private void init() {
+		boldFontHolder2 = new BoldFontHolder2();
+		selectionMouseHandler = new SelectionMouseHandler();
+		selectionFocusHandler = new SelectionFocusHandler();
+	}
+
+	/**
+	 * Creates an instance initialized with the correct selectionProvider
+	 * 
+	 * Make sure to remove the instance when the entityComposite disposes via
+	 * destroySelectionArbitrator(..)
+	 * 
+	 * @param entityElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.IEntityElement}
+	 *            object.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator}
+	 *         object.
 	 */
-    private void init() {
-        boldFontHolder2 = new BoldFontHolder2();
-        selectionMouseHandler = new SelectionMouseHandler();
-        selectionFocusHandler = new SelectionFocusHandler();
-    }
-
-    /**
-     * Creates an instance initialized with the correct selectionProvider
-     *
-     * Make sure to remove the instance when the entityComposite disposes via
-     * destroySelectionArbitrator(..)
-     *
-     * @param entityElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.IEntityElement}
-     *            object.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator}
-     *         object.
-     */
     public SelectionArbitrator createSelectionArbitrator(IEntityElement entityElement) {
         SelectionArbitrator selectionArbitrator = new SelectionArbitrator(entityElement);
-        selectionArbitrator.addSelectionProvider(selectionProvider);
-        selectionProvider.addSelectionChangedListener(selectionArbitrator);
-        addSelectionListener(selectionArbitrator);
-        return selectionArbitrator;
-    }
-
-    /**
-     * <p>
-     * destroySelectionArbitrator
-     * </p>
-     *
-     * @param selectionArbitrator
+		selectionArbitrator.addSelectionProvider(selectionProvider);
+		selectionProvider.addSelectionChangedListener(selectionArbitrator);
+		addSelectionListener(selectionArbitrator);
+		return selectionArbitrator;
+	}
+
+	/**
+	 * <p>
+	 * destroySelectionArbitrator
+	 * </p>
+	 * 
+	 * @param selectionArbitrator
      *            a
      *            {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator}
-     *            object.
-     */
+	 *            object.
+	 */
     public void destroySelectionArbitrator(SelectionArbitrator selectionArbitrator) {
-        removeSelectionListener(selectionArbitrator);
-        if (selectionProvider != null) {
+		removeSelectionListener(selectionArbitrator);
+		if (selectionProvider != null) {
             selectionProvider.removeSelectionChangedListener(selectionArbitrator);
-        } else {
+		} else {
             AbstractUtility.error(this.getClass(),
                     "Tried to destroy a selection listener from this factories listeners but was null", null);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void adapt(Composite composite) {
-        composite.addMouseListener(selectionMouseHandler);
-        super.adapt(composite);
-    }
-
-    /**
-     * <p>
+		}
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public void adapt(Composite composite) {
+		composite.addMouseListener(selectionMouseHandler);
+		super.adapt(composite);
+	}
+
+	/**
+	 * <p>
      * Adapts the {@link AbstractCdmFormElement}:<br>
      * - sets the {@link IPropertyChangeListener}s handled by this class
-     * </p>
-     *
-     * @param formElement
-     *            a
-     *            {@link eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement}
-     *            object.
-     */
-    public void adapt(AbstractCdmFormElement formElement) {
-        formElement.setPropertyChangeListeners(propertyChangeListeners);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void adapt(Control control, boolean trackFocus, boolean trackKeyboard) {
-        if (trackFocus) {
-            control.addFocusListener(selectionFocusHandler);
-        }
-        super.adapt(control, trackFocus, trackKeyboard);
-    }
-
-    /**
-     * <p>
-     * destroyElement
-     * </p>
-     *
-     * @param formElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     */
-    public void destroyElement(ICdmFormElement formElement) {
-        // return if element was not initialized
-        if (formElement == null) {
-            return;
-        }
-        // destroy selection arbitrator, if any
-        if (formElement instanceof ISelectableElement) {
+	 * </p>
+	 * 
+	 * @param formElement
+	 *            a
+	 *            {@link eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement}
+	 *            object.
+	 */
+	public void adapt(AbstractCdmFormElement formElement) {
+		formElement.setPropertyChangeListeners(propertyChangeListeners);
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public void adapt(Control control, boolean trackFocus, boolean trackKeyboard) {
+		if (trackFocus) {
+			control.addFocusListener(selectionFocusHandler);
+		}
+		super.adapt(control, trackFocus, trackKeyboard);
+	}
+
+	/**
+	 * <p>
+	 * destroyElement
+	 * </p>
+	 * 
+	 * @param formElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 */
+	public void destroyElement(ICdmFormElement formElement) {
+		// return if element was not initialized
+		if (formElement == null) {
+			return;
+		}
+		// destroy selection arbitrator, if any
+		if (formElement instanceof ISelectableElement) {
             destroySelectionArbitrator(((ISelectableElement) formElement).getSelectionArbitrator());
-        }
-        // remove this element form its parents list of elements
-        // ICdmFormElement parentElement = formElement.getParentElement();
-        // if(parentElement != null){
-        // parentElement.removeElement(formElement);
-        // }
-        // call destroy on child elements recursively
-        for (ICdmFormElement childElement : formElement.getElements()) {
-            destroyElement(childElement);
-        }
-        // dispose of the controls
-        for (Control control : formElement.getControls()) {
-            // we added the layoutComposite of the parental element as the
-            // layout composite to this formElement
-            // but we do not want to destroy it.
-            if (control.equals(formElement.getLayoutComposite())) {
-                continue;
-            } else {
-                control.dispose();
-                control = null;
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * createEmptyCell
-     * </p>
-     *
-     * @param parent
-     *            a {@link org.eclipse.swt.widgets.Composite} object.
-     * @return a {@link org.eclipse.swt.widgets.Label} object.
-     */
-    public Label createEmptyCell(Composite parent) {
-        return this.createLabel(parent, null);
-    }
-
-    /**
-     * <p>
-     * createMultilineTextWithLabel
-     * </p>
-     *
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param textHeight
-     *            a int.
-     * @param style
-     *            a int.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement}
-     *         object.
-     */
+		}
+		// remove this element form its parents list of elements
+		// ICdmFormElement parentElement = formElement.getParentElement();
+		// if(parentElement != null){
+		// parentElement.removeElement(formElement);
+		// }
+		// call destroy on child elements recursively
+		for (ICdmFormElement childElement : formElement.getElements()) {
+			destroyElement(childElement);
+		}
+		// dispose of the controls
+		for (Control control : formElement.getControls()) {
+			// we added the layoutComposite of the parental element as the
+			// layout composite to this formElement
+			// but we do not want to destroy it.
+			if (control.equals(formElement.getLayoutComposite())) {
+				continue;
+			} else {
+				control.dispose();
+				control = null;
+			}
+		}
+	}
+
+	/**
+	 * <p>
+	 * createEmptyCell
+	 * </p>
+	 * 
+	 * @param parent
+	 *            a {@link org.eclipse.swt.widgets.Composite} object.
+	 * @return a {@link org.eclipse.swt.widgets.Label} object.
+	 */
+	public Label createEmptyCell(Composite parent) {
+		return this.createLabel(parent, null);
+	}
+
+	/**
+	 * <p>
+	 * createMultilineTextWithLabel
+	 * </p>
+	 * 
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param textHeight
+	 *            a int.
+	 * @param style
+	 *            a int.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement}
+	 *         object.
+	 */
     public TextWithLabelElement createMultilineTextWithLabel(ICdmFormElement parentElement, String labelString,
             int textHeight, int style) {
         TextWithLabelElement element = new TextWithLabelElement(this, parentElement, labelString, "", textHeight, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createMultiLanguageTextElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param multilanguageText
-     *            a {@link java.util.Map} object.
-     * @param textHeight
-     *            a int.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.element.MultilanguageTextElement}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createMultiLanguageTextElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param multilanguageText
+	 *            a {@link java.util.Map} object.
+	 * @param textHeight
+	 *            a int.
+	 * @param style
+	 *            a int.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.element.MultilanguageTextElement}
+	 *         object.
+	 */
     public MultilanguageTextElement createMultiLanguageTextElement(ICdmFormElement parentElement, String labelString,
             Map<Language, LanguageString> multilanguageText, int textHeight, int style) {
         MultilanguageTextElement element = new MultilanguageTextElement(this, parentElement, labelString,
                 multilanguageText, textHeight, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
 
     public KeyStatementElement createKeyStatementElement(ICdmFormElement parentElement, String labelString,
-            KeyStatement keyStatement, int textHeight, int style) {
+			KeyStatement keyStatement, int textHeight, int style) {
         KeyStatementElement element = new KeyStatementElement(this, parentElement, labelString, keyStatement,
                 textHeight, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createTextWithLabelElement
-     * </p>
-     *
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param initialText
-     *            a {@link java.lang.String} object.
-     * @param style
-     *            a int.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createTextWithLabelElement
+	 * </p>
+	 * 
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param initialText
+	 *            a {@link java.lang.String} object.
+	 * @param style
+	 *            a int.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement}
+	 *         object.
+	 */
     public TextWithLabelElement createTextWithLabelElement(ICdmFormElement parentElement, String labelString,
-            String initialText, int style) {
+			String initialText, int style) {
         TextWithLabelElement element = new TextWithLabelElement(this, parentElement, labelString, initialText, null,
                 style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
 
     public UriWithLabelElement createUriWithLabelElement(ICdmFormElement parentElement, String labelString,
             URI initialUri, int style) {
         UriWithLabelElement element = new UriWithLabelElement(this, parentElement, labelString, initialUri, null, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * @param element
-     * @param string
-     * @param uri
-     * @param style
-     * @return
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * @param element
+	 * @param string
+	 * @param uri
+	 * @param style
+	 * @return
+	 */
     public OpenUrlSelectorElement createOpenUrlSelectorElement(ICdmFormElement parentElement, String labelString,
-            IOpenUrlEnabled openUrlEnabled, int style) {
+			IOpenUrlEnabled openUrlEnabled, int style) {
         OpenUrlSelectorElement element = new OpenUrlSelectorElement(this, parentElement, labelString, openUrlEnabled,
                 style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     *
-     * @param parentElement
-     * @param labelString
-     * @param conversationEnabled
-     * @param user
-     * @param style
-     * @return
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * 
+	 * @param parentElement
+	 * @param labelString
+	 * @param conversationEnabled
+	 * @param user
+	 * @param style
+	 * @return
+	 */
     public EditPasswordElement createEditPasswordElement(ICdmFormElement parentElement, String labelString,
-            ConversationHolder conversation, User user, int style) {
+			ConversationHolder conversation, User user, int style) {
         EditPasswordElement element = new EditPasswordElement(this, parentElement, labelString, user, conversation);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createIntegerTextWithLabelElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param initialInteger
-     *            a {@link java.lang.Integer} object.
-     * @param style
-     *            a int.
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createIntegerTextWithLabelElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param initialInteger
+	 *            a {@link java.lang.Integer} object.
+	 * @param style
+	 *            a int.
      * @return a
      *         {@link eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement}
-     *         object.
-     */
-    public NumberWithLabelElement createIntegerTextWithLabelElement(ICdmFormElement parentElement, String labelString,
-            Integer initialInteger, int style) {
-        NumberWithLabelElement element = new NumberWithLabelElement(this, parentElement, labelString, initialInteger,
-                style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createFloatTextWithLabelElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param initialFloat
-     *            a float.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement}
-     *         object.
-     */
-    public NumberWithLabelElement createFloatTextWithLabelElement(ICdmFormElement parentElement, String labelString,
-            float initialFloat, int style) {
-        NumberWithLabelElement element = new NumberWithLabelElement(this, parentElement, labelString, initialFloat,
-                style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createLanguageStringWithLabelElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param languageString
-     *            a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement}
-     *         object.
-     */
+	 *         object.
+	 */
+	public NumberWithLabelElement createNumberTextWithLabelElement(
+			ICdmFormElement parentElement, String labelString,
+			Number initialNumber, int style) {
+		NumberWithLabelElement element = new NumberWithLabelElement(this,
+				parentElement, labelString, initialNumber, style);
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+
+	/**
+	 * <p>
+	 * createLanguageStringWithLabelElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param languageString
+	 *            a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
+	 * @param style
+	 *            a int.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement}
+	 *         object.
+	 */
     public LanguageStringWithLabelElement createLanguageStringWithLabelElement(ICdmFormElement parentElement,
             String labelString, LanguageString languageString, int style) {
         LanguageStringWithLabelElement element = new LanguageStringWithLabelElement(this, parentElement, labelString,
                 languageString, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createLanguageStringWithLabelElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param languageString
-     *            a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
-     * @param height
-     *            a int.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createLanguageStringWithLabelElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param languageString
+	 *            a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
+	 * @param height
+	 *            a int.
+	 * @param style
+	 *            a int.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement}
+	 *         object.
+	 */
     public LanguageStringWithLabelElement createLanguageStringWithLabelElement(ICdmFormElement parentElement,
             String labelString, LanguageString languageString, int height, int style) {
         LanguageStringWithLabelElement element = new LanguageStringWithLabelElement(this, parentElement, labelString,
                 languageString, height, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createTextElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param initialText
-     *            a {@link java.lang.String} object.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createTextElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param initialText
+	 *            a {@link java.lang.String} object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement}
+	 *         object.
+	 */
     public TextWithLabelElement createTextElement(ICdmFormElement parentElement, String initialText, int style) {
         TextWithLabelElement element = new TextWithLabelElement(this, parentElement, null, initialText, null, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createKeyValueViewerElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param keyHeading
-     *            a {@link java.lang.String} object.
-     * @param valueHeading
-     *            a {@link java.lang.String} object.
-     * @param map
-     *            a {@link java.util.Map} object.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.KeyValueViewerElement}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createKeyValueViewerElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param keyHeading
+	 *            a {@link java.lang.String} object.
+	 * @param valueHeading
+	 *            a {@link java.lang.String} object.
+	 * @param map
+	 *            a {@link java.util.Map} object.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.KeyValueViewerElement}
+	 *         object.
+	 */
     public KeyValueViewerElement createKeyValueViewerElement(ICdmFormElement parentElement, String keyHeading,
-            String valueHeading, Map<Object, Object> map) {
+			String valueHeading, Map<Object, Object> map) {
         KeyValueViewerElement element = new KeyValueViewerElement(this, parentElement, keyHeading, valueHeading, map);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createTermComboElement
-     * </p>
-     *
-     * @param termComboType
-     *            a
-     *            {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.TermComboType}
-     *            object.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param selection
-     *            a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase}
-     *            object.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.combo.TermComboElement}
-     *         object.
-     */
-
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createTermComboElement
+	 * </p>
+	 * 
+	 * @param termComboType
+	 *            a
+	 *            {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.TermComboType}
+	 *            object.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param selection
+	 *            a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.combo.TermComboElement}
+	 *         object.
+	 */
+	
     public <T extends DefinedTermBase> TermComboElement<T> createTermComboElement(Class<T> termComboType,
             ICdmFormElement parentElement, String labelString, T selection, int style) {
         TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString,
                 selection, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createEnumComboElement
-     * </p>
-     *
-     * @param enumComboType
-     *            a
-     *            {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EnumComboType}
-     *            object.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement}
-     *         object.
-     */
-    public <T extends IDefinedTerm> EnumComboElement<T> createEnumComboElement(Class<T> enumComboType,
-            ICdmFormElement parentElement, int style) {
-        EnumComboElement<T> element = new EnumComboElement<T>(this, parentElement, enumComboType, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createBrowserElement
-     * </p>
-     *
-     * @param imageUri
-     *            a {@link java.net.URI} object.
-     * @param style
-     *            a int.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+	
+	/**
+	 * <p>
+	 * createTermComboElement
+	 * </p>
+	 * 
+	 * @param termComboType
+	 *            a
+	 *            {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.TermComboType}
+	 *            object.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param selection
+	 *            a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.combo.TermComboElement}
+	 *         object.
+	 */
+	
+	public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
+			TermType termType, 
+			ICdmFormElement parentElement,
+			String labelString, 
+			T selection, 
+			int style) {
+		TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, style);
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createEnumComboElement
+	 * </p>
+	 * 
+	 * @param enumComboType
+	 *            a
+	 *            {@link eu.eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EnumComboType}
+	 *            object.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement}
+	 *         object.
+	 */
+	public <T extends IEnumTerm> EnumComboElement<T> createEnumComboElement(
+			Class<T> enumComboType, ICdmFormElement parentElement,
+			int style) {
+		EnumComboElement<T> element = new EnumComboElement<T>(this, parentElement, enumComboType, style);
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createBrowserElement
+	 * </p>
+	 * 
+	 * @param imageUri
+	 *            a {@link java.net.URI} object.
+	 * @param style
+	 *            a int.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
      * @return a {@link eu.etaxonomy.taxeditor.ui.element.BrowserElement}
      *         object.
-     */
+	 */
     public BrowserElement createBrowserElement(ICdmFormElement parentElement, URI imageUri, int style) {
         BrowserElement element = new BrowserElement(this, parentElement, imageUri, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createImageElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param imageUri
-     *            a {@link java.net.URI} object.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.ImageElement} object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createImageElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param imageUri
+	 *            a {@link java.net.URI} object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.ImageElement} object.
+	 */
     public ImageElement createImageElement(ICdmFormElement parentElement, URI imageUri, int style) {
         ImageElement element = new ImageElement(this, parentElement, imageUri, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createTextActionElement
-     * </p>
-     *
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param initialText
-     *            a {@link java.lang.String} object.
-     * @param style
-     *            a int.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param buttonLabel
-     *            a {@link java.lang.String} object.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.TextActionElement}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createTextActionElement
+	 * </p>
+	 * 
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param initialText
+	 *            a {@link java.lang.String} object.
+	 * @param style
+	 *            a int.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param buttonLabel
+	 *            a {@link java.lang.String} object.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.TextActionElement}
+	 *         object.
+	 */
     public TextActionElement createTextActionElement(ICdmFormElement parentElement, String labelString,
-            String buttonLabel, String initialText, int style) {
+			String buttonLabel, String initialText, int style) {
         TextActionElement element = new TextActionElement(this, parentElement, labelString, buttonLabel, initialText,
                 style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createCheckbox
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param label
-     *            a {@link java.lang.String} object.
-     * @param initialState
-     *            a boolean.
-     * @param style
-     *            a int.
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createCheckbox
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param label
+	 *            a {@link java.lang.String} object.
+	 * @param initialState
+	 *            a boolean.
+	 * @param style
+	 *            a int.
      * @return a {@link eu.etaxonomy.taxeditor.ui.element.CheckboxElement}
      *         object.
-     */
+	 */
     public CheckboxElement createCheckbox(ICdmFormElement parentElement, String label, boolean initialState, int style) {
         CheckboxElement element = new CheckboxElement(this, parentElement, label, initialState, style | orientation);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * Creates a section as a part of the form.
-     *
-     * @return the section widget
-     * @param section
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * Creates a section as a part of the form.
+	 * 
+	 * @return the section widget
+	 * @param section
      *            a
      *            {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection}
-     *            object.
-     */
-    public Section adapt(AbstractFormSection section) {
-        section.setMenu(section.getLayoutComposite().getMenu());
-        adapt(section, true, true);
+	 *            object.
+	 */
+	public Section adapt(AbstractFormSection section) {
+		section.setMenu(section.getLayoutComposite().getMenu());
+		adapt(section, true, true);
 
-        // handle focus and property change events for cdm use
-        section.addFocusListener(selectionFocusHandler);
-        section.setPropertyChangeListeners(propertyChangeListeners);
+		// handle focus and property change events for cdm use
+		section.addFocusListener(selectionFocusHandler);
+		section.setPropertyChangeListeners(propertyChangeListeners);
 
-        if (section.getToggle() != null) {
+		if (section.getToggle() != null) {
             section.getToggle().setHoverDecorationColor(getColors().getColor(IFormColors.TB_TOGGLE_HOVER));
             section.getToggle().setDecorationColor(getColors().getColor(IFormColors.TB_TOGGLE));
-        }
+		}
 
         section.setFont(boldFontHolder2.getBoldFont(section.getLayoutComposite().getFont()));
 
         if ((section.getStyle() & ExpandableComposite.TITLE_BAR) != 0
                 || (section.getStyle() & ExpandableComposite.SHORT_TITLE_BAR) != 0) {
-            getColors().initializeSectionToolBarColors();
+			getColors().initializeSectionToolBarColors();
             section.setTitleBarBackground(getColors().getColor(IFormColors.TB_BG));
             section.setTitleBarBorderColor(getColors().getColor(IFormColors.TB_BORDER));
-        }
-        // call setTitleBarForeground regardless as it also sets the label color
+		}
+		// call setTitleBarForeground regardless as it also sets the label color
         section.setTitleBarForeground(getColors().getColor(IFormColors.TB_TOGGLE));
-        return section;
-    }
+		return section;
+	}
 
-    private class BoldFontHolder2 {
-        private Font normalFont;
+	private class BoldFontHolder2 {
+		private Font normalFont;
 
-        private Font boldFont;
+		private Font boldFont;
 
-        public BoldFontHolder2() {
-        }
+		public BoldFontHolder2() {
+		}
 
-        public Font getBoldFont(Font font) {
-            createBoldFont(font);
-            return boldFont;
-        }
+		public Font getBoldFont(Font font) {
+			createBoldFont(font);
+			return boldFont;
+		}
 
-        private void createBoldFont(Font font) {
-            if (normalFont == null || !normalFont.equals(font)) {
-                normalFont = font;
-                dispose();
-            }
-            if (boldFont == null) {
+		private void createBoldFont(Font font) {
+			if (normalFont == null || !normalFont.equals(font)) {
+				normalFont = font;
+				dispose();
+			}
+			if (boldFont == null) {
                 boldFont = FormFonts.getInstance().getBoldFont(getColors().getDisplay(), normalFont);
-            }
-        }
+			}
+		}
 
-        public void dispose() {
-            if (boldFont != null) {
+		public void dispose() {
+			if (boldFont != null) {
                 FormFonts.getInstance().markFinished(boldFont, getColors().getDisplay());
-                boldFont = null;
-            }
-        }
-    }
-
-    /**
-     * <p>
-     * createToggleableTextField
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param initialText
-     *            a {@link java.lang.String} object.
-     * @param initialState
-     *            a boolean.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement}
-     *         object.
-     */
+				boldFont = null;
+			}
+		}
+	}
+
+	/**
+	 * <p>
+	 * createToggleableTextField
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param initialText
+	 *            a {@link java.lang.String} object.
+	 * @param initialState
+	 *            a boolean.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement}
+	 *         object.
+	 */
     public ToggleableTextElement createToggleableTextField(ICdmFormElement parentElement, String labelString,
-            String initialText, boolean initialState, int style) {
+			String initialText, boolean initialState, int style) {
         ToggleableTextElement element = new ToggleableTextElement(this, parentElement, labelString, initialText,
                 initialState, style | orientation);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createTimePeriodElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param timePeriod
-     *            a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.TimePeriodElement}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createTimePeriodElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param timePeriod
+	 *            a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.TimePeriodElement}
+	 *         object.
+	 */
     public TimePeriodElement createTimePeriodElement(ICdmFormElement parentElement, String labelString,
-            TimePeriod timePeriod, int style) {
+			TimePeriod timePeriod, int style) {
         TimePeriodElement element = new TimePeriodElement(this, parentElement, labelString, timePeriod, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createPointElement
-     * </p>
-     *
-     * @param style
-     *            a int.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param point
-     *            a {@link eu.etaxonomy.cdm.model.location.Point} object.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.PointElement} object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+	
+	/**
+	 * <p>
+	 * createGatheringEventUnitElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param timePeriod
+	 *            a {@link eu.etaxonomy.cdm.model.common.GatheringEvent} object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement}
+	 *         object.
+	 */
+	public GatheringEventUnitElement createGatheringEventUnitElement(
+			ICdmFormElement parentElement, 
+			String labelString,
+			DerivedUnitFacade gatheringEvent, 
+			MinMaxTextSection.UnitType unitType,			
+			int style) {
+		GatheringEventUnitElement element = new GatheringEventUnitElement(this, 
+				parentElement,
+				labelString, 
+				gatheringEvent, 
+				unitType,
+				style);
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createPointElement
+	 * </p>
+	 * 
+	 * @param style
+	 *            a int.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param point
+	 *            a {@link eu.etaxonomy.cdm.model.location.Point} object.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.PointElement} object.
+	 */
     public PointElement createPointElement(ICdmFormElement parentElement, Point point, int style) {
         PointElement element = new PointElement(this, parentElement, point, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createDateDetailSection
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.DateDetailSection}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createDateDetailSection
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.DateDetailSection}
+	 *         object.
+	 */
     public DateDetailSection createDateDetailSection(ICdmFormElement parentElement, int style) {
         DateDetailSection section = new DateDetailSection(this, parentElement, style);
-        parentElement.addElement(section);
-        adapt(section);
-        return section;
-    }
-
-    /**
-     * <p>
-     * createPartialElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param partial
-     *            a {@link org.joda.time.Partial} object.
-     * @param style
-     *            a int.
+		parentElement.addElement(section);
+		adapt(section);
+		return section;
+	}
+	
+	/**
+	 * <p>
+	 * createDateDetailSection
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection}
+	 *         object.
+	 */
+	public MinMaxTextSection createMinMaxTextSection(ICdmFormElement parentElement, UnitType unitType, int style) {
+		MinMaxTextSection section = new MinMaxTextSection(this, parentElement, unitType, style);
+		parentElement.addElement(section);
+		adapt(section);
+		return section;
+	}
+
+	/**
+	 * <p>
+	 * createPartialElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param partial
+	 *            a {@link org.joda.time.Partial} object.
+	 * @param style
+	 *            a int.
      * @return a {@link eu.etaxonomy.taxeditor.ui.element.PartialElement}
      *         object.
-     */
+	 */
     public PartialElement createPartialElement(ICdmFormElement parentElement, String labelString, Partial partial,
             int style) {
         PartialElement element = new PartialElement(this, parentElement, labelString, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * addSelectionListener
-     * </p>
-     *
-     * @param listener
-     *            a {@link org.eclipse.swt.events.SelectionListener} object.
-     */
-    public void addSelectionListener(SelectionListener listener) {
-        selectionListenerList.add(listener);
-    }
-
-    /**
-     * <p>
-     * removeSelectionListener
-     * </p>
-     *
-     * @param listener
-     *            a {@link org.eclipse.swt.events.SelectionListener} object.
-     */
-    public void removeSelectionListener(SelectionListener listener) {
-        if (listener == null) {
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * addSelectionListener
+	 * </p>
+	 * 
+	 * @param listener
+	 *            a {@link org.eclipse.swt.events.SelectionListener} object.
+	 */
+	public void addSelectionListener(SelectionListener listener) {
+		selectionListenerList.add(listener);
+	}
+
+	/**
+	 * <p>
+	 * removeSelectionListener
+	 * </p>
+	 * 
+	 * @param listener
+	 *            a {@link org.eclipse.swt.events.SelectionListener} object.
+	 */
+	public void removeSelectionListener(SelectionListener listener) {
+		if (listener == null) {
             AbstractUtility.error(this.getClass(),
                     "Tried to remove a selection listener from this factories listeners but was null", null);
-        } else {
-            selectionListenerList.remove(listener);
-        }
-    }
-
-    /**
-     * <p>
-     * addPropertyChangeListener
-     * </p>
-     *
-     * @param listener
-     *            a {@link org.eclipse.jface.util.IPropertyChangeListener}
-     *            object.
-     */
-    public void addPropertyChangeListener(IPropertyChangeListener listener) {
-        if (propertyChangeListeners.contains(listener)) {
-            return;
-        }
-        propertyChangeListeners.add(0, listener);
-    }
-
-    /**
-     * <p>
-     * removePropertyChangeListener
-     * </p>
-     *
-     * @param listener
-     *            a {@link org.eclipse.jface.util.IPropertyChangeListener}
-     *            object.
-     */
-    public void removePropertyChangeListener(IPropertyChangeListener listener) {
-        propertyChangeListeners.remove(listener);
-    }
-
-    /**
-     * <p>
-     * createHorizontalSeparator
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param style
-     *            a int.
-     * @return a {@link org.eclipse.swt.widgets.Label} object.
-     */
+		} else {
+			selectionListenerList.remove(listener);
+		}
+	}
+
+	/**
+	 * <p>
+	 * addPropertyChangeListener
+	 * </p>
+	 * 
+	 * @param listener
+	 *            a {@link org.eclipse.jface.util.IPropertyChangeListener}
+	 *            object.
+	 */
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		if(propertyChangeListeners.contains(listener)){
+			return;
+		}
+		propertyChangeListeners.add(0, listener);
+	}
+
+	/**
+	 * <p>
+	 * removePropertyChangeListener
+	 * </p>
+	 * 
+	 * @param listener
+	 *            a {@link org.eclipse.jface.util.IPropertyChangeListener}
+	 *            object.
+	 */
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		propertyChangeListeners.remove(listener);
+	}
+
+	/**
+	 * <p>
+	 * createHorizontalSeparator
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a {@link org.eclipse.swt.widgets.Label} object.
+	 */
     public Label createHorizontalSeparator(ICdmFormElement parentElement, int style) {
         Label separator = this.createSeparator(parentElement.getLayoutComposite(), SWT.HORIZONTAL | style);
-        separator.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
-        return separator;
-    }
-
-    /**
-     * <p>
-     * createVersionElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param entity
-     *            a {@link eu.etaxonomy.cdm.model.common.VersionableEntity}
-     *            object.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.section.supplemental.VersionElement}
-     *         object.
-     */
+		separator.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
+		return separator;
+	}
+
+	/**
+	 * <p>
+	 * createVersionElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param entity
+	 *            a {@link eu.etaxonomy.cdm.model.common.VersionableEntity}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.section.supplemental.VersionElement}
+	 *         object.
+	 */
     public VersionElement createVersionElement(ICdmFormElement parentElement, VersionableEntity entity, int style) {
         VersionElement element = new VersionElement(this, parentElement, entity, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * @param cdmBaseSection
-     * @param object
-     * @param style
-     * @return
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+	
+	/**
+	 * @param cdmBaseSection
+	 * @param object
+	 * @param style
+	 * @return
+	 */
     public CdmBaseElement createCdmBaseElement(ICdmFormElement parentElement, CdmBase entity, int style) {
         CdmBaseElement element = new CdmBaseElement(this, parentElement, entity, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createVersionSection
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.section.supplemental.VersionSection}
-     *         object.
-     */
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+
+	/**
+	 * <p>
+	 * createVersionSection
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.section.supplemental.VersionSection}
+	 *         object.
+	 */
     public VersionSection createVersionSection(ICdmFormElement parentElement, int style) {
-        VersionSection section = new VersionSection(this, parentElement, style);
-        parentElement.addElement(section);
-        adapt(section);
-        return section;
-    }
-
-    /**
-     * @param parent
-     * @param i
-     * @return
-     */
-    public CdmBaseSection createCdmBaseSection(ICdmFormElement parentElement, int style) {
-        CdmBaseSection section = new CdmBaseSection(this, parentElement, style);
-        parentElement.addElement(section);
-        adapt(section);
-        return section;
-    }
-
-    /**
-     * <p>
-     * createEmptyElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.section.EmptyElement} object.
-     */
-    public EmptyElement createEmptyElement(ICdmFormElement parentElement) {
+		VersionSection section = new VersionSection(this, parentElement, style);
+		parentElement.addElement(section);
+		adapt(section);
+		return section;
+	}
+	
+	/**
+	 * @param parent
+	 * @param i
+	 * @return
+	 */
+	public CdmBaseSection createCdmBaseSection(ICdmFormElement parentElement, int style) {
+		CdmBaseSection section = new CdmBaseSection(this, parentElement, style);
+		parentElement.addElement(section);
+		adapt(section);
+		return section;
+	}
+
+	/**
+	 * <p>
+	 * createEmptyElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @return a {@link eu.etaxonomy.taxeditor.ui.section.EmptyElement} object.
+	 */
+	public EmptyElement createEmptyElement(ICdmFormElement parentElement) {
         EmptyElement element = new EmptyElement(this, parentElement, null, SWT.NULL);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * createHeadlineSection
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.section.supplemental.HeadlineSection}
-     *         object.
-     */
-    public HeadlineSection createHeadlineSection(ICdmFormElement parentElement) {
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * createHeadlineSection
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.section.supplemental.HeadlineSection}
+	 *         object.
+	 */
+	public HeadlineSection createHeadlineSection(ICdmFormElement parentElement) {
         HeadlineSection section = new HeadlineSection(this, parentElement, SWT.NULL);
-        parentElement.addElement(section);
-        adapt(section);
-        return section;
-    }
-
-    /**
-     * <p>
-     * createParsingMessageElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param parserProblem
-     *            a {@link eu.etaxonomy.cdm.strategy.parser.ParserProblem}
-     *            object.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.section.taxon.ParsingMessageElement}
-     *         object.
-     */
+		parentElement.addElement(section);
+		adapt(section);
+		return section;
+	}
+
+	/**
+	 * <p>
+	 * createParsingMessageElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param parserProblem
+	 *            a {@link eu.etaxonomy.cdm.strategy.parser.ParserProblem}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.section.taxon.ParsingMessageElement}
+	 *         object.
+	 */
     public ParsingMessageElement createParsingMessageElement(ICdmFormElement parentElement,
             ParserProblem parserProblem, int style) {
         ParsingMessageElement element = new ParsingMessageElement(this, parentElement, parserProblem, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
 
     public AbstractFormSection createDefinedTermDetailSection(Class definedTermClass, ConversationHolder conversation,
             ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) {
 
         AbstractFormSection section = new DefinedTermDetailSection(this, definedTermClass, conversation, parentElement,
                 selectionProvider, style);
-
-        parentElement.addElement(section);
-        adapt(section);
-        return section;
-
-    }
-
-    /**
-     * @param definedTermClass
-     * @param formElement
-     * @param style
-     * @return
-     */
+	
+		parentElement.addElement(section);
+		adapt(section);
+		return section;
+		
+	}
+	
+	/**
+	 * @param definedTermClass
+	 * @param formElement
+	 * @param style
+	 * @return
+	 */
     public AbstractCdmDetailElement createDefinedTermDetailElement(Class definedTermClass, AbstractCdmDetailSection parentElement, int style) {
-        AbstractCdmDetailElement element = null;
-
-        if (NamedArea.class.isAssignableFrom(definedTermClass)) {
-            element = new eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailElement(this, parentElement);
+		AbstractCdmDetailElement element = null;
+		
+		if (NamedArea.class.isAssignableFrom(definedTermClass)){
+			element = new eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailElement(this, parentElement);
         } else {
-            element = new DefinedTermDetailElement(this, parentElement);
-        }
-
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
+			element = new DefinedTermDetailElement(this, parentElement);
+		}
+		
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
 
 
     //--------DetailSections---------
@@ -1556,8 +1623,8 @@ public class CdmFormFactory extends FormToolkit {
         GeneralDetailSection section = new GeneralDetailSection(this, conversation, parentElement, selectionProvider, style);
         addAndAdaptSection(parentElement, section);
         return section;
-    }
-
+		}
+		
     public GatheringEventDetailSection createGatheringSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){
         GatheringEventDetailSection section = new GatheringEventDetailSection(this, conversation, parentElement, selectionProvider, style);
         addAndAdaptSection(parentElement, section);
@@ -1568,12 +1635,12 @@ public class CdmFormFactory extends FormToolkit {
         FieldObservationDetailSection section = new FieldObservationDetailSection(this, conversation, parentElement, selectionProvider, style);
         addAndAdaptSection(parentElement, section);
         return section;
-    }
+		}
 
     private void addAndAdaptSection(ICdmFormElement parentElement, AbstractFormSection<?> section) {
-        parentElement.addElement(section);
-        adapt(section);
-    }
+		parentElement.addElement(section);
+		adapt(section);
+	}
 
     //--------DetailElements------------
 
@@ -1750,8 +1817,8 @@ public class CdmFormFactory extends FormToolkit {
         addAndAdaptElement(parentElement, element);
         return element;
     }
-
-
+	
+	
     public GeneralDetailElement createGeneralDetailElement(ICdmFormElement parentElement){
         GeneralDetailElement element = new GeneralDetailElement(this, parentElement);
         addAndAdaptElement(parentElement, element);
@@ -1762,30 +1829,30 @@ public class CdmFormFactory extends FormToolkit {
         GatheringEventDetailElement element = new GatheringEventDetailElement(this, parentElement);
         addAndAdaptElement(parentElement, element);
         return element;
-    }
+		}
 
     public FieldObservationDetailElement createFieldObservationDetailElement(ICdmFormElement parentElement) {
         FieldObservationDetailElement element = new FieldObservationDetailElement(this, parentElement);
         addAndAdaptElement(parentElement, element);
         return element;
-    }
+		}
 
     public DerivedUnitBaseDetailElement createDerivedUnitBaseDetailElement(ICdmFormElement parentElement) {
         DerivedUnitBaseDetailElement element = new DerivedUnitBaseDetailElement(this, parentElement);
         addAndAdaptElement(parentElement, element);
-        return element;
-    }
+		return element;
+	}
 
     public DeterminationDetailElement createDeterminationDetailElement(ICdmFormElement parentElement) {
         DeterminationDetailElement element = new DeterminationDetailElement(this, parentElement);
         addAndAdaptElement(parentElement, element);
         return element;
-    }
+	}
 
-    /**
-     * @param parentElement
+	/**
+	 * @param parentElement
      * @param element
-     */
+	 */
     private void addAndAdaptElement(ICdmFormElement parentElement, AbstractCdmDetailElement<?> element) {
         adapt(element);
         parentElement.addElement(element);
@@ -1982,286 +2049,326 @@ public class CdmFormFactory extends FormToolkit {
         GroupsByUserDetailSection section = new GroupsByUserDetailSection(this, conversation, parentElement, style);
         addAndAdaptSection(parentElement, section);
         return section;
-    }
+		}
 
     public TaxonomicScopeSection createTaxonomicScopeSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){
         TaxonomicScopeSection section = new TaxonomicScopeSection(this, conversation, parentElement, style);
         addAndAdaptSection(parentElement, section);
-        return section;
-    }
-
-    /**
-     * <p>
-     * createEntityCollectionElement
-     * </p>
-     *
-     * @param removeListener
-     *            a {@link org.eclipse.swt.events.SelectionListener} object.
-     * @param style
-     *            a int.
-     * @param parentElement
+		return section;
+	}
+
+	/**
+	 * <p>
+	 * createEntityCollectionElement
+	 * </p>
+	 * 
+	 * @param removeListener
+	 *            a {@link org.eclipse.swt.events.SelectionListener} object.
+	 * @param style
+	 *            a int.
+	 * @param parentElement
      *            a
      *            {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection}
-     *            object.
-     * @param versionableEntity
-     *            a {@link eu.etaxonomy.cdm.model.common.IVersionableEntity}
-     *            object.
-     * @param backgroundColor
-     *            a {@link org.eclipse.swt.graphics.Color} object.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement}
-     *         object.
-     */
+	 *            object.
+	 * @param versionableEntity
+	 *            a {@link eu.etaxonomy.cdm.model.common.IVersionableEntity}
+	 *            object.
+	 * @param backgroundColor
+	 *            a {@link org.eclipse.swt.graphics.Color} object.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement}
+	 *         object.
+	 */
     public AbstractEntityCollectionElement createEntityCollectionElement(AbstractFormSection parentElement,
             Object versionableEntity, SelectionListener removeListener, Color backgroundColor, int style) {
-        AbstractEntityCollectionElement element = null;
+		AbstractEntityCollectionElement element = null;
 
-        Object entity = HibernateProxyHelper.deproxy(versionableEntity);
+		Object entity = HibernateProxyHelper.deproxy(versionableEntity);
 
-        if (entity instanceof Annotation) {
+		if (entity instanceof Annotation) {
             element = new AnnotationElement(this, parentElement, (Annotation) entity, removeListener, style);
-        } else if (entity instanceof Person) {
+		} else if (entity instanceof Person) {
             element = new TeamMemberElement(this, parentElement, (Person) entity, removeListener, style);
-        } else if (entity instanceof Credit) {
+		} else if (entity instanceof Credit) {
             element = new CreditElement(this, parentElement, (Credit) entity, removeListener, style);
-        } else if (entity instanceof Extension) {
+		} else if (entity instanceof Extension) {
             element = new ExtensionElement(this, parentElement, (Extension) entity, removeListener, style);
-        } else if (entity instanceof Marker) {
+		} else if (entity instanceof Marker) {
             element = new MarkerElement(this, parentElement, (Marker) entity, removeListener, style);
-        } else if (entity instanceof Media) {
+		} else if (entity instanceof Media) {
             element = new MediaElement(this, parentElement, (Media) entity, removeListener, style);
-        } else if (entity instanceof MediaRepresentation) {
+		} else if (entity instanceof MediaRepresentation) {
             element = new MediaRepresentationElement(this, parentElement, (MediaRepresentation) entity, removeListener,
                     style);
-        } else if (entity instanceof ImageFile) {
+		} else if (entity instanceof ImageFile) {
             element = new ImageFileElement(this, parentElement, (ImageFile) entity, removeListener, style);
-        } else if (entity instanceof MediaRepresentationPart) {
+		} else if (entity instanceof MediaRepresentationPart){
             element = new MediaRepresentationPartElement(this, parentElement, (MediaRepresentationPart) entity,
                     removeListener, style);
-        } else if (entity instanceof NomenclaturalStatus) {
+		} else if (entity instanceof NomenclaturalStatus) {
             element = new NomenclaturalStatusElement(this, parentElement, (NomenclaturalStatus) entity, removeListener,
                     style);
-        } else if (entity instanceof Rights) {
+		} else if (entity instanceof Rights) {
             element = new RightsElement(this, parentElement, (Rights) entity, removeListener, style);
         } else if (entity instanceof DescriptionElementSource) {
             element = new DescriptionElementSourceElement(this, parentElement, (DescriptionElementSource) entity,
-                    removeListener, style);
-        } else if (entity instanceof IdentifiableSource) {
+					removeListener, style);
+		} else if (entity instanceof IdentifiableSource) {
             element = new IdentifiableSourceElement(this, parentElement, (IdentifiableSource) entity, removeListener,
                     style);
-        } else if (entity instanceof Scope) {
-            element = new ScopeElement(this, parentElement, (Scope) entity, removeListener, style);
-        } else if (entity instanceof Modifier) {
-            element = new ModifierElement(this, parentElement, (Modifier) entity, removeListener, style);
-        } else if (entity instanceof Reference) {
+		} else if (entity instanceof DefinedTerm) {
+			switch(((DefinedTerm)entity).getTermType()) {
+				case Scope:
+					element = new ScopeElement(this, 
+							parentElement, 
+							(DefinedTerm) entity,
+							removeListener, 
+							style);
+					break;
+				case Modifier:
+					element = new ModifierElement(this, 
+							parentElement,
+							(DefinedTerm) entity, 
+							removeListener, 
+							style);
+					break;
+				default:
+					//FIXME : Actually we should through an exception here
+					element = null;
+					break;
+			
+			}
+		} else if (entity instanceof Reference) {
             element = new DescriptionSourceElement(this, parentElement, (Reference) entity, removeListener, style);
-        } else if (entity instanceof NameTypeDesignation) {
+		} else if (entity instanceof NameTypeDesignation) {
             element = new NameTypeDesignationElement(this, parentElement, (NameTypeDesignation) entity, removeListener,
                     style);
-        } else if (entity instanceof NameRelationship) {
+		} else if (entity instanceof NameRelationship) {
             element = new NameRelationshipDetailElement(this, parentElement, (NameRelationship) entity, removeListener,
                     style);
-        } else if (entity instanceof SpecimenTypeDesignation) {
+		} else if (entity instanceof SpecimenTypeDesignation) {
             element = new SpecimenTypeDesignationElement(this, parentElement, (SpecimenTypeDesignation) entity,
                     removeListener, style);
-        } else if (entity instanceof StateData) {
+		} else if (entity instanceof StateData) {
             element = new StateDataElement(this, parentElement, (StateData) entity, removeListener, style);
-        } else if (entity instanceof StatisticalMeasurementValue) {
+		} else if (entity instanceof StatisticalMeasurementValue) {
             element = new StatisticalMeasurementValueElement(this, parentElement, (StatisticalMeasurementValue) entity,
-                    removeListener, style);
-        } else if (entity instanceof DerivedUnit) {
-            element = new DerivedUnitElement(this, parentElement, (DerivedUnit) entity, removeListener, style);
-        } else if (entity instanceof NamedArea) {
+					removeListener, style);
+		} else if (entity instanceof DerivedUnit) {
+			switch(((DerivedUnit)entity).getRecordBasis()) {
+				case LivingSpecimen:
+				case PreservedSpecimen:
+				case OtherSpecimen:
+					element = new SpecimenCollectionDetailElement(this, 
+								parentElement,
+								(DerivedUnit) entity, 
+								removeListener, 
+								style);
+					break;
+				default:
+					element = new DerivedUnitElement(this, 
+								parentElement,
+								(DerivedUnit) entity, 
+								removeListener, 
+								style);
+			}			
+
+		} else if (entity instanceof NamedArea) {
             element = new NamedAreaDetailElement(this, parentElement, (NamedArea) entity, removeListener, style);
-        } else if (entity instanceof DeterminationEvent) {
+		} else if (entity instanceof DeterminationEvent) {
             element = new DeterminationEventDetailElement(this, parentElement, (DeterminationEvent) entity,
                     removeListener, style);
-        } else if (entity instanceof Specimen) {
-            element = new SpecimenCollectionDetailElement(this, parentElement, (Specimen) entity, removeListener, style);
-        } else if (entity instanceof User) {
+		} else if (entity instanceof User) {
             element = new MemberDetailElement(this, parentElement, (User) entity, removeListener, style);
-        } else if (entity instanceof GrantedAuthority) {
+		} else if (entity instanceof GrantedAuthority) {
             element = new GrantedAuthorityCollectionElement(this, parentElement, (GrantedAuthorityImpl) entity,
                     removeListener, style);
-        } else if (entity instanceof Group) {
+		} else if (entity instanceof Group) {
             element = new GroupsByUserDetailElement(this, parentElement, (Group) entity, removeListener, style);
-        } else if (entity instanceof Taxon) {
+		} else if (entity instanceof Taxon) {
             element = new TaxonDetailElement(this, parentElement, (Taxon) entity, removeListener, style);
-        } else if (entity instanceof DescriptionElementBase) {
-            // this is the special case for protologs, maybe we can do this
-            // differently when API improves
-            DescriptionElementBase descriptionElement = (DescriptionElementBase) entity;
-            if (descriptionElement.getFeature().equals(Feature.PROTOLOGUE())) {
+		} else if (entity instanceof DescriptionElementBase) {
+			// this is the special case for protologs, maybe we can do this
+			// differently when API improves
+			DescriptionElementBase descriptionElement = (DescriptionElementBase) entity;
+			if (descriptionElement.getFeature().equals(Feature.PROTOLOGUE())) {
                 element = new ProtologueElement(this, parentElement, descriptionElement, removeListener, style);
-            }
-        }
+			}
+		}
 
-        if (element == null) {
+		if (element == null) {
             AbstractUtility.errorDialog("No element for entity", this,
                     "Could not generate element for entity. Looks like the case is not handled already. Check implementation. Entity: "
-                            + entity, null);
-        }
+									+ entity, null);
 
-        else if (backgroundColor != null && !backgroundColor.isDisposed()) {
-            element.setPersistentBackground(backgroundColor);
-        }
+		}
 
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /**
-     * <p>
-     * Creates a selection element for the given type T.
-     * </p>
-     * <p>
-     * <strong>Selection elements not handled by this method:</strong>
-     * <ul>
+        else if (backgroundColor != null && !backgroundColor.isDisposed()) {
+			element.setPersistentBackground(backgroundColor);
+		}
+
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+
+	/**
+	 * <p>
+	 * Creates a selection element for the given type T.
+	 * </p>
+	 * <p>
+	 * 	<strong>Selection elements not handled by this method:</strong>
+	 * 	<ul>
      * <li>{@link TaxonNodeSelectionElement} see
      * {@link #createTaxonNodeSelectionElement(ConversationHolder, ICdmFormElement, String, TaxonNode, int, int)}
      * </li>
      * <li>{@link NomenclaturalAuthorTeamSelectionElement} see
      * {@link #createNomenclaturalAuthorTeamSelectionElement(ConversationHolder, ICdmFormElement, String, Team, int, int)}
      * </li>
-     * </ul>
-     * </p>
-     *
-     * @param clazz
+	 * 	</ul>	
+	 * </p>
+	 * 
+	 * @param clazz
      *            a {@link Class} object of the type that you want the selection
      *            element to handle
-     * @param parentElement
+	 * @param parentElement
      *            a {@link ICdmFormElement} object.
-     * @param labelString
-     *            a {@link String} object.
-     * @param selectionType
-     * @param selection
-     *            a {@link ICdmBase} object.
-     * @param style
-     *            a int.
-     * @param conversation
-     *            a {@link ConversationHolder} object.
+	 * @param labelString
+	 *            a {@link String} object.
+	 * @param selectionType
+	 * @param selection
+	 *            a {@link ICdmBase} object.
+	 * @param style
+	 *            a int.
+	 * @param conversation
+	 *            a {@link ConversationHolder} object.
      * @return a {@link EntitySelectionElement} object.
-     */
+	 */
     public <T extends ICdmBase> EntitySelectionElement<T> createSelectionElement(Class<T> clazz,
             ConversationHolder conversation, ICdmFormElement parentElement, String labelString, T selection, int mode,
             int style) {
         EntitySelectionElement<T> element = new EntitySelectionElement<T>(this, conversation, parentElement, clazz,
                 labelString, selection, mode, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+	
     public TaxonNodeSelectionElement createTaxonNodeSelectionElement(ConversationHolder conversation,
             ICdmFormElement parentElement, String labelString, TaxonNode selection, int mode, int style) {
         TaxonNodeSelectionElement element = new TaxonNodeSelectionElement(this, conversation, parentElement,
                 labelString, selection, mode, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    public NomenclaturalAuthorTeamSelectionElement createNomenclaturalAuthorTeamSelectionElement(
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+	
+	public NomenclaturalAuthorTeamSelectionElement createNomenclaturalAuthorTeamSelectionElement(
             ConversationHolder conversation, ICdmFormElement parentElement, String labelString, Team selection,
             int mode, int style) {
         NomenclaturalAuthorTeamSelectionElement element = new NomenclaturalAuthorTeamSelectionElement(this,
                 conversation, parentElement, labelString, selection, mode, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
-    /** {@inheritDoc} */
-    public LabelElement createLabel(ICdmFormElement parentElement, String text) {
-        LabelElement labelElement = new LabelElement(this, parentElement, text);
-        adapt(labelElement);
-        parentElement.addElement(labelElement);
-        return labelElement;
-    }
-
-    /**
-     * <p>
-     * Getter for the field <code>selectionProvider</code>.
-     * </p>
-     *
-     * @return a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
-     */
-    public ISelectionProvider getSelectionProvider() {
-        return selectionProvider;
-    }
-
-    /**
-     * <p>
-     * createDetailedDescriptionDetailElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param entity
-     *            a
-     *            {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase}
-     *            object.
-     * @param style
-     *            a int.
-     * @return a
-     *         {@link eu.etaxonomy.taxeditor.ui.section.description.detail.AbstractDetailedDescriptionDetailElement}
-     *         object.
-     */
-    public AbstractDetailedDescriptionDetailElement createDetailedDescriptionDetailElement(
+		adapt(element);
+		parentElement.addElement(element);
+		return element;
+	}
+	
+	
+	/** {@inheritDoc} */
+	public LabelElement createLabel(ICdmFormElement parentElement, String text) {
+		LabelElement labelElement = new LabelElement(this, parentElement, text);
+		adapt(labelElement);
+		parentElement.addElement(labelElement);
+		return labelElement;
+	}
+
+	/**
+	 * <p>
+	 * Getter for the field <code>selectionProvider</code>.
+	 * </p>
+	 * 
+	 * @return a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
+	 */
+	public ISelectionProvider getSelectionProvider() {
+		return selectionProvider;
+	}
+
+	/**
+	 * <p>
+	 * createDetailedDescriptionDetailElement
+	 * </p>
+	 * 
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param entity
+	 *            a
+	 *            {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 * @return a
+	 *         {@link eu.etaxonomy.taxeditor.ui.section.description.detail.AbstractDetailedDescriptionDetailElement}
+	 *         object.
+	 */
+	public AbstractDetailedDescriptionDetailElement createDetailedDescriptionDetailElement(
             ICdmFormElement parentElement, DescriptionElementBase entity, int style) {
-        AbstractDetailedDescriptionDetailElement detailedDescriptionElement = null;
+		AbstractDetailedDescriptionDetailElement detailedDescriptionElement = null;
 
-        if (entity instanceof CategoricalData) {
+		if (entity instanceof CategoricalData) {
             detailedDescriptionElement = new CategoricalDataDetailElement(this, parentElement,
                     (CategoricalData) entity, style);
-        } else if (entity instanceof CommonTaxonName) {
+		} else if (entity instanceof CommonTaxonName) {
             detailedDescriptionElement = new CommonNameDetailElement(this, parentElement, (CommonTaxonName) entity,
                     style);
-        } else if (entity instanceof Distribution) {
+		} else if (entity instanceof Distribution) {
             detailedDescriptionElement = new DistributionDetailElement(this, parentElement, (Distribution) entity,
                     style);
-        } else if (entity instanceof IndividualsAssociation) {
+		} else if (entity instanceof IndividualsAssociation) {
             detailedDescriptionElement = new IndividualsAssociationDetailElement(this, parentElement,
                     (IndividualsAssociation) entity, style);
-        } else if (entity instanceof QuantitativeData) {
+		} else if (entity instanceof QuantitativeData) {
             detailedDescriptionElement = new QuantitativeDataDetailElement(this, parentElement,
                     (QuantitativeData) entity, style);
-        } else if (entity instanceof TaxonInteraction) {
+		} else if (entity instanceof TaxonInteraction) {
             detailedDescriptionElement = new TaxonInteractionDetailElement(this, parentElement,
                     (TaxonInteraction) entity, style);
-        } else if (entity instanceof TextData) {
+		} else if (entity instanceof TextData) {
             detailedDescriptionElement = new TextDataDetailElement(this, parentElement, (TextData) entity, style);
-        } else {
+		} else {
             throw new IllegalStateException("There is no interface for the given description element");
-        }
-        adapt(detailedDescriptionElement);
-        parentElement.addElement(detailedDescriptionElement);
-        return detailedDescriptionElement;
-
-    }
-
-    /**
-     * Creates a styled text as a part of the form.
-     *
-     * @param parent
-     *            the text parent
-     * @param value
-     *            the text initial value
-     * @param style
-     *            the text style
-     * @return the text widget
-     */
-    public StyledText createStyledText(Composite parent, String value, int style) {
+		}
+		adapt(detailedDescriptionElement);
+		parentElement.addElement(detailedDescriptionElement);
+		return detailedDescriptionElement;
+
+	}
+
+	/**
+	 * Creates a styled text as a part of the form.
+	 * 
+	 * @param parent
+	 *            the text parent
+	 * @param value
+	 *            the text initial value
+	 * @param style
+	 *            the text style
+	 * @return the text widget
+	 */
+	public StyledText createStyledText(Composite parent, String value, int style) {
         StyledText text = new StyledText(parent, getBorderStyle() | style | getOrientation());
         if (value != null) {
-            text.setText(value);
+			text.setText(value);
         }
-        text.setForeground(getColors().getForeground());
-        text.setBackground(getColors().getBackground());
-        // text.addFocusListener(visibilityHandler);
-        return text;
-    }
+		text.setForeground(getColors().getForeground());
+		text.setBackground(getColors().getBackground());
+		// text.addFocusListener(visibilityHandler);
+		return text;
+	}
+
+
+
+
+
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java
index c54e04d03..992c3127d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java
@@ -16,6 +16,7 @@ import org.joda.time.Partial;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
+import eu.etaxonomy.cdm.strategy.parser.TimePeriodParser;
 
 /**
  * <p>
@@ -146,7 +147,7 @@ public class DateDetailSection extends AbstractFormSection<TimePeriod> {
 		} else if (eventSource == text_parseText) {
 			cursorPosition = ((Text) text_parseText.getMainControl())
 					.getCaretPosition();
-			setEntityInternally(TimePeriod.parseString(text_parseText.getText()));
+			setEntityInternally(TimePeriodParser.parseString(text_parseText.getText()));			
 		} else if (eventSource == text_freeText) {
 			getEntity().setFreeText(text_freeText.getText());
 		}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/GatheringEventUnitElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/GatheringEventUnitElement.java
new file mode 100644
index 000000000..5e1651d29
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/GatheringEventUnitElement.java
@@ -0,0 +1,110 @@
+// $Id$
+/**
+ * Copyright (C) 2007 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+
+package eu.etaxonomy.taxeditor.ui.element;
+
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.forms.widgets.Section;
+
+import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
+
+/**
+ * <p>
+ * GatheringEventUnitElement class.
+ * </p>
+ *
+ * @author c.mathew
+ * @created 23 Jul. 2013
+ * @version 1.0
+ */
+public class GatheringEventUnitElement extends AbstractCdmFormElement implements ISelectable {
+
+	private final Label label;
+	private final MinMaxTextSection section_minMaxText;
+
+	/**
+	 * <p>
+	 * Constructor for TimePeriodElement.
+	 * </p>
+	 *
+	 * @param style
+	 *            a int.
+	 * @param formFactory
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
+	 *            object.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param labelString
+	 *            a {@link java.lang.String} object.
+	 * @param timePeriod
+	 *            a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
+	 */
+	public GatheringEventUnitElement(CdmFormFactory formFactory,
+			ICdmFormElement parentElement,
+			String labelString,
+			DerivedUnitFacade gatheringEvent,
+			MinMaxTextSection.UnitType unitType,
+			final int style) {
+		super(formFactory, parentElement);
+
+		label = formFactory.createLabel(getLayoutComposite(), labelString);
+		addControl(label);
+
+		section_minMaxText = formFactory.createMinMaxTextSection(this,
+				unitType,
+				Section.TWISTIE);
+
+		addControl(section_minMaxText);
+
+		section_minMaxText.setEntity(gatheringEvent);
+
+		formFactory.addPropertyChangeListener(this);
+	}
+
+
+	/** {@inheritDoc} */
+	@Override
+	public void propertyChange(PropertyChangeEvent event) {
+		if (event == null) {
+			return;
+		}
+		Object eventSource = event.getSource();
+
+		if (getElements().contains(eventSource)) {
+			handleEvent(eventSource);
+		}
+	}
+
+	private void handleEvent(Object eventSource) {
+		if (eventSource == section_minMaxText) {
+			firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
+		}
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public void setBackground(Color color) {
+		label.setBackground(color);
+		section_minMaxText.setBackground(color);
+	}
+
+	@Override
+	public void setSelected(boolean selected) {
+		setBackground(selected ? SELECTED : getPersistentBackground());
+	}
+
+	public void setLabel(String string) {
+		label.setText(string);
+	}
+}
+
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEntityElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEntityElement.java
index 60591e40d..212b18d3f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEntityElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEntityElement.java
@@ -11,6 +11,7 @@
 package eu.etaxonomy.taxeditor.ui.element;
 
 
+
 /**
  * Any composite that represent a cdm entity should implement
  * this interface. Selection of CdmEntity data will rely on this
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java
new file mode 100644
index 000000000..94b1a8f98
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java
@@ -0,0 +1,270 @@
+// $Id$
+/**
+ * Copyright (C) 2007 EDIT
+ * European Distributed Institute of Taxonomy 
+ * http://www.e-taxonomy.eu
+ * 
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+
+package eu.etaxonomy.taxeditor.ui.element;
+
+import org.eclipse.jface.util.PropertyChangeEvent;
+
+import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
+
+/**
+ * <p>
+ * MinMaxTextSection class.
+ * </p>
+ * 
+ * @author c.mathew
+ * @created 23 Jul 2013
+ * @version 1.0
+ */
+public class MinMaxTextSection extends AbstractFormSection<DerivedUnitFacade> {
+
+	private final TextWithLabelElement text_freeText;
+	private final NumberWithLabelElement text_minVal;
+	private final NumberWithLabelElement text_maxVal;
+	private int cursorPosition;
+	
+	// unit types handled by this section
+	public enum UnitType {
+		ELEVATION,
+		DIST_TO_GROUND,
+		DIST_TO_WATER
+	}
+
+	private UnitType unitType = UnitType.ELEVATION;
+
+	/**
+	 * <p>
+	 * Constructor for DateDetailSection.
+	 * </p>
+	 * 
+	 * @param formFactory
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
+	 *            object.
+	 * @param parentElement
+	 *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
+	 *            object.
+	 * @param style
+	 *            a int.
+	 */
+	protected MinMaxTextSection(CdmFormFactory formFactory,
+			ICdmFormElement parentElement, UnitType unitType, int style) {
+		super(formFactory, parentElement, style);
+		this.unitType = unitType;
+		getLayoutComposite().setLayout(LayoutConstants.LAYOUT(2, false));
+
+		text_minVal = formFactory.createNumberTextWithLabelElement(this,
+				"Min : ", getMinimum(), style);
+		
+		text_maxVal = formFactory.createNumberTextWithLabelElement(this,
+				"Max : ", getMaximum(), style);
+	
+		text_freeText = formFactory.createTextWithLabelElement(this,
+				"Freetext : ", getFreetext(), style);
+
+		formFactory.addPropertyChangeListener(this);
+	}
+
+	/**
+	 * <p>
+	 * Setter for the field <code>timePeriod</code>.
+	 * </p>
+	 * 
+	 * @param timePeriod
+	 *            a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
+	 */
+	@Override
+	public void setEntity(DerivedUnitFacade gatheringEvent) {
+		super.setEntity(gatheringEvent);
+		updateValues();
+	}
+
+	private void updateValues() {
+		if(getEntity() != null) {
+			switch(unitType) {
+			case ELEVATION:
+				if(getEntity().getAbsoluteElevation() != null) {
+					text_minVal.setNumber(getEntity().getAbsoluteElevation());
+				}
+				if(getEntity().getAbsoluteElevationMaximum() != null) {
+					text_maxVal.setNumber(getEntity().getAbsoluteElevation());
+				}
+				if(getEntity().getAbsoluteElevationText() != null) {
+					text_freeText.setText(getEntity().getAbsoluteElevationText());
+				}
+				break;
+			case DIST_TO_GROUND:
+				if(getEntity().getDistanceToGround() != null) {
+					text_minVal.setNumber(getEntity().getDistanceToGround());
+				}
+				if(getEntity().getDistanceToGroundMax() != null) {
+					text_maxVal.setNumber(getEntity().getDistanceToGroundMax());
+				}
+				if(getEntity().getDistanceToGroundText() != null) {
+					text_freeText.setText(getEntity().getDistanceToGroundText());
+				}
+				break;			
+			case DIST_TO_WATER:
+				if(getEntity().getDistanceToWaterSurface() != null) {
+					text_minVal.setNumber(getEntity().getDistanceToWaterSurface());
+				}
+				if(getEntity().getDistanceToWaterSurfaceMax() != null) {
+					text_maxVal.setNumber(getEntity().getDistanceToWaterSurfaceMax());
+				}
+				if(getEntity().getDistanceToWaterSurfaceText() != null) {
+					text_freeText.setText(getEntity().getDistanceToWaterSurfaceText());
+				}
+				break;		
+			default:
+				break;
+			}
+
+		}
+	}
+	/** {@inheritDoc} */
+	@Override
+	public void propertyChange(PropertyChangeEvent event) {
+		if (event == null) {
+			return;
+		}
+		Object eventSource = event.getSource();
+
+		if (getElements().contains(eventSource)) {
+			if (event instanceof CdmPropertyChangeEvent) {
+				if (((CdmPropertyChangeEvent) event).hasException()) {
+					handleException((CdmPropertyChangeEvent) event);
+					return;
+				}
+			}
+			handleEvent(eventSource);
+		}
+	}
+
+	/**
+	 * @param event
+	 */
+	private void handleException(CdmPropertyChangeEvent event) {
+		firePropertyChangeEvent(new CdmPropertyChangeEvent(this,
+				event.getException()));
+	}
+
+	private void handleEvent(Object eventSource) {
+		if (eventSource == text_minVal) {			
+			updateMinimum();
+		} else if (eventSource == text_maxVal) {
+			updateMaximum();
+		} else if (eventSource == text_freeText) {
+			updateFreetext();		
+		} 
+		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
+	}
+
+
+	
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see eu.etaxonomy.taxeditor.forms.AbstractFormSection#dispose()
+	 */
+	/** {@inheritDoc} */
+	@Override
+	public void dispose() {
+		formFactory.removePropertyChangeListener(this);
+		super.dispose();
+	}
+	
+	private void updateMinimum() {
+		switch(unitType) {
+		case ELEVATION:
+			getEntity().setAbsoluteElevation(text_minVal.getInteger());
+			break;
+		case DIST_TO_GROUND:
+			getEntity().setDistanceToGround(text_minVal.getDouble());
+			break;			
+		case DIST_TO_WATER:
+			getEntity().setDistanceToWaterSurface(text_minVal.getDouble());
+			break;				
+		}
+	}
+	
+	private Number getMinimum() {
+		if(getEntity() == null) {
+			return null;
+		}
+		switch(unitType) {
+		case ELEVATION:
+			return getEntity().getAbsoluteElevation();			
+		case DIST_TO_GROUND:
+			return getEntity().getDistanceToGround();			
+		case DIST_TO_WATER:
+			return getEntity().getDistanceToWaterSurface();					
+		}
+		return null;
+	}
+	
+	private void updateMaximum() {
+		switch(unitType) {
+		case ELEVATION:
+			getEntity().setAbsoluteElevationMax(text_maxVal.getInteger());
+			break;
+		case DIST_TO_GROUND:
+			getEntity().setDistanceToGroundMax(text_maxVal.getDouble());
+			break;			
+		case DIST_TO_WATER:
+			getEntity().setDistanceToWaterSurfaceMax(text_maxVal.getDouble());
+			break;				
+		}
+	}
+	
+	private Number getMaximum() {
+		if(getEntity() == null) {
+			return null;
+		}
+		switch(unitType) {
+		case ELEVATION:
+			return getEntity().getAbsoluteElevationMaximum();			
+		case DIST_TO_GROUND:
+			return getEntity().getDistanceToGroundMax();			
+		case DIST_TO_WATER:
+			return getEntity().getDistanceToWaterSurfaceMax();					
+		}
+		return null;
+	}
+	
+	private void updateFreetext() {
+		switch(unitType) {
+		case ELEVATION:
+			getEntity().setAbsoluteElevationText(text_freeText.getText());
+			break;
+		case DIST_TO_GROUND:
+			getEntity().setDistanceToGroundText(text_freeText.getText());
+			break;			
+		case DIST_TO_WATER:
+			getEntity().setDistanceToWaterSurfaceText(text_freeText.getText());
+			break;				
+		}
+	}	
+	
+	private String getFreetext() {
+		if(getEntity() == null) {
+			return null;
+		}
+		switch(unitType) {
+		case ELEVATION:
+			return getEntity().getAbsoluteElevationText();			
+		case DIST_TO_GROUND:
+			return getEntity().getDistanceToGroundText();			
+		case DIST_TO_WATER:
+			return getEntity().getDistanceToWaterSurfaceText();					
+		}
+		return null;
+	}
+
+}
+
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
index eab43db67..d52c54140 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
@@ -37,47 +37,23 @@ public class NumberWithLabelElement extends TextWithLabelElement {
 	 * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
 	 * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
 	 * @param labelString a {@link java.lang.String} object.
-	 * @param initialInteger a {@link java.lang.Integer} object.
+	 * @param initialNumber a {@link java.lang.Number} object.
 	 * @param style a int.
 	 */
 	public NumberWithLabelElement(CdmFormFactory toolkit,
 			ICdmFormElement parentElement, String labelString,
-			Integer initialInteger, int style) {
+			Number initialNumber, int style) {
 		super(toolkit, parentElement, labelString, null, null, style);
-		setInteger(initialInteger);
+		setNumber(initialNumber);
 	}
 	
-	/**
-	 * <p>Constructor for NumberWithLabelElement.</p>
-	 *
-	 * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
-	 * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
-	 * @param labelString a {@link java.lang.String} object.
-	 * @param initialFloat a {@link java.lang.Float} object.
-	 * @param style a int.
-	 */
-	public NumberWithLabelElement(CdmFormFactory toolkit,
-			ICdmFormElement parentElement, String labelString,
-			Float initialFloat, int style) {
-		super(toolkit, parentElement, labelString, null, null, style);
-		setFloat(initialFloat);
-	}
 	
 	/**
-	 * <p>setInteger</p>
+	 * <p>setNumber</p>
 	 *
-	 * @param number a {@link java.lang.Integer} object.
+	 * @param number a {@link java.lang.Number} object.
 	 */
-	public void setInteger(Integer number) {
-		super.setText(getStringRepresentation(number));
-	}
-	
-	/**
-	 * <p>setFloat</p>
-	 *
-	 * @param number a {@link java.lang.Float} object.
-	 */
-	public void setFloat(Float number) {
+	public void setNumber(Number number) {
 		super.setText(getStringRepresentation(number));
 	}
 	
@@ -101,6 +77,16 @@ public class NumberWithLabelElement extends TextWithLabelElement {
 		return new Float(text);
 	}
 	
+	/**
+	 * <p>getDouble</p>
+	 *
+	 * @return a {@link java.lang.Float} object.
+	 */
+	public Double getDouble(){
+		String text = super.getText();
+		return new Double(text);
+	}
+	
 	private String getStringRepresentation(Object number){
 		if(number != null){
 			return number.toString();
@@ -131,6 +117,7 @@ public class NumberWithLabelElement extends TextWithLabelElement {
 		}catch(NumberFormatException e){
 			text.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
 			firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
+			exception = e;
 			return;
 		}
 		
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
index efcc8541c..72b26fcfc 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java
@@ -49,13 +49,13 @@ public class PartialElement extends AbstractCdmFormElement implements ISelectabl
 		label = formFactory.createLabel(getLayoutComposite(), labelString);
 		addControl(label);
 		
-		number_year = formFactory.createIntegerTextWithLabelElement(this, "Year", null, style);
+		number_year = formFactory.createNumberTextWithLabelElement(this, "Year", null, style);
 		number_year.setLimits(4, -9999, 9999);
 		
-		number_month = formFactory.createIntegerTextWithLabelElement(this, "Month", null, style);		
+		number_month = formFactory.createNumberTextWithLabelElement(this, "Month", null, style);		
 		number_month.setLimits(2, 1, 12);
 		
-		number_day = formFactory.createIntegerTextWithLabelElement(this, "Day", null, style);
+		number_day = formFactory.createNumberTextWithLabelElement(this, "Day", null, style);
 		number_day.setLimits(2, 1, 31);
 		
 		
@@ -71,9 +71,9 @@ public class PartialElement extends AbstractCdmFormElement implements ISelectabl
 		this.partial = partial;
 		
 		if(partial != null){
-			number_day.setInteger(TimePeriod.getPartialValue(partial, TimePeriod.DAY_TYPE));
-			number_month.setInteger(TimePeriod.getPartialValue(partial, TimePeriod.MONTH_TYPE));
-			number_year.setInteger(TimePeriod.getPartialValue(partial, TimePeriod.YEAR_TYPE));
+			number_day.setNumber(TimePeriod.getPartialValue(partial, TimePeriod.DAY_TYPE));
+			number_month.setNumber(TimePeriod.getPartialValue(partial, TimePeriod.MONTH_TYPE));
+			number_year.setNumber(TimePeriod.getPartialValue(partial, TimePeriod.YEAR_TYPE));
 		}
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
index 6ed881b07..c6fbd056f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java
@@ -74,7 +74,7 @@ public class PointElement extends AbstractCdmFormElement implements
 		text_longitudeParsed = formFactory.createTextWithLabelElement(
 				formElement, "", null, style);
 		text_longitudeParsed.setEnabled(false);
-		number_errorRadius = formFactory.createIntegerTextWithLabelElement(
+		number_errorRadius = formFactory.createNumberTextWithLabelElement(
 				formElement, "Error Radius (m)", null, style);
 		combo_referenceSystem = formFactory
 				.createTermComboElement(ReferenceSystem.class,
@@ -179,7 +179,7 @@ public class PointElement extends AbstractCdmFormElement implements
 			text_latitudeParsed.setText(latitude);
 			text_longitude.setText(longitude);
 			text_longitudeParsed.setText(longitude);
-			number_errorRadius.setInteger(point.getErrorRadius());
+			number_errorRadius.setNumber(point.getErrorRadius());
 			combo_referenceSystem.setSelection(point.getReferenceSystem());
 		}
 	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index 510aef975..a2555b03d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.parser.ParseHandler;
@@ -36,7 +36,7 @@ import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
  * @created Sep 27, 2010
  * @version 1.0
  */
-public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode> {
+public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITaxonTreeNode> {
 
 	private EntitySelectionElement<Classification> selection_classification;
 
@@ -44,7 +44,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
 
 	private TaxonNodeSelectionElement selection_parentTaxonNode;
 
-	private ITreeNode parentTreeNode;
+	private ITaxonTreeNode parentTreeNode;
 
 	private EntitySelectionElement<Taxon> selection_reuseExistingTaxon;
 
@@ -88,7 +88,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
 	/** {@inheritDoc} */
 	@Override
 	protected void createControls(ICdmFormElement formElement,
-			ITreeNode entity, int style) {
+	        ITaxonTreeNode entity, int style) {
 		selection_classification = formFactory
 				.createSelectionElement(Classification.class,
 						getConversationHolder(), formElement, "Classification",
@@ -181,9 +181,9 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
 	 * Getter for the field <code>parentTreeNode</code>.
 	 * </p>
 	 * 
-	 * @return a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+	 * @return a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
 	 */
-	public ITreeNode getParentTreeNode() {
+	public ITaxonTreeNode getParentTreeNode() {
 		return parentTreeNode;
 	}
 
@@ -211,7 +211,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
 	 * @param parentTreeNode
 	 *            the parentTreeNode to set
 	 */
-	private void setParentTreeNode(ITreeNode parentTreeNode) {
+	private void setParentTreeNode(ITaxonTreeNode parentTreeNode) {
 		this.parentTreeNode = parentTreeNode;
 
 		if (parentTreeNode instanceof Classification) {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
index 4f261d545..d78900f3b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
@@ -13,7 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.classification;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -28,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
  * @created Sep 15, 2009
  * @version 1.0
  */
-public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITreeNode> {
+public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITaxonTreeNode> {
 
 	/**
 	 * <p>
@@ -42,10 +42,10 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITreeNode>
 	 *            a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
 	 *            object.
 	 * @param entity
-	 *            a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+	 *            a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
 	 */
 	public TaxonNodeWizardPage(CdmFormFactory formFactory,
-			ConversationHolder conversation, ITreeNode entity) {
+			ConversationHolder conversation, ITaxonTreeNode entity) {
 		super(formFactory, conversation, entity);
 		setTitle("Create a new Taxon");
 	}
@@ -116,9 +116,9 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITreeNode>
 	 * Getter for the field <code>parentTreeNode</code>.
 	 * </p>
 	 *
-	 * @return a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+	 * @return a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
 	 */
-	public ITreeNode getParentTreeNode() {
+	public ITaxonTreeNode getParentTreeNode() {
 		return ((TaxonNodeDetailElement) getDetailElement())
 				.getParentTreeNode();
 	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java
index f05ea9dd5..d1ccc47b6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java
@@ -12,7 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.eclipse.swt.events.SelectionListener;
 
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 public class DerivedUnitElement extends
 		AbstractEntityCollectionElement<SpecimenOrObservationBase> {
 
-	private EntitySelectionElement<DerivedUnitBase> selection_derivedUnit;
+	private EntitySelectionElement<DerivedUnit> selection_derivedUnit;
 
 	/**
 	 * <p>
@@ -71,7 +71,7 @@ public class DerivedUnitElement extends
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
 		selection_derivedUnit = formFactory.createSelectionElement(
-				DerivedUnitBase.class, getConversationHolder(), element,
+				DerivedUnit.class, getConversationHolder(), element,
 				"Specimen", null, EntitySelectionElement.SELECTABLE | EntitySelectionElement.EDITABLE,
 				style);
 	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
index 374fd04b7..112927630 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
@@ -10,11 +10,13 @@
 
 package eu.etaxonomy.taxeditor.ui.section.description;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.DerivedUnitSelectionDialog;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -48,26 +50,32 @@ public class DescribedSpecimenSection extends AbstractEntityCollectionSection<Ta
 	@Override
 	public Collection<SpecimenOrObservationBase> getCollection(
 			TaxonDescription entity) {
-		return entity.getDescribedSpecimenOrObservations();
+		//FIXME:This class is not really an entity collection section, and should be moved 
+		// to a single entity section, but one with the possibility of launching a wizard
+		List<SpecimenOrObservationBase> collection = new ArrayList<SpecimenOrObservationBase>();
+		if(entity.getDescribedSpecimenOrObservation() != null) {
+			collection.add(entity.getDescribedSpecimenOrObservation());	
+		}		
+		return collection;
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public SpecimenOrObservationBase createNewElement() {
-		DerivedUnitBase selection = DerivedUnitSelectionDialog.select(getShell(), getConversationHolder(), null);
+		DerivedUnit selection = DerivedUnitSelectionDialog.select(getShell(), getConversationHolder(), null);		
 		return selection;
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public void addElement(SpecimenOrObservationBase element) {
-		getEntity().addDescribedSpecimenOrObservation(element);
+		getEntity().setDescribedSpecimenOrObservation(element);
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public void removeElement(SpecimenOrObservationBase element) {
-		getEntity().removeDescribedSpecimenOrObservation(element);
+		getEntity().setDescribedSpecimenOrObservation(null);		
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java
index 709d02e7c..23f8e3f6d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java
@@ -65,7 +65,9 @@ public class DescriptionDetailElement extends AbstractCdmDetailElement<Descripti
 		}
 		else if(eventSource == selection_featureTree){
 			FeatureTree featureTree = selection_featureTree.getSelection();
-			getEntity().setDescriptiveSystem(featureTree.getDistinctFeatures());
+			//FIXME:3.3MC---- 
+			//getEntity().setDescriptiveSystem(featureTree.getDistinctFeatures());
+			//FIXME:3.3MC----
 		}
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java
index b74c7bfe5..aff1fbea8 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java
@@ -13,7 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
 
-import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
+import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -99,6 +99,7 @@ public class DescriptionElementSourceElement extends
 		text_referenceDetail.setText(entity.getCitationMicroReference());
 		text_originaleNameString.setText(entity.getOriginalNameString());
 		selection_name.setEntity(entity.getNameUsedInSource());
+		combo_origsourcetype.setSelection(entity.getType());
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java
index b48b44aca..13da78115 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java
@@ -7,8 +7,11 @@ import java.util.Collection;
 
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
+import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
+import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.taxeditor.ui.dialog.selection.OriginalSourceTypeSelectionDialog;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -37,7 +40,7 @@ public class DescriptionElementSourceSection extends AbstractEntityCollectionSec
 	/** {@inheritDoc} */
 	@Override
 	public DescriptionElementSource createNewElement() {
-		return DescriptionElementSource.NewInstance();
+		return DescriptionElementSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource);
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceSection.java
index 6e7e73d32..7d3b5d613 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceSection.java
@@ -14,7 +14,9 @@ import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
+import eu.etaxonomy.taxeditor.ui.dialog.selection.OriginalSourceTypeSelectionDialog;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -53,7 +55,12 @@ public class DescriptionSourceSection extends
 	/** {@inheritDoc} */
 	@Override
 	public IdentifiableSource createNewElement() {
-		return IdentifiableSource.NewInstance();
+		OriginalSourceType ost = OriginalSourceTypeSelectionDialog.select(getShell(), getConversationHolder());	
+		if(ost != null) {
+			return IdentifiableSource.NewInstance(ost);
+		} else {
+			return null;
+		}
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
index 452d50bcb..efcef95e0 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
@@ -12,7 +12,8 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.eclipse.swt.events.SelectionListener;
 
-import eu.etaxonomy.cdm.model.description.Modifier;
+
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -26,9 +27,9 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
  * @created Sep 15, 2010
  * @version 1.0
  */
-public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
+public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm> {
 	
-	private TermComboElement<Modifier> combo_modifier;
+	private TermComboElement<DefinedTerm> combo_modifier;
 
 	/**
 	 * <p>Constructor for ModifierElement.</p>
@@ -40,14 +41,14 @@ public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
 	 * @param style a int.
 	 */
 	public ModifierElement(CdmFormFactory formFactory,
-			AbstractFormSection section, Modifier entity,
+			AbstractFormSection section, DefinedTerm entity,
 			SelectionListener removeListener, int style) {
 		super(formFactory, section, entity, removeListener, null, style);
 	}
 	
 	/** {@inheritDoc} */
 	@Override
-	public void setEntity(Modifier entity) {
+	public void setEntity(DefinedTerm entity) {
 		this.entity = entity;
 		combo_modifier.setSelection(entity);
 	}
@@ -55,7 +56,7 @@ public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
 	/** {@inheritDoc} */
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
-		combo_modifier = formFactory.createTermComboElement(Modifier.class, element, "Modifier", getEntity(), style);
+		combo_modifier = formFactory.createTermComboElement(DefinedTerm.class, element, "Modifier", getEntity(), style);
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java
index 3025ad0b3..686da6260 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java
@@ -13,8 +13,9 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.IModifiable;
-import eu.etaxonomy.cdm.model.description.Modifier;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -26,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
  * @created Sep 15, 2010
  * @version 1.0
  */
-public class ModifierSection extends AbstractEntityCollectionSection<IModifiable, Modifier> {
+public class ModifierSection extends AbstractEntityCollectionSection<IModifiable, DefinedTerm> {
 
 	/**
 	 * <p>Constructor for ModifierSection.</p>
@@ -44,25 +45,25 @@ public class ModifierSection extends AbstractEntityCollectionSection<IModifiable
 	
 	/** {@inheritDoc} */
 	@Override
-	public Collection<Modifier> getCollection(IModifiable entity) {
+	public Collection<DefinedTerm> getCollection(IModifiable entity) {
 		return entity.getModifiers();
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public Modifier createNewElement() {
-		return Modifier.NewInstance();
+	public DefinedTerm createNewElement() {		
+		return DefinedTerm.NewInstance(TermType.Modifier,"","Untitled","");				
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public void addElement(Modifier element) {
+	public void addElement(DefinedTerm element) {
 		getEntity().addModifier(element);
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public void removeElement(Modifier element) {
+	public void removeElement(DefinedTerm element) {
 		getEntity().removeModifier(element);
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
index 448b567c1..db8e4ea2b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
@@ -12,7 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.eclipse.swt.events.SelectionListener;
 
-import eu.etaxonomy.cdm.model.description.Scope;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -26,9 +26,9 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
  * @created Mar 18, 2010
  * @version 1.0
  */
-public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
+public class ScopeElement extends AbstractEntityCollectionElement<DefinedTerm> {
 	
-	private TermComboElement<Scope> combo_scope;
+	private TermComboElement<DefinedTerm> combo_scope;
 
 	/**
 	 * <p>Constructor for ScopeElement.</p>
@@ -40,14 +40,14 @@ public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
 	 * @param style a int.
 	 */
 	public ScopeElement(CdmFormFactory cdmFormFactory,
-			AbstractFormSection section, Scope element,
+			AbstractFormSection section, DefinedTerm element,
 			SelectionListener removeListener, int style) {
 		super(cdmFormFactory, section, element, removeListener, null, style);
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public void setEntity(Scope entity) {
+	public void setEntity(DefinedTerm entity) {
 		this.entity = entity;
 		combo_scope.setSelection(entity);
 	}
@@ -55,7 +55,7 @@ public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
 	/** {@inheritDoc} */
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
-		combo_scope = formFactory.createTermComboElement(Scope.class, element, "Scope", null, style);
+		combo_scope = formFactory.createTermComboElement(DefinedTerm.class, element, "Scope", null, style);
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
index 04038711c..271687dea 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
@@ -13,7 +13,8 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.description.Scope;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -26,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
  * @created Mar 18, 2010
  * @version 1.0
  */
-public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescription, Scope> {
+public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescription, DefinedTerm> {
 
 	/**
 	 * <p>Constructor for ScopeSection.</p>
@@ -42,19 +43,19 @@ public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescripti
 	
 	/** {@inheritDoc} */
 	@Override
-	public void addElement(Scope element) {
+	public void addElement(DefinedTerm element) {
 		getEntity().addScope(element);
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public Scope createNewElement() {
-		return Scope.NewInstance();
+	public DefinedTerm createNewElement() {		
+		return DefinedTerm.NewInstance(TermType.Scope,"","Untitled","");					
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public Collection<Scope> getCollection(TaxonDescription entity) {
+	public Collection<DefinedTerm> getCollection(TaxonDescription entity) {
 		return entity.getScopes();
 	}
 
@@ -72,7 +73,7 @@ public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescripti
 
 	/** {@inheritDoc} */
 	@Override
-	public void removeElement(Scope element) {
+	public void removeElement(DefinedTerm element) {
 		getEntity().removeScope(element);
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
index 07ea14414..71a182699 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
@@ -45,7 +45,7 @@ public class StateDataSection extends AbstractEntityCollectionSection<Categorica
 	/** {@inheritDoc} */
 	@Override
 	public Collection<StateData> getCollection(CategoricalData entity) {
-		return entity.getStates();
+		return entity.getStateData();
 	}
 
 	/** {@inheritDoc} */
@@ -57,13 +57,13 @@ public class StateDataSection extends AbstractEntityCollectionSection<Categorica
 	/** {@inheritDoc} */
 	@Override
 	public void addElement(StateData element) {
-		getEntity().addState(element);
+		getEntity().addStateData(element);
 	}
 
 	/** {@inheritDoc} */
 	@Override
 	public void removeElement(StateData element) {
-		getEntity().removeState(element);
+		getEntity().removeStateData(element);
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
index ed7f08cd0..012b60180 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
@@ -56,7 +56,7 @@ public class StatisticalMeasurementValueElement extends
 	@Override
 	public void setEntity(StatisticalMeasurementValue entity) {
 		this.entity = entity;
-		number_value.setFloat(entity.getValue());
+		number_value.setNumber(entity.getValue());
 		combo_type.setSelection(entity.getType());
 		section_modifiers.setEntity(entity);
 	}
@@ -64,7 +64,7 @@ public class StatisticalMeasurementValueElement extends
 	/** {@inheritDoc} */
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
-		number_value = formFactory.createFloatTextWithLabelElement(element, "Value", 0, style);
+		number_value = formFactory.createNumberTextWithLabelElement(element, "Value", 0, style);
 		combo_type = formFactory.createTermComboElement(StatisticalMeasure.class, element, "Statistical Measure", null, style);
 		section_modifiers = formFactory.createModifierSection(getConversationHolder(), element, ExpandableComposite.TWISTIE);
 		section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
index 9fd82032e..0a3090c48 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
@@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -36,7 +36,7 @@ public class IndividualsAssociationDetailElement extends
 		AbstractDetailedDescriptionDetailElement<IndividualsAssociation> {
 
 	private TextWithLabelElement text_description;
-	private EntitySelectionElement<DerivedUnitBase> selection_derivedUnit;
+	private EntitySelectionElement<DerivedUnit> selection_derivedUnit;
 
 	/**
 	 * <p>
@@ -67,9 +67,9 @@ public class IndividualsAssociationDetailElement extends
 	protected void createControls(ICdmFormElement formElement,
 			IndividualsAssociation entity, int style) {
 		selection_derivedUnit = formFactory
-				.createSelectionElement(DerivedUnitBase.class,
+				.createSelectionElement(DerivedUnit.class,
 						getConversationHolder(), formElement, "Unit",
-						CdmBase.deproxy(entity.getAssociatedSpecimenOrObservation(),DerivedUnitBase.class),
+						CdmBase.deproxy(entity.getAssociatedSpecimenOrObservation(),DerivedUnit.class),
 						EntitySelectionElement.ALL, style);
 
 		text_description = formFactory.createMultilineTextWithLabel(
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
index c21c24900..e5627d045 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
@@ -43,7 +43,7 @@ public class PolytomousKeyNodeDetailElement extends
 			PolytomousKeyNode entity, int style) {
 		if (!entity.isLeaf()) {
 			NumberWithLabelElement number_nodeNumber = formFactory
-					.createIntegerTextWithLabelElement(formElement,
+					.createNumberTextWithLabelElement(formElement,
 							"Node Number", entity.getNodeNumber(), style);
 			number_nodeNumber.setEnabled(false);
 		}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
index dcc723ef6..a0c12f1ae 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
@@ -6,8 +6,9 @@ package eu.etaxonomy.taxeditor.ui.section.key;
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.cdm.model.description.Scope;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -16,7 +17,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
  * @author n.hoffmann
  *
  */
-public class ScopeRestrictionSection extends AbstractEntityCollectionSection<PolytomousKey, Scope> {
+public class ScopeRestrictionSection extends AbstractEntityCollectionSection<PolytomousKey, DefinedTerm> {
 
 	public ScopeRestrictionSection(CdmFormFactory formFactory,
 			ConversationHolder conversation, ICdmFormElement parentElement, int style) {
@@ -24,22 +25,23 @@ public class ScopeRestrictionSection extends AbstractEntityCollectionSection<Pol
 	}
 
 	@Override
-	public Collection<Scope> getCollection(PolytomousKey entity) {
+	public Collection<DefinedTerm> getCollection(PolytomousKey entity) {
 		return entity.getScopeRestrictions();
 	}
 
 	@Override
-	public Scope createNewElement() {
-		return Scope.NewInstance();
+	public DefinedTerm createNewElement() {		
+		return DefinedTerm.NewInstance(TermType.Scope,"","Untitled","");
+			
 	}
 
 	@Override
-	public void addElement(Scope element) {
+	public void addElement(DefinedTerm element) {
 		getEntity().addScopeRestriction(element);
 	}
 
 	@Override
-	public void removeElement(Scope element) {
+	public void removeElement(DefinedTerm element) {
 		getEntity().removeScopeRestriction(element);
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
index 6d790a5ef..098620fd7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
@@ -72,9 +72,9 @@ public class ImageFileElement extends MediaRepresentationPartElement<ImageFile>
 	public void createControls(ICdmFormElement formElement, int style) {
 		super.createControls(formElement, style);
 		
-		text_height = formFactory.createIntegerTextWithLabelElement(formElement, "Height", null, style);
+		text_height = formFactory.createNumberTextWithLabelElement(formElement, "Height", null, style);
 		text_height.setEnabled(false);
-		text_width = formFactory.createIntegerTextWithLabelElement(formElement, "Width", null, style);
+		text_width = formFactory.createNumberTextWithLabelElement(formElement, "Width", null, style);
 		text_width.setEnabled(false);
 		element_image = formFactory.createImageElement(formElement, null, style);
 		element_keyValue = formFactory.createKeyValueViewerElement(formElement, "Key", "Value", null);
@@ -84,8 +84,8 @@ public class ImageFileElement extends MediaRepresentationPartElement<ImageFile>
 	@Override
 	public void setEntity(ImageFile entity) {
 		super.setEntity(entity);
-		text_height.setInteger(entity.getHeight());
-		text_width.setInteger(entity.getWidth());
+		text_height.setNumber(entity.getHeight());
+		text_width.setNumber(entity.getWidth());
 		try {
 			loadImage(entity.getUri(), false);		
 		} catch (Exception e) {
@@ -113,10 +113,10 @@ public class ImageFileElement extends MediaRepresentationPartElement<ImageFile>
 			// But then, I don't think we will handle such large files in the near future
 			getEntity().setSize((int) imageInfo.getLength());
 			
-			text_height.setInteger(imageInfo.getHeight());
+			text_height.setNumber(imageInfo.getHeight());
 			getEntity().setHeight(imageInfo.getHeight());
 				
-			text_width.setInteger(imageInfo.getWidth());
+			text_width.setNumber(imageInfo.getWidth());
 			getEntity().setWidth(imageInfo.getWidth());
 		}
 		
@@ -152,8 +152,8 @@ public class ImageFileElement extends MediaRepresentationPartElement<ImageFile>
 	protected void handleException(Exception e) {
 		super.handleException(e);
 		element_image.unloadImage(postRunnable);
-		text_height.setInteger(0);
-		text_width.setInteger(0);
+		text_height.setNumber(0);
+		text_width.setNumber(0);
 		
 		element_image.loadImage(new Runnable(){
 			public void run() {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartElement.java
index 45d44c507..a5ef67341 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartElement.java
@@ -61,7 +61,7 @@ public class MediaRepresentationPartElement<T extends MediaRepresentationPart> e
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
 		text_uri = formFactory.createTextWithLabelElement(element, "URI", null, style);
-		text_size = formFactory.createIntegerTextWithLabelElement(element, "Size", null, style);
+		text_size = formFactory.createNumberTextWithLabelElement(element, "Size", null, style);
 		text_size.setEnabled(false);
 		
 		element_messages = formFactory.createLabel(element, "");
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index f628e9e26..0b4d91728 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -123,7 +123,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
 		NomenclaturalCode code = nonViralName.getNomenclaturalCode();
 		if (code != null){
 			switch(nonViralName.getNomenclaturalCode()){
-			case ICBN:
+			case ICNAFP :
 				createBotanicalNameParts(formElement, nonViralName, style);
 				break;
 			case ICZN:
@@ -141,8 +141,8 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
 	private void createZoologicalNameParts(ICdmFormElement formElement, NonViralName nonViralName, int style){
 		ZoologicalName zoologicalName = (ZoologicalName) nonViralName;
 		text_breed = formFactory.createTextWithLabelElement(formElement, "Breed", zoologicalName.getBreed(), style);
-		text_publicationYear = formFactory.createIntegerTextWithLabelElement(formElement, "Publication Year", zoologicalName.getPublicationYear(), style);
-		text_originalPublicationYear = formFactory.createIntegerTextWithLabelElement(formElement, "Orig. Publication Year", zoologicalName.getOriginalPublicationYear(), style);
+		text_publicationYear = formFactory.createNumberTextWithLabelElement(formElement, "Publication Year", zoologicalName.getPublicationYear(), style);
+		text_originalPublicationYear = formFactory.createNumberTextWithLabelElement(formElement, "Orig. Publication Year", zoologicalName.getOriginalPublicationYear(), style);
 	}
 	
 	private void createGenusOrUninomialControls(ICdmFormElement element, NonViralName nonViralName, int style){		
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
index 1fd7f9a17..1376e0ba6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
@@ -15,8 +15,8 @@ import org.eclipse.swt.events.SelectionListener;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -37,7 +37,7 @@ public class SpecimenTypeDesignationElement extends
 		AbstractTypeDesignationElement<SpecimenTypeDesignation> {
 
 	private TermComboElement<SpecimenTypeDesignationStatus> combo_typeStatus;
-	private EntitySelectionElement<DerivedUnitBase> selection_typeSpecimen;
+	private EntitySelectionElement<DerivedUnit> selection_typeSpecimen;
 	private TextWithLabelElement text_specimenTypeText;
 
 	/**
@@ -69,7 +69,7 @@ public class SpecimenTypeDesignationElement extends
 	@Override
 	public void createControls(ICdmFormElement formElement, int style) {
 		selection_typeSpecimen = formFactory
-				.createSelectionElement(DerivedUnitBase.class,
+				.createSelectionElement(DerivedUnit.class,
 						getConversationHolder(), formElement, "Specimen", null,
 						EntitySelectionElement.ALL, style);
 		combo_typeStatus = formFactory
@@ -101,8 +101,8 @@ public class SpecimenTypeDesignationElement extends
 		else if (eventSource == text_specimenTypeText) {
 			// TODO this is a simple workaround to enter type specimen as text
 			// strings
-			if (getEntity().getTypeSpecimen() == null) {
-				Specimen typeSpecimen = Specimen.NewInstance();
+			if (getEntity().getTypeSpecimen() == null) {				
+				DerivedUnit typeSpecimen = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);									
 				getEntity().setTypeSpecimen(typeSpecimen);
 			}
 			getEntity().getTypeSpecimen().setTitleCache(
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index 2310b3d33..61ab18ee5 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -15,10 +15,8 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
@@ -48,7 +46,9 @@ public class DerivedUnitBaseDetailElement extends
 
 	private TextWithLabelElement text_exsicatum;
 
-	private TermComboElement<PreservationMethod> combo_preservationMethod;
+	//FIXME:3.3MC---- see Ticket #3732
+//	private TermComboElement<PreservationMethod> combo_preservationMethod;
+	//FIXME:3.3MC----
 
 	private SpecimenCollectionDetailSection section_duplicates;
 
@@ -74,38 +74,45 @@ public class DerivedUnitBaseDetailElement extends
 	/** {@inheritDoc} */
 	@Override
     protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
-        // Disable for now
-        // text_derivedUnitDefinitions =
-        // formFactory.createTextWithLabelElement(formElement,
-        // "Specimen Definition",
-        // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
-        // style);
+		// Disable for now
+		// text_derivedUnitDefinitions =
+		// formFactory.createTextWithLabelElement(formElement,
+		// "Specimen Definition",
+		// facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
+		// style);
         text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
         text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style);
 
-        try {
-            combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class, formElement, "Preservation Method", entity.getPreservationMethod(), style);
-        } catch (MethodNotSupportedByDerivedUnitTypeException e) {
-            // we ignore this
-            AbstractUtility.info(e.getMessage());
-        }
+
+        //FIXME:3.3MC----
+//		try {
+//            combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class, formElement, "Preservation Method", entity.getPreservationMethod(), style);
+//		} catch (MethodNotSupportedByDerivedUnitTypeException e) {
+//			// we ignore this
+//            AbstractUtility.info(e.getMessage());
+//		}
+		//FIXME:3.3MC----
         selection_storedUnder = formFactory.createSelectionElement(TaxonNameBase.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
 
-        try {
+		try {
             text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
-        } catch (MethodNotSupportedByDerivedUnitTypeException e) {
-            // we ignore this
+		} catch (MethodNotSupportedByDerivedUnitTypeException e) {
+			// we ignore this
             AbstractUtility.info(e.getMessage());
-        }
+		}
 
-        section_duplicates = formFactory.createSpecimenCollectionDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE);
-        section_duplicates.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
-        section_duplicates.setEntity(entity);
+//		section_duplicates = (SpecimenCollectionDetailSection) formFactory
+//				.createEntityDetailSection(
+//						EntityDetailType.SPECIMEN_COLLECTION,
+//						getConversationHolder(), formElement, Section.TWISTIE);
+//		section_duplicates
+//				.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+//		section_duplicates.setEntity(entity);
 
         section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE);
-        section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
-        section_source.setEntity(entity);
-    }
+		section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+		section_source.setEntity(entity);
+	}
 
 	/** {@inheritDoc} */
 	@Override
@@ -118,18 +125,20 @@ public class DerivedUnitBaseDetailElement extends
 			getEntity().setBarcode(text_barcode.getText());
 		} else if (eventSource == text_catalogNumber) {
 			getEntity().setCatalogNumber(text_catalogNumber.getText());
-		} else if (eventSource == combo_preservationMethod) {
-			try {
-				getEntity().setPreservationMethod(
-						combo_preservationMethod.getSelection());
-			} catch (MethodNotSupportedByDerivedUnitTypeException e) {
-				AbstractUtility
-						.errorDialog(
-								"MethodNotSupportedByDerivedUnitTypeException",
-								this,
-								"MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit",
-								e);
-			}
+			//FIXME:3.3MC----
+//		} else if (eventSource == combo_preservationMethod) {
+//			try {
+//				getEntity().setPreservationMethod(
+//						combo_preservationMethod.getSelection());
+//			} catch (MethodNotSupportedByDerivedUnitTypeException e) {
+//				AbstractUtility
+//						.errorDialog(
+//								"MethodNotSupportedByDerivedUnitTypeException",
+//								this,
+//								"MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit",
+//								e);
+//			}
+			//FIXME:3.3MC----
 		} else if (eventSource == selection_storedUnder) {
 			getEntity().setStoredUnder(selection_storedUnder.getEntity());
 		} else if (eventSource == text_exsicatum) {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
index edd068f7f..501f929d2 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
@@ -15,7 +15,7 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
  * @created Jun 17, 2010
  * @version 1.0
  */
-public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<DerivedUnitBase> {
+public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<DerivedUnit> {
 
 	private DerivedUnitFacade facade;
 
@@ -57,7 +57,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
 
 	/** {@inheritDoc} */
 	@Override
-	public void setEntity(DerivedUnitBase entity) {
+	public void setEntity(DerivedUnit entity) {
 		super.setEntity(entity);
 		try {
 			facade = DerivedUnitFacade.NewInstance(entity, configurator);
@@ -100,7 +100,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
 
 	/** {@inheritDoc} */
 	@Override
-	public DerivedUnitBase getEntity() {
+	public DerivedUnit getEntity() {
 		throw new IllegalArgumentException("Should not be called");
 	}
 
@@ -116,7 +116,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
 	/** {@inheritDoc} */
 	@Override
 	protected void createControls(ICdmFormElement formElement,
-			DerivedUnitBase entity, int style) {
+			DerivedUnit entity, int style) {
 
 		section_general = formFactory.createGeneralDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 		section_general.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java
index 5c410bf52..57713fb84 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java
@@ -13,7 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -26,7 +26,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
  * @created Jun 17, 2010
  * @version 1.0
  */
-public class DerivedUnitFacadeDetailSection extends AbstractCdmDetailSection<DerivedUnitBase> {
+public class DerivedUnitFacadeDetailSection extends AbstractCdmDetailSection<DerivedUnit> {
 
 	/**
 	 * <p>Constructor for DerivedUnitFacadeDetailSection.</p>
@@ -53,7 +53,7 @@ public class DerivedUnitFacadeDetailSection extends AbstractCdmDetailSection<Der
 	 * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
 	 */
 	@Override
-	protected AbstractCdmDetailElement<DerivedUnitBase> createCdmDetailElement(AbstractCdmDetailSection<DerivedUnitBase> parentElement, int style) {
+	protected AbstractCdmDetailElement<DerivedUnit> createCdmDetailElement(AbstractCdmDetailSection<DerivedUnit> parentElement, int style) {
 	    return formFactory.createDerivedUnitFacadeDetailElement(parentElement);
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
index 92c0533da..0b624b6c8 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
@@ -12,8 +12,9 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.events.SelectionListener;
 
+
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
-import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
@@ -34,7 +35,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 public class DeterminationEventDetailElement extends
 		AbstractEventDetailElement<DeterminationEvent> {
 
-	private TermComboElement<DeterminationModifier> combo_determinationModifier;
+	private TermComboElement<DefinedTerm> combo_determinationModifier;
 	private CheckboxElement checkbox_preferredFlag;
 	private EntitySelectionElement<TaxonBase> selection_taxonBase;
 
@@ -105,7 +106,7 @@ public class DeterminationEventDetailElement extends
 		selection_agent.setLabel("Determined by");
 		
 		
-		combo_determinationModifier = formFactory.createTermComboElement(DeterminationModifier.class,
+		combo_determinationModifier = formFactory.createTermComboElement(DefinedTerm.class,
 				element, "Modifier", null, style);
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
index 7391066be..2ed246cd2 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
@@ -11,8 +11,8 @@
 package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.cdm.model.description.Sex;
-import eu.etaxonomy.cdm.model.description.Stage;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -40,9 +40,9 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
 
 	private NumberWithLabelElement number_individualCount;
 
-	private TermComboElement<Sex> combo_sex;
+	private TermComboElement<DefinedTerm> combo_sex;
 
-	private TermComboElement<Stage> combo_lifeStage;
+	private TermComboElement<DefinedTerm> combo_lifeStage;
 
 	/**
 	 * <p>Constructor for FieldObservationDetailElement.</p>
@@ -65,9 +65,12 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
 //		text_fieldObjectDefinition = formFactory.createTextWithLabelElement(formElement, "Field Object Definition", entity.getFieldObjectDefinition(CdmStore.getDefaultLanguage()), style);
 		text_fieldNotes = formFactory.createTextWithLabelElement(formElement, "Field Notes", entity.getFieldNotes(), style);
 
-		number_individualCount = formFactory.createIntegerTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
-		combo_lifeStage = formFactory.createTermComboElement(Stage.class, formElement, "Life Stage", entity.getLifeStage(), style);
-		combo_sex = formFactory.createTermComboElement(Sex.class, formElement, "Sex", entity.getSex(), style);
+		number_individualCount = formFactory.createNumberTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
+		//FIXME:3.3MC----
+		// Need to make sure that the hard coded terms in DefinedTerm have a term type (currently null)
+		//combo_lifeStage = formFactory.createDefinedTermComboElement(TermType.Stage, formElement, "Life Stage", entity.getLifeStage(), style);
+		//combo_sex = formFactory.createDefinedTermComboElement(TermType.Sex, formElement, "Sex", entity.getSex(),style);
+		//FIXME:3.3MC----
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
index f7d40c6d8..ec26283ec 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
@@ -16,8 +16,10 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
+import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection;
 import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -34,18 +36,16 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 public class GatheringEventDetailElement extends
 		AbstractCdmDetailElement<DerivedUnitFacade> {
 
-	private NumberWithLabelElement number_absoluteElevationError;
+	private GatheringEventUnitElement element_elevation;
 
-	private NumberWithLabelElement number_absoluteElevationMinimum;
-
-	private NumberWithLabelElement number_absoluteElevationMaximum;
+	private GatheringEventUnitElement element_distToGround;
+	
+	private GatheringEventUnitElement element_distToWater;
+	
+	private MinMaxTextSection section_minMaxText;
 
 	private TextWithLabelElement text_collectingMethod;
 
-	private NumberWithLabelElement number_distanceToGround;
-
-	private NumberWithLabelElement number_distanceToWaterSurface;
-
 	private TextWithLabelElement text_gatheringEventDescription;
 
 	private CollectingAreasDetailSection section_collectingAreas;
@@ -67,64 +67,40 @@ public class GatheringEventDetailElement extends
 		super(formFactory, formElement);
 	}
 
-    /** {@inheritDoc} */
-    @Override
-    protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
-        // collectingArea
-        number_absoluteElevationError = formFactory.createIntegerTextWithLabelElement(formElement, "Elevation Error", entity.getAbsoluteElevationError(), style);
-        number_absoluteElevationMinimum = formFactory.createIntegerTextWithLabelElement(formElement, "Elevation Minimum (m)", entity.getAbsoluteElevationMinimum(), style);
-        number_absoluteElevationMaximum = formFactory.createIntegerTextWithLabelElement(formElement, "Elevation Maximum (m)", entity.getAbsoluteElevationMaximum(), style);
+	/** {@inheritDoc} */
+	@Override
+	protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
+		
+
+		// collectingArea
+
 
         text_collectingMethod = formFactory.createTextWithLabelElement(formElement, "Collecting Method", entity.getCollectingMethod(), style);
 
-        number_distanceToGround = formFactory.createIntegerTextWithLabelElement(formElement, "Distance To Ground (m)", entity.getDistanceToGround(), style);
-        number_distanceToWaterSurface = formFactory.createIntegerTextWithLabelElement(formElement, "Distance To Water Surface (m)", entity.getDistanceToWaterSurface(), style);
-        // exactLocation
-        text_gatheringEventDescription = formFactory.createTextWithLabelElement(formElement, "Gathering Event Description", entity.getGatheringEventDescription(), style);
 
+		// exactLocation
+        text_gatheringEventDescription = formFactory.createTextWithLabelElement(formElement, "Gathering Event Description", entity.getGatheringEventDescription(), style);
+		element_elevation = formFactory.createGatheringEventUnitElement(
+				formElement, "Elevation : ", entity, MinMaxTextSection.UnitType.ELEVATION,  style);
+		
+		
+		element_distToGround = formFactory.createGatheringEventUnitElement(
+				formElement, "Dist. To Ground : ", entity, MinMaxTextSection.UnitType.DIST_TO_GROUND,  style);
+		
+		element_distToWater = formFactory.createGatheringEventUnitElement(
+				formElement, "Dist. To Water : ", entity, MinMaxTextSection.UnitType.DIST_TO_WATER,  style);
+		
         section_collectingAreas = formFactory.createCollectingAreasDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE);
         section_collectingAreas.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
-        section_collectingAreas.setEntity(entity);
-    }
+		section_collectingAreas.setEntity(entity);
+
+	}
 
 	/** {@inheritDoc} */
 	@Override
 	public void handleEvent(Object eventSource) {
-		if (eventSource == number_absoluteElevationError) {
-			getEntity().setAbsoluteElevationError(
-					number_absoluteElevationError.getInteger());
-		} else if (eventSource == number_absoluteElevationMinimum) {
-			try {
-				getEntity().setAbsoluteElevationRange(
-						number_absoluteElevationMinimum.getInteger(),
-						number_absoluteElevationMaximum.getInteger());
-				number_absoluteElevationMinimum
-						.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
-			} catch (IllegalArgumentException e) {
-				number_absoluteElevationMinimum
-						.setBackground(getColor(Resources.COLOR_PARSE_ERROR));
-				AbstractUtility.warn(getClass(), e.getLocalizedMessage());
-			}
-		} else if (eventSource == number_absoluteElevationMaximum) {
-			try {
-				getEntity().setAbsoluteElevationRange(
-						number_absoluteElevationMinimum.getInteger(),
-						number_absoluteElevationMaximum.getInteger());
-				number_absoluteElevationMaximum
-						.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
-			} catch (IllegalArgumentException e) {
-				number_absoluteElevationMaximum
-						.setBackground(getColor(Resources.COLOR_PARSE_ERROR));
-				AbstractUtility.warn(getClass(), e.getLocalizedMessage());
-			}
-		} else if (eventSource == text_collectingMethod) {
+		if (eventSource == text_collectingMethod) {
 			getEntity().setCollectingMethod(text_collectingMethod.getText());
-		} else if (eventSource == number_distanceToGround) {
-			getEntity().setDistanceToGround(
-					number_distanceToGround.getInteger());
-		} else if (eventSource == number_distanceToWaterSurface) {
-			getEntity().setDistanceToWaterSurface(
-					number_distanceToWaterSurface.getInteger());
 		} else if (eventSource == text_gatheringEventDescription) {
 			getEntity().setGatheringEventDescription(
 					text_gatheringEventDescription.getText());
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
index c62ef9331..a5e8583a8 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
@@ -15,7 +15,10 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
@@ -25,6 +28,7 @@ import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement;
 import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
+import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection;
 
 /**
  * @author n.hoffmann
@@ -35,7 +39,7 @@ public class GeneralDetailElement extends
 		AbstractCdmDetailElement<DerivedUnitFacade> {
 
 	private ToggleableTextElement toggleableText_titleCache;
-
+	private EnumComboElement<SpecimenOrObservationType> combo_specorobstype;
 	private EntitySelectionElement<NamedArea> selection_country;
 	private LanguageStringWithLabelElement languageText_locality;
 	private PointElement element_point;
@@ -45,6 +49,7 @@ public class GeneralDetailElement extends
 	private TextWithLabelElement text_collectingNumber;
 	private EntitySelectionElement<Collection> selection_collection;
 	private TextWithLabelElement text_accessionNumber;
+	
 
 	/**
 	 * @param formFactory
@@ -68,7 +73,10 @@ public class GeneralDetailElement extends
 		toggleableText_titleCache = formFactory.createToggleableTextField(
 				formElement, "Title Cache", entity.getTitleCache(),
 				entity.isProtectedTitleCache(), style);
-
+		combo_specorobstype = formFactory
+				.createEnumComboElement(SpecimenOrObservationType.class,
+						formElement, style);
+		combo_specorobstype.setSelection(entity.getType());
 		selection_country = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
 				formElement, "Country",
 				entity.getCountry(), EntitySelectionElement.NOTHING, style);
@@ -77,9 +85,6 @@ public class GeneralDetailElement extends
 						entity.getLocality(), style);
 		element_point = formFactory.createPointElement(formElement,
 				entity.getExactLocation(), style);
-		number_elevation = formFactory.createIntegerTextWithLabelElement(
-				formElement, "Absolute Elevation (m)",
-				entity.getAbsoluteElevation(), style);
 		element_date = formFactory.createTimePeriodElement(formElement, "Date",
 				entity.getGatheringPeriod(), style);
 		selection_collector = formFactory
@@ -132,6 +137,8 @@ public class GeneralDetailElement extends
 			getEntity().setCollection(selection_collection.getSelection());
 		} else if (eventSource == text_accessionNumber) {
 			getEntity().setAccessionNumber(text_accessionNumber.getText());
+		} else if (eventSource == combo_specorobstype) {
+			getEntity().setType(combo_specorobstype.getSelection());
 		}
 
 		if (eventSource != toggleableText_titleCache) {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
index 157480d4c..501d000ba 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
@@ -15,6 +15,7 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -57,7 +58,7 @@ public class SourceCollectionDetailSection extends
 	/** {@inheritDoc} */
 	@Override
 	public IdentifiableSource createNewElement() {
-		return IdentifiableSource.NewInstance();
+		return IdentifiableSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource);		
 	}
 
 	/* (non-Javadoc)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
index 75c131ed0..d98870644 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
@@ -12,8 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.events.SelectionListener;
 
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -30,9 +29,9 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * @version 1.0
  */
 public class SpecimenCollectionDetailElement extends
-		AbstractEntityCollectionElement<Specimen> {
+		AbstractEntityCollectionElement<DerivedUnit> {
 
-	private EntitySelectionElement<DerivedUnitBase> selection_derivedUnit;
+	private EntitySelectionElement<DerivedUnit> selection_derivedUnit;
 
 	/**
 	 * <p>
@@ -53,7 +52,7 @@ public class SpecimenCollectionDetailElement extends
 	 *            a int.
 	 */
 	public SpecimenCollectionDetailElement(CdmFormFactory formFactory,
-			AbstractFormSection section, Specimen entity,
+			AbstractFormSection section, DerivedUnit entity,
 			SelectionListener removeListener, int style) {
 		super(formFactory, section, entity, removeListener, null, style);
 	}
@@ -67,7 +66,7 @@ public class SpecimenCollectionDetailElement extends
 	 */
 	/** {@inheritDoc} */
 	@Override
-	public void setEntity(Specimen entity) {
+	public void setEntity(DerivedUnit entity) {
 		this.entity = entity;
 		selection_derivedUnit.setEntity(entity);
 	}
@@ -83,7 +82,7 @@ public class SpecimenCollectionDetailElement extends
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
 		selection_derivedUnit = formFactory
-				.createSelectionElement(DerivedUnitBase.class,
+				.createSelectionElement(DerivedUnit.class,
 						getConversationHolder(), element, "Derived Unit", null,
 						EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE, style);
 	}
@@ -99,7 +98,7 @@ public class SpecimenCollectionDetailElement extends
 	@Override
 	public void handleEvent(Object eventSource) {
 		if (eventSource == selection_derivedUnit) {
-			this.setEntity((Specimen) selection_derivedUnit.getSelection());
+			this.setEntity((DerivedUnit) selection_derivedUnit.getSelection());
 		}
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
index d4c0910df..7caf8bd4c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
@@ -14,7 +14,8 @@ import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -27,7 +28,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
  * @version 1.0
  */
 public class SpecimenCollectionDetailSection extends
-		AbstractEntityCollectionSection<DerivedUnitFacade, Specimen> {
+		AbstractEntityCollectionSection<DerivedUnitFacade, DerivedUnit> {
 
 	/**
 	 * <p>Constructor for SpecimenCollectionDetailSection.</p>
@@ -47,7 +48,7 @@ public class SpecimenCollectionDetailSection extends
 	 */
 	/** {@inheritDoc} */
 	@Override
-	public Collection<Specimen> getCollection(DerivedUnitFacade entity) {
+	public Collection<DerivedUnit> getCollection(DerivedUnitFacade entity) {
 		return entity.getDuplicates();
 	}
 
@@ -56,8 +57,8 @@ public class SpecimenCollectionDetailSection extends
 	 */
 	/** {@inheritDoc} */
 	@Override
-	public Specimen createNewElement() {
-		return Specimen.NewInstance();
+	public DerivedUnit createNewElement() {		
+		return DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);		
 	}
 
 	/* (non-Javadoc)
@@ -65,7 +66,7 @@ public class SpecimenCollectionDetailSection extends
 	 */
 	/** {@inheritDoc} */
 	@Override
-	public void addElement(Specimen element) {
+	public void addElement(DerivedUnit element) {
 		getEntity().addDuplicate(element);
 	}
 
@@ -74,7 +75,7 @@ public class SpecimenCollectionDetailSection extends
 	 */
 	/** {@inheritDoc} */
 	@Override
-	public void removeElement(Specimen element) {
+	public void removeElement(DerivedUnit element) {
 		getEntity().removeDuplicate(element);
 	}
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
index e004ba3f3..97d86685e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
@@ -13,6 +13,9 @@ package eu.etaxonomy.taxeditor.ui.section.supplemental;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.OriginalSourceBase;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -26,6 +29,7 @@ import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
  * @version 1.0
  */
 public abstract class AbstractOriginalSourceElement<T extends OriginalSourceBase> extends AbstractReferencedEntityElement<T> {
+	protected EnumComboElement<OriginalSourceType> combo_origsourcetype;
 	protected TextWithLabelElement text_idInSource;
 	protected TextWithLabelElement text_idNamespace;
 
@@ -56,6 +60,9 @@ public abstract class AbstractOriginalSourceElement<T extends OriginalSourceBase
 	/** {@inheritDoc} */
 	@Override
 	public void createControls(ICdmFormElement formElement, int style) {
+		combo_origsourcetype = formFactory
+				.createEnumComboElement(OriginalSourceType.class,
+						formElement, style);		
 		text_idInSource = formFactory.createTextWithLabelElement(formElement, "Id In Source", null, style);
 		text_idNamespace = formFactory.createTextWithLabelElement(formElement, "ID Namespace", null, style);
 		super.createControls(formElement, style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
index f21ad121d..4c381f8f6 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
@@ -6,6 +6,7 @@ package eu.etaxonomy.taxeditor.ui.section.supplemental;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -55,6 +56,7 @@ public class IdentifiableSourceElement extends AbstractOriginalSourceElement<Ide
 
 		selection_reference.setEntity(entity.getCitation());
 		text_referenceDetail.setText(entity.getCitationMicroReference());
+		combo_origsourcetype.setSelection(entity.getType());
 		if(hasOriginalNameString()) text_originaleNameString.setText(entity.getOriginalNameString());
 	}	
 	
@@ -75,6 +77,8 @@ public class IdentifiableSourceElement extends AbstractOriginalSourceElement<Ide
 		}
 		else if(eventSource == text_originaleNameString){
 			getEntity().setOriginalNameString(text_originaleNameString.getText());
+		} else if(eventSource == combo_origsourcetype){
+			getEntity().setType(combo_origsourcetype.getSelection());
 		}
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
index 376afb8ec..e748ba816 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
@@ -7,7 +7,7 @@ import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.media.Rights;
-import eu.etaxonomy.cdm.model.media.RightsTerm;
+import eu.etaxonomy.cdm.model.media.RightsType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  */
 public class RightsElement extends AbstractEntityCollectionElement<Rights> {
 
-	private TermComboElement<RightsTerm> combo_rightsType;
+	private TermComboElement<RightsType> combo_rightsType;
 	private EntitySelectionElement<AgentBase> selection_agent;
 	private TextWithLabelElement text;
 	
@@ -67,7 +67,7 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
 		combo_rightsType = formFactory.createTermComboElement(
-				RightsTerm.class, this, "Rights Type", null, style);
+				RightsType.class, this, "Rights Type", null, style);
 		selection_agent = formFactory.createSelectionElement(
 				AgentBase.class, getConversationHolder(), this, "Agent",
 				null, EntitySelectionElement.ALL, style);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
index a176ae026..346cee5d4 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
@@ -8,9 +8,14 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.taxeditor.ui.dialog.selection.DerivedUnitSelectionDialog;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
+
+import eu.etaxonomy.taxeditor.ui.dialog.selection.OriginalSourceTypeSelectionDialog;;
 
 /**
  * <p>SourceSection class.</p>
@@ -36,7 +41,7 @@ public class SourceSection extends AbstractEntityCollectionSection<IIdentifiable
 	/** {@inheritDoc} */
 	@Override
 	public IdentifiableSource createNewElement() {
-		return IdentifiableSource.NewInstance();
+		return IdentifiableSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource);
 	}
 
 	/** {@inheritDoc} */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
index 32d02813f..015af402f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
@@ -17,11 +17,12 @@ import java.util.Set;
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
+
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
-import eu.etaxonomy.cdm.model.description.Modifier;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.taxeditor.editor.UsageTermCollection;
@@ -48,10 +49,10 @@ public class UseRecordDetailElement extends
 
 	private TermComboElement<State> combo_UseCategory;
 	private TermComboElement<State> combo_UseSubCategory;
-	private TermComboElement<Modifier> combo_PlantPart;
-	private TermComboElement<Modifier> combo_Country;
-	private TermComboElement<Modifier> combo_HumanGroup;
-	private TermComboElement<Modifier> combo_EthnicGroup;
+	private TermComboElement<DefinedTerm> combo_PlantPart;
+	private TermComboElement<DefinedTerm> combo_Country;
+	private TermComboElement<DefinedTerm> combo_HumanGroup;
+	private TermComboElement<DefinedTerm> combo_EthnicGroup;
 
 	public UseRecordDetailElement(CdmFormFactory formFactory,
 			ICdmFormElement formElement) {
@@ -66,11 +67,11 @@ public class UseRecordDetailElement extends
 		combo_UseCategory = formFactory.createTermComboElement(State.class,	this, UsageTermCollection.useCategoryVocabularyLabel, null, style);
 		combo_UseCategory.addSelectionListener(this);
 		combo_UseSubCategory = formFactory.createTermComboElement(State.class, this, UsageTermCollection.useSubCategoryVocabularyLabel, null, style);
-		combo_PlantPart = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.plantPartLabel, null, style);
-		combo_HumanGroup = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.humanGroupLabel, null, style);
+		combo_PlantPart = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.plantPartLabel, null, style);
+		combo_HumanGroup = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.humanGroupLabel, null, style);
 		combo_HumanGroup.addSelectionListener(this);
-		combo_EthnicGroup = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.ethnicGroupLabel, null, style);
-		combo_Country	= formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.countryLabel, null, style);
+		combo_EthnicGroup = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.ethnicGroupLabel, null, style);
+		combo_Country	= formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.countryLabel, null, style);
 		
 
 		List<State> termsUseCategory = setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false));
@@ -88,19 +89,19 @@ public class UseRecordDetailElement extends
 			combo_UseSubCategory.setEnabled(false);
 		}
 		
-		List<Modifier> plantPartsToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.plantPartLabel);
+		List<DefinedTerm> plantPartsToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.plantPartLabel);
 		combo_PlantPart.setTerms(plantPartsToAdd);
 		combo_PlantPart.setSelection(modifierSelection(UsageTermCollection.plantPartLabel));
 		
-		List<Modifier> countriesToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.countryLabel);
+		List<DefinedTerm> countriesToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.countryLabel);
 		combo_Country.setTerms(countriesToAdd);
 		combo_Country.setSelection(modifierSelection(UsageTermCollection.countryLabel));
 		
-		List<Modifier> humanGroupToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.humanGroupLabel);
+		List<DefinedTerm> humanGroupToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.humanGroupLabel);
 		combo_HumanGroup.setTerms(humanGroupToAdd);
 		combo_HumanGroup.setSelection(modifierSelection(UsageTermCollection.humanGroupLabel));
 		
-		List<Modifier> ethnicGroupToAdd = setEthnicGroupComboTerms(TermStore.getTerms(Modifier.class, null, false), combo_HumanGroup.getSelection());
+		List<DefinedTerm> ethnicGroupToAdd = setEthnicGroupComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), combo_HumanGroup.getSelection());
 		if (ethnicGroupToAdd != null) {
 			combo_EthnicGroup.setTerms(ethnicGroupToAdd);
 			combo_EthnicGroup.setSelection(modifierSelection(UsageTermCollection.ethnicGroupLabel));
@@ -116,9 +117,9 @@ public class UseRecordDetailElement extends
 	 * @param comboCategory
 	 * @return
 	 */
-	private Modifier modifierSelection(String comboCategory) {
+	private DefinedTerm modifierSelection(String comboCategory) {
 		if(!getEntity().getModifiers().isEmpty()) {
-			for (Modifier modifier : getEntity().getModifiers()) {
+			for (DefinedTerm modifier : getEntity().getModifiers()) {
 				if(GetVocabularyType(modifier, comboCategory)) {
 					return modifier;
 				}
@@ -136,8 +137,8 @@ public class UseRecordDetailElement extends
 	 * @return
 	 */
 	private State stateSelection(String comboCategory) {
-		if (!getEntity().getStates().isEmpty()) {
-			for (StateData statedata : getEntity().getStates()) {
+		if (!getEntity().getStateData().isEmpty()) {
+			for (StateData statedata : getEntity().getStateData()) {
 				if (statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
 					String testString = statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText();
 					if(testString.equals(comboCategory)) {
@@ -161,9 +162,9 @@ public class UseRecordDetailElement extends
 	 * @param modType
 	 * @return
 	 */
-	private List<Modifier> setModifierComboTerms(List<Modifier> listOfTerms, String modType) {
-		List<Modifier> termsToAdd = new ArrayList<Modifier>();
-		for (Modifier term : listOfTerms) {
+	private List<DefinedTerm> setModifierComboTerms(List<DefinedTerm> listOfTerms, String modType) {
+		List<DefinedTerm> termsToAdd = new ArrayList<DefinedTerm>();
+		for (DefinedTerm term : listOfTerms) {
 
 			if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(modType))) {
 				termsToAdd.add(term);
@@ -218,8 +219,8 @@ public class UseRecordDetailElement extends
 	
 			}
 		}
-		else if (!getEntity().getStates().isEmpty()) {
-			for (StateData stateData : getEntity().getStates()) {
+		else if (!getEntity().getStateData().isEmpty()) {
+			for (StateData stateData : getEntity().getStateData()) {
 				if (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {
 					if ((stateData.getState() != null) && (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == UsageTermCollection.useCategoryVocabularyLabel)) {
 						for (State term : listOfTerms) {
@@ -250,11 +251,11 @@ public class UseRecordDetailElement extends
 	 * @param selectedHumangroup
 	 * @return
 	 */
-	private List<Modifier> setEthnicGroupComboTerms(List<Modifier> listOfTerms,
-			Modifier selectedHumangroup) {
-		List<Modifier> termsToAdd = new ArrayList<Modifier>();
+	private List<DefinedTerm> setEthnicGroupComboTerms(List<DefinedTerm> listOfTerms,
+			DefinedTerm selectedHumangroup) {
+		List<DefinedTerm> termsToAdd = new ArrayList<DefinedTerm>();
 		if (combo_HumanGroup.getSelection() != null) {
-			for (Modifier term : listOfTerms) {
+			for (DefinedTerm term : listOfTerms) {
 	
 				if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(selectedHumangroup.getTitleCache()))) {
 					termsToAdd.add(term);
@@ -265,11 +266,11 @@ public class UseRecordDetailElement extends
 			}
 		}
 		else if (!getEntity().getModifiers().isEmpty()) {
-			for (Modifier modifier : getEntity().getModifiers()) {
+			for (DefinedTerm modifier : getEntity().getModifiers()) {
 				if (modifier.getMarkers() != null) {
 					for (Marker marker : modifier.getMarkers()) {
 						if(marker.getMarkerType().getTitleCache().equals(UsageTermCollection.humanGroupLabel)) {
-							for (Modifier term : listOfTerms) {
+							for (DefinedTerm term : listOfTerms) {
 								if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(modifier.getTitleCache()))) {
 									termsToAdd.add(modifier);
 								} else if ((term.getVocabulary() != null) && (term.getVocabulary().getTitleCache().equals(modifier.getTitleCache()))) {
@@ -296,8 +297,8 @@ public class UseRecordDetailElement extends
 			if (combo_UseCategory.getSelection() != null) {
 				boolean isChanged = false;
 				boolean isUseCategoryChanged = false;
-				if (!getEntity().getStates().isEmpty()) {
-					for (StateData useCategoryStateDataCheck : getEntity().getStates()) {
+				if (!getEntity().getStateData().isEmpty()) {
+					for (StateData useCategoryStateDataCheck : getEntity().getStateData()) {
 						Map<Language, LanguageString> modText = useCategoryStateDataCheck.getModifyingText();
 						if(modText.get(CdmStore.getDefaultLanguage()) != null && modText.get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) {
 							if(!useCategoryStateDataCheck.getState().getTitleCache().equals(combo_UseCategory.getSelection().getTitleCache())) {
@@ -306,7 +307,7 @@ public class UseRecordDetailElement extends
 							
 						}
 					}
-					ListIterator<StateData> itrExistingStates = getEntity().getStates().listIterator();
+					ListIterator<StateData> itrExistingStates = getEntity().getStateData().listIterator();
 					while(itrExistingStates.hasNext()) {
 						StateData existingStateData = itrExistingStates.next();
 						Map<Language, LanguageString> modifyingText = existingStateData
@@ -335,15 +336,15 @@ public class UseRecordDetailElement extends
 							.NewInstance(combo_UseCategory.getSelection());
 					stateData.setState(combo_UseCategory.getSelection());
 					stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useCategoryVocabularyLabel);
-					getEntity().addState(stateData);
+					getEntity().addStateData(stateData);
 				}
 				
 				combo_UseSubCategory.setEnabled(true);
 	
 			}
 			else {
-				if (!getEntity().getStates().isEmpty()) {
-					Iterator<StateData> itr = getEntity().getStates().iterator();
+				if (!getEntity().getStateData().isEmpty()) {
+					Iterator<StateData> itr = getEntity().getStateData().iterator();
 					while(itr.hasNext()) {
 						StateData stateToRemove = itr.next();
 						itr.remove();
@@ -360,8 +361,8 @@ public class UseRecordDetailElement extends
 		if (eventSource == combo_UseSubCategory) {
 			if (combo_UseSubCategory.getSelection() != null) {
 				boolean isChanged = false;
-				if (!getEntity().getStates().isEmpty()) {
-					ListIterator<StateData> itrExistingStates = getEntity().getStates().listIterator();
+				if (!getEntity().getStateData().isEmpty()) {
+					ListIterator<StateData> itrExistingStates = getEntity().getStateData().listIterator();
 					while(itrExistingStates.hasNext()) {
 						StateData existingStateData = itrExistingStates.next();
 						Map<Language, LanguageString> modifyingText = existingStateData
@@ -386,12 +387,12 @@ public class UseRecordDetailElement extends
 							.NewInstance(combo_UseSubCategory.getSelection());
 					stateData.setState(combo_UseSubCategory.getSelection());
 					stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useSubCategoryVocabularyLabel);
-					getEntity().addState(stateData);
+					getEntity().addStateData(stateData);
 				}
 	
 			} else {
-				if (!getEntity().getStates().isEmpty()) {
-					Iterator<StateData> itrStateData = getEntity().getStates().iterator();
+				if (!getEntity().getStateData().isEmpty()) {
+					Iterator<StateData> itrStateData = getEntity().getStateData().iterator();
 					while(itrStateData.hasNext()) {
 						StateData existingStateData = itrStateData.next();
 						Map<Language, LanguageString> modifyingText = existingStateData
@@ -408,22 +409,22 @@ public class UseRecordDetailElement extends
 		}
 		if (eventSource == combo_PlantPart) {
 			if (combo_PlantPart.getSelection() != null) {
-				Iterator<Modifier> itrExistingModifiers = getEntity().getModifiers().iterator();
+				Iterator<DefinedTerm> itrExistingModifiers = getEntity().getModifiers().iterator();
 				while (itrExistingModifiers.hasNext()) {
-					Modifier modifier = itrExistingModifiers.next();
+					DefinedTerm modifier = itrExistingModifiers.next();
 					if(GetVocabularyType(modifier, UsageTermCollection.plantPartLabel)) {
 						itrExistingModifiers.remove();
 					}
 						
 				}	
-				Modifier plantPart = combo_PlantPart.getSelection();
+				DefinedTerm plantPart = combo_PlantPart.getSelection();
 				getEntity().addModifier(plantPart);
 			} else {
-				Set<Modifier> modifiers = getEntity().getModifiers();
+				Set<DefinedTerm> modifiers = getEntity().getModifiers();
 				if(!modifiers.isEmpty()) {
-					Iterator<Modifier> itr = modifiers.iterator();
+					Iterator<DefinedTerm> itr = modifiers.iterator();
 					while (itr.hasNext()) {
-						Modifier currentMod = itr.next();
+						DefinedTerm currentMod = itr.next();
 						if(GetVocabularyType(currentMod, UsageTermCollection.plantPartLabel)) {
 							itr.remove();
 						}
@@ -434,22 +435,22 @@ public class UseRecordDetailElement extends
 		}
 		if (eventSource == combo_Country) {
 			if (combo_Country.getSelection() != null) {
-				Iterator<Modifier> itrExistingModifiers = getEntity().getModifiers().iterator();
+				Iterator<DefinedTerm> itrExistingModifiers = getEntity().getModifiers().iterator();
 				while (itrExistingModifiers.hasNext()) {
-					Modifier modifier = itrExistingModifiers.next();
+					DefinedTerm modifier = itrExistingModifiers.next();
 					if(GetVocabularyType(modifier, UsageTermCollection.countryLabel)) {
 						itrExistingModifiers.remove();
 					}
 						
 				}
-				Modifier country = combo_Country.getSelection();
+				DefinedTerm country = combo_Country.getSelection();
 				getEntity().addModifier(country);
 			} else {
-				Set<Modifier> modifiers = getEntity().getModifiers();
+				Set<DefinedTerm> modifiers = getEntity().getModifiers();
 				if(!modifiers.isEmpty()) {
-					Iterator<Modifier> itr = modifiers.iterator();
+					Iterator<DefinedTerm> itr = modifiers.iterator();
 					while (itr.hasNext()) {
-						Modifier currentMod = itr.next();
+						DefinedTerm currentMod = itr.next();
 						if(GetVocabularyType(currentMod, UsageTermCollection.countryLabel)) {
 							itr.remove();
 						}
@@ -460,39 +461,44 @@ public class UseRecordDetailElement extends
 		if (eventSource == combo_HumanGroup) {
 			if (combo_HumanGroup.getSelection() != null) {
 				boolean isHumanGroupChanged = true;
-				for (Modifier modToCheck: getEntity().getModifiers()) {
+				for (DefinedTerm modToCheck: getEntity().getModifiers()) {
 					if(modToCheck.equals(combo_HumanGroup.getSelection()) && (GetVocabularyType(modToCheck, UsageTermCollection.humanGroupLabel))) {
 						isHumanGroupChanged = false;
 				}
 				
 					
 				}
-				Iterator<Modifier> itrExistingModifiers = getEntity().getModifiers().iterator();
+				Iterator<DefinedTerm> itrExistingModifiers = getEntity().getModifiers().iterator();
 				while (itrExistingModifiers.hasNext()) {
-					Modifier modifier = itrExistingModifiers.next();
+					DefinedTerm modifier = itrExistingModifiers.next();
 					if((GetVocabularyType(modifier, UsageTermCollection.humanGroupLabel) || GetVocabularyType(modifier, UsageTermCollection.ethnicGroupLabel)) && isHumanGroupChanged) {
 						itrExistingModifiers.remove();
 					}
 						
 				}	
 				if(isHumanGroupChanged){
-					Modifier humanGroup = combo_HumanGroup.getSelection();
+					DefinedTerm humanGroup = combo_HumanGroup.getSelection();
 					getEntity().addModifier(humanGroup);
 				}
 				combo_EthnicGroup.setEnabled(true);
 			} else {
-				Set<Modifier> modifiers = getEntity().getModifiers();
+				Set<DefinedTerm> modifiers = getEntity().getModifiers();
 				if(!modifiers.isEmpty()) {
-					Iterator<Modifier> itr = modifiers.iterator();
+					Iterator<DefinedTerm> itr = modifiers.iterator();
 					while (itr.hasNext()) {
-						Modifier currentMod = itr.next();
+						DefinedTerm currentMod = itr.next();
 						if(GetVocabularyType(currentMod, UsageTermCollection.humanGroupLabel) || GetVocabularyType(currentMod, UsageTermCollection.ethnicGroupLabel)) {
 							itr.remove();
 						}
 					}
 				}
-				List<Modifier> emptyListToResetComboBox = new ArrayList<Modifier>();
-				Modifier emptyMod = Modifier.NewInstance();
+				List<DefinedTerm> emptyListToResetComboBox = new ArrayList<DefinedTerm>();
+				//FIXME:3.3MC----
+				//DefinedTerm emptyMod = DefinedTerm.NewInstance();
+				DefinedTerm emptyMod = null;
+				//FIXME:3.3MC----
+				
+				
 				emptyListToResetComboBox.add(emptyMod);
 				combo_EthnicGroup.setTerms(emptyListToResetComboBox);
 				combo_EthnicGroup.setEnabled(false);
@@ -501,23 +507,23 @@ public class UseRecordDetailElement extends
 		}
 		if (eventSource == combo_EthnicGroup) {
 			if (combo_EthnicGroup.getSelection() != null) {
-				Iterator<Modifier> itrExistingModifiers = getEntity().getModifiers().iterator();
+				Iterator<DefinedTerm> itrExistingModifiers = getEntity().getModifiers().iterator();
 					while (itrExistingModifiers.hasNext()) {
-						Modifier modifier = itrExistingModifiers.next();
+						DefinedTerm modifier = itrExistingModifiers.next();
 						if(GetVocabularyType(modifier, combo_HumanGroup.getSelection().getTitleCache())) {
 							itrExistingModifiers.remove();
 						}
 						
 					}	
-					Modifier ethnicGroup = combo_EthnicGroup.getSelection();
+					DefinedTerm ethnicGroup = combo_EthnicGroup.getSelection();
 					getEntity().addModifier(ethnicGroup);
 			} else {
-				Set<Modifier> modifiers = getEntity().getModifiers();
+				Set<DefinedTerm> modifiers = getEntity().getModifiers();
 				if(!modifiers.isEmpty()) {
 					
-					Iterator<Modifier> itr = modifiers.iterator();
+					Iterator<DefinedTerm> itr = modifiers.iterator();
 					while (itr.hasNext()) {
-						Modifier currentMod = itr.next();
+						DefinedTerm currentMod = itr.next();
 						if(GetVocabularyType(currentMod, UsageTermCollection.ethnicGroupLabel)) {
 							itr.remove();
 						}
@@ -536,7 +542,7 @@ public class UseRecordDetailElement extends
 	 * @param vocabularyExpected
 	 * @return
 	 */
-	private boolean GetVocabularyType(Modifier term, String vocabularyExpected) {
+	private boolean GetVocabularyType(DefinedTerm term, String vocabularyExpected) {
 		if ((term.getPartOf() != null)  && (term.getPartOf().getTitleCache().equals(vocabularyExpected))) {
 			return true;
 		}
@@ -567,8 +573,8 @@ public class UseRecordDetailElement extends
 				if (selectedUseCategory != null) {
 					combo_UseSubCategory.setTerms(setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory));
 				
-					if (!getEntity().getStates().isEmpty()) {
-						Iterator<StateData> itrExistingState = getEntity().getStates().iterator();
+					if (!getEntity().getStateData().isEmpty()) {
+						Iterator<StateData> itrExistingState = getEntity().getStateData().iterator();
 						while(itrExistingState.hasNext()) {
 							StateData existingStateData = (StateData) itrExistingState.next();
 							Map<Language, LanguageString> modifyingText = existingStateData.getModifyingText();
@@ -585,13 +591,13 @@ public class UseRecordDetailElement extends
 		}
 		for (Object object: combo_HumanGroup.getControls()) {
 			if (object == eventSource) {
-				Modifier selectedHumanGroup = combo_HumanGroup.getSelection();
+				DefinedTerm selectedHumanGroup = combo_HumanGroup.getSelection();
 				if (selectedHumanGroup != null) {
-					combo_EthnicGroup.setTerms(setEthnicGroupComboTerms(TermStore.getTerms(Modifier.class, null, false), selectedHumanGroup));
+					combo_EthnicGroup.setTerms(setEthnicGroupComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), selectedHumanGroup));
 					if (!getEntity().getModifiers().isEmpty()) {
-						Iterator<Modifier> iterModifiers = getEntity().getModifiers().iterator();
+						Iterator<DefinedTerm> iterModifiers = getEntity().getModifiers().iterator();
 						while (iterModifiers.hasNext()) {
-							Modifier existingModifier = iterModifiers.next();
+							DefinedTerm existingModifier = iterModifiers.next();
 							if(GetVocabularyType(existingModifier, UsageTermCollection.ethnicGroupLabel)) {
 								combo_EthnicGroup.setSelection(modifierSelection(UsageTermCollection.ethnicGroupLabel));
 							}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
index 7c2da263c..caebbee49 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
@@ -26,7 +26,7 @@ import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.model.TextHelper;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -95,12 +95,12 @@ public class EditFromSelectionWizard extends Wizard implements
 			addPage(new NonViralNameWizardPage(formFactory,
 					selectionElement.getConversationHolder(),
 					(NonViralName) entity));
-		} else if (entity instanceof DerivedUnitBase) {
+		} else if (entity instanceof DerivedUnit) {
 
 			DerivedUnitFacade facade;
 			try {
 				facade = DerivedUnitFacade.NewInstance(
-						(DerivedUnitBase) entity,
+						(DerivedUnit) entity,
 						PreferencesUtil.getDerivedUnitConfigurator());
 			} catch (DerivedUnitFacadeNotSupportedException e) {
 				// we should never get here
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
index 48679257e..ac75ba86b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
@@ -145,7 +145,7 @@ public class EntitySelectionElement<T extends ICdmBase> extends
 
 	private void createControls(Composite parent, int style) {
 
-		label = formFactory.createLabel(getLayoutComposite(), labelString,
+		label = formFactory.createLabel(getLayoutComposite(), labelString + " : ",
 				SWT.NULL);
 
 		addControl(label);
@@ -442,7 +442,7 @@ public class EntitySelectionElement<T extends ICdmBase> extends
 	@Override
 	public String getLabel() {
 		if (label != null) {
-			return label.getText();
+			return label.getText() + " : ";
 		}
 		return null;
 	}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
index eeddbac30..2443ae63e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
@@ -17,7 +17,7 @@ import org.eclipse.ui.forms.SectionPart;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.model.IElementHasDetails;
 import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
@@ -79,11 +79,11 @@ public class CdmSectionPart<T> extends SectionPart implements
 					.setTaxonBase((TaxonBase) input);
 			return true;
 		}
-		if ((input instanceof DerivedUnitBase)
+		if ((input instanceof DerivedUnit)
 				&& (formSection instanceof IDerivedUnitFacadeDetailSection)) {
 
 			try {
-				input = DerivedUnitFacade.NewInstance((DerivedUnitBase) input,
+				input = DerivedUnitFacade.NewInstance((DerivedUnit) input,
 						PreferencesUtil.getDerivedUnitConfigurator());
 			} catch (DerivedUnitFacadeNotSupportedException e) {
 				StoreUtil.error(getClass(), e);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 6ae7c256f..813e6b782 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -1,9 +1,10 @@
+
 // $Id$
 /**
  * Copyright (C) 2011 EDIT
- * European Distributed Institute of Taxonomy
+ * European Distributed Institute of Taxonomy 
  * http://www.e-taxonomy.eu
- *
+ * 
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
@@ -37,10 +38,11 @@ import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
+
 import eu.etaxonomy.taxeditor.editor.UsageTermCollection;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -92,7 +94,7 @@ import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer;
 import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 
 /**
- *
+ * 
  * The DetailsViewer handles the content of the details view (
  * {@link DetailsViewPart}).<br>
  * Depending on the type of the selected element the section of the details view
@@ -104,571 +106,577 @@ import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
  */
 public class DetailsViewer extends AbstractCdmDataViewer {
 
-    private ISelection selection;
-
-    /**
-     * <p>
-     * Constructor for DetailsViewer.
-     * </p>
-     *
-     * @param parent
-     *            a {@link org.eclipse.swt.widgets.Composite} object.
-     * @param viewPart
-     *            a {@link eu.etaxonomy.taxeditor.view.AbstractCdmViewPart}
-     *            object.
-     */
-    public DetailsViewer(Composite parent, AbstractCdmViewPart viewPart) {
-        super(parent, viewPart);
-    }
-
-    // START HACK TO MAKE THE DERIVED UNIT FACADE WORK
-    // since we are getting implementations of DerivedUnitBase from the bulk
-    // editor
-    // and not derived unit facade objects,
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * eu.etaxonomy.taxeditor.editor.view.AbstractCdmDataViewer#setInput(java
-     * .lang.Object)
-     */
-    @Override
-    public void setInput(Object input) {
-        if (input instanceof DerivedUnitBase) {
-            try {
-                input = DerivedUnitFacade.NewInstance((DerivedUnitBase) input,
-                        PreferencesUtil.getDerivedUnitConfigurator());
-            } catch (DerivedUnitFacadeNotSupportedException e) {
+	private ISelection selection;
+
+	/**
+	 * <p>
+	 * Constructor for DetailsViewer.
+	 * </p>
+	 * 
+	 * @param parent
+	 *            a {@link org.eclipse.swt.widgets.Composite} object.
+	 * @param viewPart
+	 *            a {@link eu.etaxonomy.taxeditor.view.AbstractCdmViewPart}
+	 *            object.
+	 */
+	public DetailsViewer(Composite parent, AbstractCdmViewPart viewPart) {
+		super(parent, viewPart);
+	}
+
+	// START HACK TO MAKE THE DERIVED UNIT FACADE WORK
+	// since we are getting implementations of DerivedUnitBase from the bulk
+	// editor
+	// and not derived unit facade objects,
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * eu.etaxonomy.taxeditor.editor.view.AbstractCdmDataViewer#setInput(java
+	 * .lang.Object)
+	 */
+	@Override
+	public void setInput(Object input) {
+		if (input instanceof DerivedUnit) {
+			try {
+				input = DerivedUnitFacade.NewInstance((DerivedUnit) input,
+						PreferencesUtil.getDerivedUnitConfigurator());
+			} catch (DerivedUnitFacadeNotSupportedException e) {
                 AbstractUtility.error(getClass(), e);
-            }
-        }
-        super.setInput(input);
-    }
-
-    @Override
-    protected void markViewPartDirty() {
-        if (getInput() instanceof DerivedUnitFacade) {
+			}
+		}
+		super.setInput(input);
+	}
+
+	@Override
+	protected void markViewPartDirty() {
+		if (getInput() instanceof DerivedUnitFacade) {
             getViewPart().changed(((DerivedUnitFacade) getInput()).innerDerivedUnit());
-        }
-
-        super.markViewPartDirty();
-    }
-
-    // END HACK TO MAKE THE DERIVED UNIT FACADE WORK
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.Viewer#refresh()
-     */
-    /** {@inheritDoc} */
-    @Override
-    protected void showParts() {
-        // FIXME (CM) : Need to clean out this code.
-        // Too much type checking to decide which detail view to display.
-        // Need to build in a mechanism where navigators / editors are 'aware'
-        // of the corresponding detail viewer.
+		}
+
+		super.markViewPartDirty();
+	}
+
+	// END HACK TO MAKE THE DERIVED UNIT FACADE WORK
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.viewers.Viewer#refresh()
+	 */
+	/** {@inheritDoc} */
+	@Override
+	protected void showParts() {
+	    // FIXME (CM) : Need to clean out this code.
+	    // Too much type checking to decide which detail view to display.
+	    // Need to build in a mechanism where navigators / editors are 'aware'
+	    // of the corresponding detail viewer.
         Object input = getInput();
         if (input instanceof TaxonBase) {
-            createTaxonSections(rootElement);
+			createTaxonSections(rootElement);
 
         } else if (input instanceof NonViralName) {
-            createNameSections(rootElement);
+			createNameSections(rootElement);
 
         } else if (input instanceof Reference) {
-            createReferenceSections(rootElement);
+			createReferenceSections(rootElement);
 
         } else if (input instanceof Team) {
-            createTeamDetailSection(rootElement);
+			createTeamDetailSection(rootElement);
 
         } else if (input instanceof Person) {
-            createPersonDetailSection(rootElement);
+			createPersonDetailSection(rootElement);
 
         } else if (input instanceof TeamOrPersonBase) {
-            createTeamOrPersonBaseDetailSection(rootElement);
+			createTeamOrPersonBaseDetailSection(rootElement);
 
         } else if (input instanceof DescriptionBase) {
             Set<Marker> descriptionMarkers = ((DescriptionBase) input).getMarkers();
             MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(
                     UsageTermCollection.uuidUseMarkerType);
-            Boolean isUseDescription = false;
-            for (Marker marker : descriptionMarkers) {
-                if (marker.getMarkerType().equals(useMarkertype)) {
-                    isUseDescription = true;
-                }
-            }
+			Boolean isUseDescription = false;
+			for (Marker marker : descriptionMarkers) {
+				if (marker.getMarkerType().equals(useMarkertype)) {
+					isUseDescription = true;
+				}
+			}
             if (((DescriptionBase) input).isImageGallery()) {
-                createImageGallerySection(rootElement);
+				createImageGallerySection(rootElement);
 
-            } else if (isUseDescription) {
-                createUseDescriptionSection(rootElement);
-            } else {
-                createDescriptionSection(rootElement);
+			} else if (isUseDescription) { 
+				createUseDescriptionSection(rootElement);
+			} else {
+				createDescriptionSection(rootElement);
 
-            }
+			}
         } else if (input instanceof DescriptionElementBase) {
             Set<Marker> descriptionMarkers = ((DescriptionElementBase) input).getInDescription().getMarkers();
             MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(
                     UsageTermCollection.uuidUseMarkerType);
-            Boolean isUseDescription = false;
-            for (Marker marker : descriptionMarkers) {
-                if (marker.getMarkerType().equals(useMarkertype)) {
-                    isUseDescription = true;
-                }
-            }
-
+			Boolean isUseDescription = false;
+			for (Marker marker : descriptionMarkers) {
+				if (marker.getMarkerType().equals(useMarkertype)) {
+					isUseDescription = true;
+				}
+			}
+			
             if (isUseDescription == true && input instanceof CategoricalData) {
-                createUseRecordSection(rootElement);
+				createUseRecordSection(rootElement);
             } else {
-                createDescriptionElementSection(rootElement);
-            }
+				createDescriptionElementSection(rootElement);
+			}
 
         } else if (input instanceof Media) {
-            createMediaElementSection(rootElement);
+			createMediaElementSection(rootElement);
 
         } else if (input instanceof DerivedUnitFacade) {
-            createDerivedUnitBaseElementSection(rootElement);
+			createDerivedUnitBaseElementSection(rootElement);
 
         } else if (input instanceof FeatureNodeContainer) {
-            createFeatureDistributionSection(rootElement);
+			createFeatureDistributionSection(rootElement);
 
         } else if (input instanceof PolytomousKey) {
-            // createPolytomousKeySection(rootElement);
+			//createPolytomousKeySection(rootElement);
 
         } else if ((input instanceof PolytomousKeyNode) || (input instanceof PolytomousKeyRelationship)) {
-            createPolytomousKeyNodeSection(rootElement);
+			createPolytomousKeyNodeSection(rootElement);
         } else if (input instanceof User) {
-            createUserSection(rootElement);
+			createUserSection(rootElement);
         } else if (input instanceof Group) {
-            createGroupSection(rootElement);
+			createGroupSection(rootElement);
         } else if (input instanceof TaxonRelationship) {
-            createTaxonRelationshipSection(rootElement);
+			createTaxonRelationshipSection(rootElement);
         } else if (input instanceof TermVocabulary) {
-            createTermVocabularySection(rootElement);
+			createTermVocabularySection(rootElement);
         } else if (input instanceof DefinedTermBase) {
-            createDefinedTermSection(rootElement);
-        } else {
-            destroySections();
-        }
-        layout();
-    }
-
-    /**
-     * @param rootElement
-     */
-    private void createGroupSection(RootElement parent) {
-        destroySections();
+			createDefinedTermSection(rootElement);
+		} else {
+			destroySections();
+		}
+		layout();
+	}
+
+	
+	/**
+	 * @param rootElement
+	 */
+	private void createGroupSection(RootElement parent) {
+		destroySections();
 
         GroupDetailSection groupDetailSection = formFactory.createGroupDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE| ExpandableComposite.EXPANDED);
         MemberDetailSection memberDetailSection = formFactory.createMemberDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
         GrantedAuthorityDetailSection grantedAuthorityDetailSection = formFactory.createGrantedAuthorityDetailSection(getConversationHolder(), parent,ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        addPart(groupDetailSection);
-        addPart(memberDetailSection);
-        addPart(grantedAuthorityDetailSection);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.Viewer#getSelection()
-     */
-    /** {@inheritDoc} */
-    @Override
-    public ISelection getSelection() {
-        return selection;
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.jface.viewers.Viewer#setSelection(org.eclipse.jface.viewers
-     * .ISelection, boolean)
-     */
-    /** {@inheritDoc} */
-    @Override
-    public void setSelection(ISelection selection, boolean reveal) {
-        this.selection = selection;
+		addPart(groupDetailSection);
+		addPart(memberDetailSection);
+		addPart(grantedAuthorityDetailSection);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.jface.viewers.Viewer#getSelection()
+	 */
+	/** {@inheritDoc} */
+	@Override
+	public ISelection getSelection() {
+		return selection;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.jface.viewers.Viewer#setSelection(org.eclipse.jface.viewers
+	 * .ISelection, boolean)
+	 */
+	/** {@inheritDoc} */
+	@Override
+	public void setSelection(ISelection selection, boolean reveal) {
+		this.selection = selection;
         SelectionChangedEvent selectionChangedEvent = new SelectionChangedEvent(this, selection);
-        fireSelectionChanged(selectionChangedEvent);
-    }
+		fireSelectionChanged(selectionChangedEvent);
+	}
 
-    /**
-     * createTaxonSections(RootElement parent)
+	/**
+	 * createTaxonSections(RootElement parent)
      *
-     * @param parent
-     */
-    private void createTaxonSections(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createTaxonSections(RootElement parent) {
+		destroySections();
 
         TaxonBaseDetailSection taxonBaseDetailSection = formFactory.createTaxonBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         NonViralNameDetailSection nonViralNameSection = formFactory.createNonViralNameDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE
                         | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         NomenclaturalStatusSection nomenclaturalStatusSection = formFactory.createNomenclaturalStatusSection(getConversationHolder(), parent,ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         ProtologueSection protologSection = formFactory.createProtologueSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         TypeDesignationSection typeDesignationSection = formFactory.createTypeDesignationSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         NameRelationshipDetailSection nameRelationshipSection = formFactory.createNameRelationshipDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         ParsingMessagesSection parsingMessagesSection = formFactory.createParsingMessagesSection(getConversationHolder(), parent, this, ExpandableComposite.EXPANDED);
 
-        addPart(taxonBaseDetailSection);
-        addPart(nonViralNameSection);
-        addPart(nomenclaturalStatusSection);
-        addPart(protologSection);
-        addPart(referenceDetailSection);
-        addPart(typeDesignationSection);
-        addPart(nameRelationshipSection);
-        addPart(parsingMessagesSection);
-    }
-
-    /**
-     * createNameSections
+		addPart(taxonBaseDetailSection);
+		addPart(nonViralNameSection);
+		addPart(nomenclaturalStatusSection);
+		addPart(protologSection);
+		addPart(referenceDetailSection);
+		addPart(typeDesignationSection);
+		addPart(nameRelationshipSection);
+		addPart(parsingMessagesSection);
+	}
+
+	/**
+	 * createNameSections
      *
-     * @param parent
-     */
-    private void createNameSections(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createNameSections(RootElement parent) {
+		destroySections();
         NonViralNameDetailSection nonViralNameSection = formFactory.createNonViralNameDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         NomenclaturalStatusSection nomenclaturalStatusSection = formFactory.createNomenclaturalStatusSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         ProtologueSection protologSection = formFactory.createProtologueSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         TypeDesignationSection typeDesignationSection = formFactory.createTypeDesignationSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         NameRelationshipDetailSection nameRelationshipSection = formFactory.createNameRelationshipDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
-        addPart(nonViralNameSection);
-        addPart(nomenclaturalStatusSection);
-        addPart(protologSection);
-        addPart(referenceDetailSection);
-        addPart(typeDesignationSection);
-        addPart(nameRelationshipSection);
-    }
+		addPart(nonViralNameSection);
+		addPart(nomenclaturalStatusSection);
+		addPart(protologSection);
+		addPart(referenceDetailSection);
+		addPart(typeDesignationSection);
+		addPart(nameRelationshipSection);
+	}
 
-    /**
-     * createReferenceSections
+	/**
+	 * createReferenceSections
      *
-     * @param parent
-     */
-    private void createReferenceSections(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createReferenceSections(RootElement parent) {
+		destroySections();
 
         ReferenceDetailSection referenceDetailSection = formFactory.createReferenceDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        addPart(referenceDetailSection);
-    }
+		addPart(referenceDetailSection);
+	}
 
-    /**
-     * createTeamOrPersonBaseDetailSection
+	/**
+	 * createTeamOrPersonBaseDetailSection
      *
-     * @param parent
-     */
-    private void createTeamOrPersonBaseDetailSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createTeamOrPersonBaseDetailSection(RootElement parent) {
+		destroySections();
         TeamOrPersonBaseDetailSection teamOrPersonBaseDetailSection = formFactory.createTeamOrPersonBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        addPart(teamOrPersonBaseDetailSection);
-    }
+		addPart(teamOrPersonBaseDetailSection);
+	}
 
-    /**
-     * createTeamDetailSection
+	/**
+	 * createTeamDetailSection
      *
-     * @param parent
-     */
-    private void createTeamDetailSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createTeamDetailSection(RootElement parent) {
+		destroySections();
         TeamDetailSection teamDetailSection = formFactory.createTeamDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        addPart(teamDetailSection);
-    }
-
-    /**
-     * createPersonDetailSection
+		addPart(teamDetailSection);
+	}
+	
+	/**
+	 * createPersonDetailSection
      *
-     * @param parent
-     */
-    private void createPersonDetailSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createPersonDetailSection(RootElement parent) {
+		destroySections();
         PersonDetailSection personDetailSection = formFactory.createPersonDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-        addPart(personDetailSection);
-    }
+		addPart(personDetailSection);
+	}
 
-    /**
-     * createDescriptionElementSection
+	/**
+	 * createDescriptionElementSection
      *
-     * @param parent
-     */
-    private void createDescriptionElementSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createDescriptionElementSection(RootElement parent) {
+		destroySections();
 
         DescriptionElementDetailSection descriptionElementDetailSection = formFactory.createDescriptionElementDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         DescriptionElementSourceSection descriptionElementSourceSection = formFactory.createDescriptionElementSourceSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         DescriptionElementMediaSection descriptionElementMediaSection = formFactory.createDescriptionElementMediaSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
-        addPart(descriptionElementDetailSection);
-        addPart(descriptionElementSourceSection);
-        addPart(descriptionElementMediaSection);
-    }
+		addPart(descriptionElementDetailSection);
+		addPart(descriptionElementSourceSection);
+		addPart(descriptionElementMediaSection);
+	}
 
-    /**
-     * createDescriptionSection
+	/**
+	 * createDescriptionSection
      *
-     * @param parent
-     */
-    private void createDescriptionSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createDescriptionSection(RootElement parent) {
+		destroySections();
         DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         NaturalLanguageSection naturalLanguageSection = formFactory.createNaturalLanguageSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         DescribedSpecimenSection describedSpecimenSection = formFactory.createDescribedSpecimenSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
-        DescriptionSourceSection descriptionSourceSection = formFactory.createDescriptionSourceSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
-
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+//		DescriptionSourceSection descriptionSourceSection = (DescriptionSourceSection) formFactory
+//				.createEntityDetailSection(EntityDetailType.DESCRIPTIONSOURCE,
+//						getConversationHolder(), parent, Section.TWISTIE);
+//
+//		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         ScopeSection scopeSection = formFactory.createScopeSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-
-        addPart(descriptionDetailSection);
-        addPart(naturalLanguageSection);
-        addPart(describedSpecimenSection);
-        addPart(descriptionSourceSection);
-        addPart(scopeSection);
-    }
-
-    /**
-     * Creates the use Description section
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+
+		addPart(descriptionDetailSection);
+		addPart(naturalLanguageSection);
+		addPart(describedSpecimenSection);
+//		addPart(descriptionSourceSection);
+		addPart(scopeSection);
+	}
+	
+	/**
+	 * Creates the use Description section
      *
-     * @param parent
-     */
-    private void createUseDescriptionSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createUseDescriptionSection(RootElement parent) {
+		destroySections();
         DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         DescriptionSourceSection descriptionSourceSection = formFactory.createDescriptionSourceSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
-        addPart(descriptionDetailSection);
-        addPart(descriptionSourceSection);
+		addPart(descriptionDetailSection);
+		addPart(descriptionSourceSection);
+		
+	}
 
-    }
 
-    /**
-     * @param rootElement
-     */
-    private void createImageGallerySection(RootElement parent) {
-        destroySections();
+	/**
+	 * @param rootElement
+	 */
+	private void createImageGallerySection(RootElement parent) {
+		destroySections();
         DescriptionDetailSection descriptionDetailSection = formFactory.createDescriptionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        addPart(descriptionDetailSection);
-    }
-
-    /**
-     * createMediaElementSection
+		addPart(descriptionDetailSection);
+	}
+	
+	/**
+	 * createMediaElementSection
      *
-     * @param parent
-     */
+	 * @param parent
+	 */
 
-    private void createMediaElementSection(RootElement parent) {
-        destroySections();
+	private void createMediaElementSection(RootElement parent) {
+		destroySections();
         MediaDetailsSection mediaDetailSection = formFactory.createMediaDetailsSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        addPart(mediaDetailSection);
-    }
+		addPart(mediaDetailSection);
+	}
 
-    /**
-     * createDerivedUnitBaseElementSection
+	/**
+	 * createDerivedUnitBaseElementSection
      *
-     * @param parent
-     */
-    private void createDerivedUnitBaseElementSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createDerivedUnitBaseElementSection(RootElement parent) {
+		destroySections();
 
         GeneralDetailSection generalDetailSection = formFactory.createGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         GatheringEventDetailSection gatheringEventDetailSection = formFactory.createGatheringEventDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         FieldObservationDetailSection fieldObservationDetailSection = formFactory.createFieldObservationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = formFactory.createDerivedUnitBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         DeterminationDetailSection determinationDetailSection = formFactory.createDeterminationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
 
-        addPart(generalDetailSection);
-        addPart(gatheringEventDetailSection);
-        addPart(fieldObservationDetailSection);
-        addPart(derivedUnitBaseDetailSection);
-        addPart(determinationDetailSection);
-    }
+		addPart(generalDetailSection);
+		addPart(gatheringEventDetailSection);
+		addPart(fieldObservationDetailSection);
+		addPart(derivedUnitBaseDetailSection);
+		addPart(determinationDetailSection);
 
-    /**
-     * @param rootElement
-     */
-    private void createFeatureDistributionSection(RootElement parent) {
-        destroySections();
+	}
+
+	/**
+	 * @param rootElement
+	 */
+	private void createFeatureDistributionSection(RootElement parent) {
+		destroySections();
 
         FeatureDistributionDetailSection featureDistributionSection = formFactory.createFeatureDistributionDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        addPart(featureDistributionSection);
-    }
+		addPart(featureDistributionSection);
+	}
 
-    /**
-     * createPolytomousKeyNodeSection
+	/**
+	 * createPolytomousKeyNodeSection
      *
-     * @param parent
-     */
-    private void createPolytomousKeyNodeSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createPolytomousKeyNodeSection(RootElement parent) {
+		destroySections();
 
         PolytomousKeyDetailSection polytomousKeyDetailSection = formFactory.createPolytomousKeyDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.COMPACT);
-
+        
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-
+        
         PolytomousKeyNodeDetailSection polytomousKeyNodeDetailSection = formFactory.createPolytomousKeyNodeDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         TaxonomicScopeSection taxonomicScopeSection = formFactory.createTaxonomicScopeSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.COMPACT);
 
-        addPart(polytomousKeyDetailSection);
-        addPart(polytomousKeyNodeDetailSection);
-        addPart(taxonomicScopeSection);
-
-    }
+	    addPart(polytomousKeyDetailSection);
+	    addPart(polytomousKeyNodeDetailSection);
+	    addPart(taxonomicScopeSection);
 
-    /**
-     * create the UseRecordSection
+	}
+	
+	/**
+	 * create the UseRecordSection
      *
-     * @param parent
-     */
-    private void createUseRecordSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createUseRecordSection(RootElement parent) {
+		destroySections();
 
         UseRecordDetailSection descriptionUseRecordSection = formFactory.createUseRecordDetailSection(getConversationHolder(), parent, this,ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-
-        addPart(descriptionUseRecordSection);
+		formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+		
+		addPart(descriptionUseRecordSection);
+		
+		
+	}
 
-    }
-
-    /**
-     * createUserSection
+	/**
+	 * createUserSection
      *
-     * @param parent
-     */
-    private void createUserSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createUserSection(RootElement parent) {
+		destroySections();
 
         UserDetailSection userDetailSection = formFactory.createUserDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
         GroupsByUserDetailSection groupByUserDetailSection = formFactory.createGroupsByUserDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
-        addPart(userDetailSection);
-        addPart(groupByUserDetailSection);
-    }
+		addPart(userDetailSection);
+		addPart(groupByUserDetailSection);
+	}
 
-    /**
-     * createTaxonRelationshipSection
+	/**
+	 * createTaxonRelationshipSection
      *
-     * @param parent
-     */
-    private void createTaxonRelationshipSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createTaxonRelationshipSection(RootElement parent) {
+		destroySections();
 
         TaxonRelationshipDetailSection taxonRelationshipDetailSection = formFactory.createTaxonRelationshipDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 
         ReferencedEntityDetailSection referencedEntityBaseDetailSection = formFactory.createReferencedEntityDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-        addPart(taxonRelationshipDetailSection);
-        addPart(referencedEntityBaseDetailSection);
-    }
+		addPart(taxonRelationshipDetailSection);
+		addPart(referencedEntityBaseDetailSection);
+	}
 
-    /**
-     * @param rootElement
-     */
-    private void createTermVocabularySection(RootElement parent) {
-        destroySections();
+	/**
+	 * @param rootElement
+	 */
+	private void createTermVocabularySection(RootElement parent) {
+		destroySections();
 
         TermVocabularyDetailSection termVocabularyDetailSection = formFactory.createTermVocabularyDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-        addPart(termVocabularyDetailSection);
-    }
+		addPart(termVocabularyDetailSection);
+	}
 
-    /**
-     * createDefinedTermSection
+	/**
+	 * createDefinedTermSection
      *
-     * @param parent
-     */
-    private void createDefinedTermSection(RootElement parent) {
-        destroySections();
+	 * @param parent
+	 */
+	private void createDefinedTermSection(RootElement parent) {
+		destroySections();
 
         AbstractFormSection definedTermDetailSection = formFactory.createDefinedTermDetailSection(getInput().getClass(), getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-        addPart(definedTermDetailSection);
-    }
+		addPart(definedTermDetailSection);
+	}
 
     private void createFODetailsView(RootElement parent) {
         destroySections();
diff --git a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
index 63c1e666a..7d0868eff 100644
--- a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
+++ b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
@@ -5273,7 +5273,7 @@
   <REPRESENTATION ID="963" CREATED="2009-01-28 17:07:04.0" UUID="3c05a6f5-8799-4d36-85ee-135f01bee90c" TEXT="TDWG Level 2" ABBREVIATEDLABEL="" LABEL="TDWG Level 2" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="964" CREATED="2009-01-28 17:07:04.0" UUID="010f5578-5a9e-4d9c-94fe-2302a9e14dfd" TEXT=" &quot;TDWG Level 1" ABBREVIATEDLABEL="" LABEL="TDWG Level 1" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="965" CREATED="2009-01-28 17:07:04.0" UUID="1db3d6d4-a65b-4ee8-b5dd-0b1e9539de5b" TEXT="eu.etaxonomy.cdm.model.name.NomenclaturalCode" LABEL="NomenclaturalCode" LANGUAGE_ID="406"/>
-  <REPRESENTATION ID="966" CREATED="2009-01-28 17:07:04.0" UUID="4ba9790d-8749-48ec-89ce-3d104e3673a8" TEXT="ICBN" ABBREVIATEDLABEL="" LABEL="International Code of Botanical Nomenclature" LANGUAGE_ID="406"/>
+  <REPRESENTATION ID="966" CREATED="2009-01-28 17:07:04.0" UUID="4ba9790d-8749-48ec-89ce-3d104e3673a8" TEXT="ICNAFP" ABBREVIATEDLABEL="" LABEL="International Code of Botanical Nomenclature" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="967" CREATED="2009-01-28 17:07:04.0" UUID="42222d02-7af4-4eb9-87bb-020fe08ee1b8" TEXT="ICVCN" ABBREVIATEDLABEL="" LABEL="International Code of Virus Classification and Nomenclature" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="968" CREATED="2009-01-28 17:07:04.0" UUID="8c5d79e3-3ff6-4781-a298-71ea07fe7a85" TEXT="ICZN" ABBREVIATEDLABEL="" LABEL="International Code of Zoological Nomenclature" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="969" CREATED="2009-01-28 17:07:04.0" UUID="068331bf-a9da-4182-96b7-b9f7e8aa0238" TEXT="ICNCP" ABBREVIATEDLABEL="" LABEL="International Code of Nomenclature for Cultivated Plants" LANGUAGE_ID="406"/>
diff --git a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
index 63c1e666a..7d0868eff 100644
--- a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
+++ b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml
@@ -5273,7 +5273,7 @@
   <REPRESENTATION ID="963" CREATED="2009-01-28 17:07:04.0" UUID="3c05a6f5-8799-4d36-85ee-135f01bee90c" TEXT="TDWG Level 2" ABBREVIATEDLABEL="" LABEL="TDWG Level 2" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="964" CREATED="2009-01-28 17:07:04.0" UUID="010f5578-5a9e-4d9c-94fe-2302a9e14dfd" TEXT=" &quot;TDWG Level 1" ABBREVIATEDLABEL="" LABEL="TDWG Level 1" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="965" CREATED="2009-01-28 17:07:04.0" UUID="1db3d6d4-a65b-4ee8-b5dd-0b1e9539de5b" TEXT="eu.etaxonomy.cdm.model.name.NomenclaturalCode" LABEL="NomenclaturalCode" LANGUAGE_ID="406"/>
-  <REPRESENTATION ID="966" CREATED="2009-01-28 17:07:04.0" UUID="4ba9790d-8749-48ec-89ce-3d104e3673a8" TEXT="ICBN" ABBREVIATEDLABEL="" LABEL="International Code of Botanical Nomenclature" LANGUAGE_ID="406"/>
+  <REPRESENTATION ID="966" CREATED="2009-01-28 17:07:04.0" UUID="4ba9790d-8749-48ec-89ce-3d104e3673a8" TEXT="ICNAFP" ABBREVIATEDLABEL="" LABEL="International Code of Botanical Nomenclature" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="967" CREATED="2009-01-28 17:07:04.0" UUID="42222d02-7af4-4eb9-87bb-020fe08ee1b8" TEXT="ICVCN" ABBREVIATEDLABEL="" LABEL="International Code of Virus Classification and Nomenclature" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="968" CREATED="2009-01-28 17:07:04.0" UUID="8c5d79e3-3ff6-4781-a298-71ea07fe7a85" TEXT="ICZN" ABBREVIATEDLABEL="" LABEL="International Code of Zoological Nomenclature" LANGUAGE_ID="406"/>
   <REPRESENTATION ID="969" CREATED="2009-01-28 17:07:04.0" UUID="068331bf-a9da-4182-96b7-b9f7e8aa0238" TEXT="ICNCP" ABBREVIATEDLABEL="" LABEL="International Code of Nomenclature for Cultivated Plants" LANGUAGE_ID="406"/>