diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
index 15f720caef3e3fb06d8c028b554583c9811ee17e..b6f31f5c6be3e0a7167e1c7d06527e63b5dff019 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Experiment.java
@@ -47,11 +47,6 @@ class Experiment extends ExperimentImmutable implements IExperiment
     {
         return false;
     }
-    
-    public void setCode(String code)
-    {
-        getExperiment().setCode(code);
-    }
 
     public void setPropertyValue(String propertyCode, String propertyValue)
     {
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
index b49cd4ceeea9e1d5281263ec9a7528ad9d05409d..9a101208e37018c1b6eda3be7d9c80d5773da8b5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java
@@ -64,11 +64,6 @@ class ExperimentImmutable implements IExperimentImmutable
         return EntityHelper.tryFindPropertyValue(experiment, propertyCode);
     }
 
-    public String getCode()
-    {
-        return experiment.getCode();
-    }
-
     public String getType()
     {
         if (experiment.getExperimentType() != null)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
index 4c7206be08c2e8e3cf947d62b2bc347c8d826194..2f035ce26023f4e97d2defa70fb1706806f9a148 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java
@@ -16,8 +16,12 @@
 
 package ch.systemsx.cisd.etlserver.registrator.api.v1.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import ch.systemsx.cisd.etlserver.registrator.api.v1.IExperimentImmutable;
 import ch.systemsx.cisd.etlserver.registrator.api.v1.ISample;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
 import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper;
 
@@ -27,29 +31,28 @@ import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper;
 public class Sample extends SampleImmutable implements ISample
 {
 
+    public Sample(ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample sample)
+    {
+        super(sample);
+    }
+
     public Sample(String sampleIdentifier, String permId)
     {
         super(new ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample());
         getSample().setIdentifier(sampleIdentifier);
         getSample().setPermId(permId);
-    }
 
-    public Sample(ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample sample)
-    {
-        super(sample);
+        List<IEntityProperty> properties = new ArrayList<IEntityProperty>();
+        getSample().setProperties(properties);
     }
 
+
     public void setExperiment(IExperimentImmutable experiment)
     {
         ExperimentImmutable exp = (ExperimentImmutable) experiment;
         getSample().setExperiment(exp.getExperiment());
     }
 
-    public void setCode(String code)
-    {
-        getSample().setCode(code);
-    }
-
     public void setPropertyValue(String propertyCode, String propertyValue)
     {
         EntityHelper.createOrUpdateProperty(getSample(), propertyCode, propertyValue);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
index efdb2918242abc4002945d71afdb0ff77deddcca..b69116947b51fa42794f8adef0529aadf55a1ac8 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java
@@ -45,11 +45,6 @@ public class SampleImmutable implements ISampleImmutable
         return sample.getIdentifier();
     }
 
-    public String getCode()
-    {
-        return sample.getCode();
-    }
-
     public ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample getSample()
     {
         return sample;