diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformer.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformer.java
index 2e4d7a056c783d6ee0a70fce3d33c28993f1f4ef..9c061da84106894e4e64e2ee581ba8de67016789 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformer.java
@@ -32,7 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.log4j.Logger;
 
-import ch.systemsx.cisd.base.annotation.JsonObject;
 import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.base.image.IStreamingImageTransformer;
 import ch.systemsx.cisd.base.utilities.OSUtilities;
@@ -56,7 +55,6 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.utils.ImageUtil;
  * 
  * @author Kaloyan Enimanev
  */
-@JsonObject(value="ConvertToolImageTransformer")
 public class ConvertToolImageTransformer implements IStreamingImageTransformer
 {
 
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformerFactory.java
index df3e6e75f22ccbce3b00565312ca44c7e5b7ec6a..126ad24c5688b401e240ac13af61547d67477306 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformerFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/transformations/ConvertToolImageTransformerFactory.java
@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations;
 
+import ch.systemsx.cisd.base.annotation.JsonObject;
 import ch.systemsx.cisd.base.image.IStreamingImageTransformerFactory;
 
 /**
@@ -28,6 +29,7 @@ import ch.systemsx.cisd.base.image.IStreamingImageTransformerFactory;
  * 
  * @author Kaloyan Enimanev
  */
+@JsonObject(value="ConvertToolImageTransformerFactory")
 public class ConvertToolImageTransformerFactory implements IStreamingImageTransformerFactory
 {
     private static final long serialVersionUID = 1L;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
index 7889caaf29fe3dcd855585de92e8deef5382561a..51e8ca6a3ae5705456baee1395d0fe6aca71ab30 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformer.java
@@ -16,7 +16,6 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
 
-import ch.systemsx.cisd.base.annotation.JsonObject;
 import ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImageTransformerFactory.ToolChoice;
 
 /**
@@ -26,7 +25,6 @@ import ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImage
  * 
  * @author Jakub Straszewski
  */
-@JsonObject(value="ConvertToolImageTransformer_obsolete")
 public class ConvertToolImageTransformer extends
         ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImageTransformer
 {
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java
index 9b63be17052c007b657a1eff51fca562cdd38e00..7bd9e8cef0c22c8d5a69ac527fbc352d30d5f596 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/transformations/ConvertToolImageTransformerFactory.java
@@ -16,6 +16,8 @@
 
 package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
 
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
 /**
  * This class is obsolete, and should not be used. Use
  * {@link ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImageTransformerFactory}
@@ -23,6 +25,7 @@ package ch.systemsx.cisd.openbis.dss.etl.dto.api.v1.transformations;
  * 
  * @author Jakub Straszewski
  */
+@JsonObject(value="ConvertToolImageTransformerFactory_obsolete")
 public class ConvertToolImageTransformerFactory extends
         ch.systemsx.cisd.openbis.dss.etl.dto.api.transformations.ConvertToolImageTransformerFactory
 {