diff --git a/applications/plugins/image/CollisionToCarvingEngine.cpp b/applications/plugins/image/CollisionToCarvingEngine.cpp
index 90441fddb5f..f0584b3c09d 100644
--- a/applications/plugins/image/CollisionToCarvingEngine.cpp
+++ b/applications/plugins/image/CollisionToCarvingEngine.cpp
@@ -35,49 +35,47 @@ namespace engine
 
 using namespace defaulttype;
 
-int CollisionToCarvingEngineClass = core::RegisterObject("Filter an image")
-        .add<CollisionToCarvingEngine<ImageUC,ImageUC    > >(true)
-        .add<CollisionToCarvingEngine<ImageD ,ImageD     > >()
-
-        .add<CollisionToCarvingEngine<ImageUC,ImageD    > >()
-
-        .add<CollisionToCarvingEngine<ImageD,ImageUC    > >()
-        .add<CollisionToCarvingEngine<ImageD,ImageB    > >()
-#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<CollisionToCarvingEngine<ImageC ,ImageC     > >()
-        .add<CollisionToCarvingEngine<ImageI ,ImageI     > >()
-        .add<CollisionToCarvingEngine<ImageUI,ImageUI    > >()
-        .add<CollisionToCarvingEngine<ImageS ,ImageS     > >()
-        .add<CollisionToCarvingEngine<ImageUS,ImageUS    > >()
-        .add<CollisionToCarvingEngine<ImageL ,ImageL     > >()
-        .add<CollisionToCarvingEngine<ImageUL,ImageUL    > >()
-        .add<CollisionToCarvingEngine<ImageF ,ImageF     > >()
-        .add<CollisionToCarvingEngine<ImageB ,ImageB     > >()
-
-        .add<CollisionToCarvingEngine<ImageC ,ImageD     > >()
-        .add<CollisionToCarvingEngine<ImageI ,ImageD     > >()
-        .add<CollisionToCarvingEngine<ImageUI,ImageD    > >()
-        .add<CollisionToCarvingEngine<ImageS ,ImageD     > >()
-        .add<CollisionToCarvingEngine<ImageUS,ImageD    > >()
-        .add<CollisionToCarvingEngine<ImageL ,ImageD     > >()
-        .add<CollisionToCarvingEngine<ImageUL,ImageD    > >()
-        .add<CollisionToCarvingEngine<ImageF ,ImageD     > >()
-        .add<CollisionToCarvingEngine<ImageB ,ImageD     > >()
-
-        .add<CollisionToCarvingEngine<ImageUS,ImageUC    > >()
-        .add<CollisionToCarvingEngine<ImageUC,ImageUS    > >()
-        .add<CollisionToCarvingEngine<ImageUC,ImageB    > >()
-        .add<CollisionToCarvingEngine<ImageUS,ImageB    > >()
+void registerCollisionToCarvingEngine(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Filter an image")
+    .add<CollisionToCarvingEngine<ImageUC,ImageUC    > >(true)
+    .add<CollisionToCarvingEngine<ImageD, ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageUC,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageD, ImageUC    > >()
+    .add<CollisionToCarvingEngine<ImageD, ImageB     > >()
+    #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
+    .add<CollisionToCarvingEngine<ImageC ,ImageC     > >()
+    .add<CollisionToCarvingEngine<ImageI ,ImageI     > >()
+    .add<CollisionToCarvingEngine<ImageUI,ImageUI    > >()
+    .add<CollisionToCarvingEngine<ImageS ,ImageS     > >()
+    .add<CollisionToCarvingEngine<ImageUS,ImageUS    > >()
+    .add<CollisionToCarvingEngine<ImageL ,ImageL     > >()
+    .add<CollisionToCarvingEngine<ImageUL,ImageUL    > >()
+    .add<CollisionToCarvingEngine<ImageF ,ImageF     > >()
+    .add<CollisionToCarvingEngine<ImageB ,ImageB     > >()
+
+    .add<CollisionToCarvingEngine<ImageC ,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageI ,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageUI,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageS ,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageUS,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageL ,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageUL,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageF ,ImageD     > >()
+    .add<CollisionToCarvingEngine<ImageB ,ImageD     > >()
+
+    .add<CollisionToCarvingEngine<ImageUS,ImageUC    > >()
+    .add<CollisionToCarvingEngine<ImageUC,ImageUS    > >()
+    .add<CollisionToCarvingEngine<ImageUC,ImageB     > >()
+    .add<CollisionToCarvingEngine<ImageUS,ImageB     > >()
 #endif // PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        ;
-
-
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC  ,ImageUC    >;
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD   ,ImageD     >;
-
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC  ,ImageD    >;
+    );
+}
 
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD  ,ImageUC    >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageUC   >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD  ,ImageD    >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC ,ImageD    >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD  ,ImageUC   >;
 template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageD  ,ImageB    >;
 
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
@@ -93,18 +91,18 @@ template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageB   ,ImageB     >;
 
 template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageC   ,ImageD     >;
 template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageI   ,ImageD     >;
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUI  ,ImageD    >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUI  ,ImageD     >;
 template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageS   ,ImageD     >;
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS  ,ImageD    >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS  ,ImageD     >;
 template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageL   ,ImageD     >;
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUL  ,ImageD    >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUL  ,ImageD     >;
 template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageF   ,ImageD     >;
 template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageB   ,ImageD     >;
 
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS   ,ImageUC     >;
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC   ,ImageUS     >;
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC   ,ImageB     >;
-template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS   ,ImageB     >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS  ,ImageUC    >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC  ,ImageUS    >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUC  ,ImageB     >;
+template class SOFA_IMAGE_API CollisionToCarvingEngine<ImageUS  ,ImageB     >;
 #endif // PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
 
 } //
diff --git a/applications/plugins/image/DepthMapToMeshEngine.cpp b/applications/plugins/image/DepthMapToMeshEngine.cpp
index 2f852a9fa06..56b26a1d1f0 100644
--- a/applications/plugins/image/DepthMapToMeshEngine.cpp
+++ b/applications/plugins/image/DepthMapToMeshEngine.cpp
@@ -35,21 +35,25 @@ namespace engine
 
 using namespace defaulttype;
 
-int DepthMapToMeshEngineClass = core::RegisterObject("Compute a mesh from a depth map image ")
-        .add<DepthMapToMeshEngine<ImageUC> >(true)
-        .add<DepthMapToMeshEngine<ImageD> >()
-        .add<DepthMapToMeshEngine<ImageB> >()
+void registerDepthMapToMeshEngine(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Compute a mesh from a depth map image")
+    .add<DepthMapToMeshEngine<ImageUC> >(true)
+    .add<DepthMapToMeshEngine<ImageD> >()
+    .add<DepthMapToMeshEngine<ImageB> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<DepthMapToMeshEngine<ImageC> >()
-        .add<DepthMapToMeshEngine<ImageI> >()
-        .add<DepthMapToMeshEngine<ImageUI> >()
-        .add<DepthMapToMeshEngine<ImageS> >()
-        .add<DepthMapToMeshEngine<ImageUS> >()
-        .add<DepthMapToMeshEngine<ImageL> >()
-        .add<DepthMapToMeshEngine<ImageUL> >()
-        .add<DepthMapToMeshEngine<ImageF> >()
-#endif
-        ;
+    .add<DepthMapToMeshEngine<ImageC> >()
+    .add<DepthMapToMeshEngine<ImageI> >()
+    .add<DepthMapToMeshEngine<ImageUI> >()
+    .add<DepthMapToMeshEngine<ImageS> >()
+    .add<DepthMapToMeshEngine<ImageUS> >()
+    .add<DepthMapToMeshEngine<ImageL> >()
+    .add<DepthMapToMeshEngine<ImageUL> >()
+    .add<DepthMapToMeshEngine<ImageF> >()
+#endif    
+        );
+}
+
 
 template class SOFA_IMAGE_API DepthMapToMeshEngine<ImageUC>;
 template class SOFA_IMAGE_API DepthMapToMeshEngine<ImageD>;
diff --git a/applications/plugins/image/GenerateImage.cpp b/applications/plugins/image/GenerateImage.cpp
index 1eea30cfbc6..0a6ac6c677a 100644
--- a/applications/plugins/image/GenerateImage.cpp
+++ b/applications/plugins/image/GenerateImage.cpp
@@ -35,21 +35,25 @@ namespace engine
 
 using namespace defaulttype;
 
-int GenerateImageClass = core::RegisterObject("Create an image with custom dimensions")
-        .add<GenerateImage<ImageUC> >(true)
-        .add<GenerateImage<ImageD> >()
-        .add<GenerateImage<ImageB> >()
+void registerGenerateImage(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Create an image with custom dimensions")
+    .add<GenerateImage<ImageUC> >(true)
+    .add<GenerateImage<ImageD> >()
+    .add<GenerateImage<ImageB> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<GenerateImage<ImageC> >()
-        .add<GenerateImage<ImageI> >()
-        .add<GenerateImage<ImageUI> >()
-        .add<GenerateImage<ImageS> >()
-        .add<GenerateImage<ImageUS> >()
-        .add<GenerateImage<ImageL> >()
-        .add<GenerateImage<ImageUL> >()
-        .add<GenerateImage<ImageF> >()
+    .add<GenerateImage<ImageC> >()
+    .add<GenerateImage<ImageI> >()
+    .add<GenerateImage<ImageUI> >()
+    .add<GenerateImage<ImageS> >()
+    .add<GenerateImage<ImageUS> >()
+    .add<GenerateImage<ImageL> >()
+    .add<GenerateImage<ImageUL> >()
+    .add<GenerateImage<ImageF> >()
 #endif
-        ;
+    );
+}
+
 
 template class SOFA_IMAGE_API GenerateImage<ImageUC>;
 template class SOFA_IMAGE_API GenerateImage<ImageD>;
diff --git a/applications/plugins/image/ImageCoordValuesFromPositions.cpp b/applications/plugins/image/ImageCoordValuesFromPositions.cpp
index 1773b59c1e3..75a69ca1c43 100644
--- a/applications/plugins/image/ImageCoordValuesFromPositions.cpp
+++ b/applications/plugins/image/ImageCoordValuesFromPositions.cpp
@@ -35,10 +35,13 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageCoordValuesFromPositionsClass = core::RegisterObject("Get interpolated coordinates at sample locations in an image with 3 channels")
-        .add<ImageCoordValuesFromPositions<ImageD> >(true)
-        .add<ImageCoordValuesFromPositions<ImageF> >()
-        ;
+void registerImageCoordValuesFromPositions(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Get interpolated coordinates at sample locations in an image with 3 channels")
+    .add<ImageCoordValuesFromPositions<ImageD> >(true)
+    .add<ImageCoordValuesFromPositions<ImageF> >());
+}
+
 
 template class SOFA_IMAGE_API ImageCoordValuesFromPositions<ImageD>;
 template class SOFA_IMAGE_API ImageCoordValuesFromPositions<ImageF>;
diff --git a/applications/plugins/image/ImageDataDisplay.cpp b/applications/plugins/image/ImageDataDisplay.cpp
index 4bfc873420d..5869f38374a 100644
--- a/applications/plugins/image/ImageDataDisplay.cpp
+++ b/applications/plugins/image/ImageDataDisplay.cpp
@@ -35,11 +35,13 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageDataDisplayClass = core::RegisterObject("Store custom data in an image. A template input image with non zero voxels (where data will be stored) has to be provided")
-        .add<ImageDataDisplay<ImageUC, ImageD> >(true)
-        .add<ImageDataDisplay<ImageD, ImageD> >()
-        .add<ImageDataDisplay<ImageB, ImageD> >()
-        ;
+void registerImageDataDisplay(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Store custom data in an image. A template input image with non zero voxels (where data will be stored) has to be provided")
+    .add<ImageDataDisplay<ImageUC, ImageD> >(true)
+    .add<ImageDataDisplay<ImageD, ImageD> >()
+    .add<ImageDataDisplay<ImageB, ImageD> >());
+}
 
 template class SOFA_IMAGE_API ImageDataDisplay<ImageUC, ImageD>;
 template class SOFA_IMAGE_API ImageDataDisplay<ImageD, ImageD>;
diff --git a/applications/plugins/image/ImageExporter.cpp b/applications/plugins/image/ImageExporter.cpp
index 93b2aef2e65..750896d4f9b 100644
--- a/applications/plugins/image/ImageExporter.cpp
+++ b/applications/plugins/image/ImageExporter.cpp
@@ -37,21 +37,24 @@ namespace misc
 
 using namespace defaulttype;
 
-int ImageExporterClass = core::RegisterObject("Save an image")
-        .add<ImageExporter<ImageUC> >(true)
-        .add<ImageExporter<ImageD> >()
-        .add<ImageExporter<ImageB> >()
+void registerImageExporter(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Save an image")
+    .add<ImageExporter<ImageUC> >(true)
+    .add<ImageExporter<ImageD> >()
+    .add<ImageExporter<ImageB> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<ImageExporter<ImageC> >()
-        .add<ImageExporter<ImageI> >()
-        .add<ImageExporter<ImageUI> >()
-        .add<ImageExporter<ImageS> >()
-        .add<ImageExporter<ImageUS> >()
-        .add<ImageExporter<ImageL> >()
-        .add<ImageExporter<ImageUL> >()
-        .add<ImageExporter<ImageF> >()
+    .add<ImageExporter<ImageC> >()
+    .add<ImageExporter<ImageI> >()
+    .add<ImageExporter<ImageUI> >()
+    .add<ImageExporter<ImageS> >()
+    .add<ImageExporter<ImageUS> >()
+    .add<ImageExporter<ImageL> >()
+    .add<ImageExporter<ImageUL> >()
+    .add<ImageExporter<ImageF> >()
 #endif
-        ;
+    );
+}
 
 template class SOFA_IMAGE_API ImageExporter<ImageUC>;
 template class SOFA_IMAGE_API ImageExporter<ImageD>;
diff --git a/applications/plugins/image/ImageFilter.cpp b/applications/plugins/image/ImageFilter.cpp
index a91bf08cae4..bfb339d950d 100644
--- a/applications/plugins/image/ImageFilter.cpp
+++ b/applications/plugins/image/ImageFilter.cpp
@@ -35,44 +35,44 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageFilterClass = core::RegisterObject("Filter an image")
-        .add<ImageFilter<ImageUC,ImageUC    > >(true)
-        .add<ImageFilter<ImageD ,ImageD     > >()
-
-        .add<ImageFilter<ImageUC,ImageD    > >()
-
-        .add<ImageFilter<ImageD,ImageUC    > >()
-        .add<ImageFilter<ImageD,ImageB    > >()
-        .add<ImageFilter<ImageB ,ImageD     > >()
-        .add<ImageFilter<ImageB ,ImageB     > >()
+void registerImageFilter(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Filter an image")
+    .add<ImageFilter<ImageUC,ImageUC    > >(true)
+    .add<ImageFilter<ImageD ,ImageD     > >()
+    .add<ImageFilter<ImageUC,ImageD    > >()
+    .add<ImageFilter<ImageD,ImageUC    > >()
+    .add<ImageFilter<ImageD,ImageB    > >()
+    .add<ImageFilter<ImageB ,ImageD     > >()
+    .add<ImageFilter<ImageB ,ImageB     > >()
 
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<ImageFilter<ImageC ,ImageC     > >()
-        .add<ImageFilter<ImageI ,ImageI     > >()
-        .add<ImageFilter<ImageUI,ImageUI    > >()
-        .add<ImageFilter<ImageS ,ImageS     > >()
-        .add<ImageFilter<ImageUS,ImageUS    > >()
-        .add<ImageFilter<ImageL ,ImageL     > >()
-        .add<ImageFilter<ImageUL,ImageUL    > >()
-        .add<ImageFilter<ImageF ,ImageF     > >()
-
-        .add<ImageFilter<ImageC ,ImageD     > >()
-        .add<ImageFilter<ImageI ,ImageD     > >()
-        .add<ImageFilter<ImageUI,ImageD    > >()
-        .add<ImageFilter<ImageS ,ImageD     > >()
-        .add<ImageFilter<ImageUS,ImageD    > >()
-        .add<ImageFilter<ImageL ,ImageD     > >()
-        .add<ImageFilter<ImageUL,ImageD    > >()
-        .add<ImageFilter<ImageF ,ImageD     > >()
-
-        .add<ImageFilter<ImageUS,ImageUC    > >()
-        .add<ImageFilter<ImageUC,ImageUS    > >()
-        .add<ImageFilter<ImageUC,ImageB    > >()
-        .add<ImageFilter<ImageUS,ImageB    > >()
-        .add<ImageFilter<ImageS ,ImageB     > >()
-        .add<ImageFilter<ImageS ,ImageUC     > >()
+    .add<ImageFilter<ImageC ,ImageC     > >()
+    .add<ImageFilter<ImageI ,ImageI     > >()
+    .add<ImageFilter<ImageUI,ImageUI    > >()
+    .add<ImageFilter<ImageS ,ImageS     > >()
+    .add<ImageFilter<ImageUS,ImageUS    > >()
+    .add<ImageFilter<ImageL ,ImageL     > >()
+    .add<ImageFilter<ImageUL,ImageUL    > >()
+    .add<ImageFilter<ImageF ,ImageF     > >()
+    .add<ImageFilter<ImageC ,ImageD     > >()
+    .add<ImageFilter<ImageI ,ImageD     > >()
+    .add<ImageFilter<ImageUI,ImageD    > >()
+    .add<ImageFilter<ImageS ,ImageD     > >()
+    .add<ImageFilter<ImageUS,ImageD    > >()
+    .add<ImageFilter<ImageL ,ImageD     > >()
+    .add<ImageFilter<ImageUL,ImageD    > >()
+    .add<ImageFilter<ImageF ,ImageD     > >()
+    .add<ImageFilter<ImageUS,ImageUC    > >()
+    .add<ImageFilter<ImageUC,ImageUS    > >()
+    .add<ImageFilter<ImageUC,ImageB    > >()
+    .add<ImageFilter<ImageUS,ImageB    > >()
+    .add<ImageFilter<ImageS ,ImageB     > >()
+    .add<ImageFilter<ImageS ,ImageUC     > >()
 #endif
-        ;
+    );
+}
+
 
 template class SOFA_IMAGE_API ImageFilter<ImageUC  ,ImageUC    >;
 template class SOFA_IMAGE_API ImageFilter<ImageD   ,ImageD     >;
diff --git a/applications/plugins/image/ImageOperation.cpp b/applications/plugins/image/ImageOperation.cpp
index 24c74e39e06..124dbc35466 100644
--- a/applications/plugins/image/ImageOperation.cpp
+++ b/applications/plugins/image/ImageOperation.cpp
@@ -35,21 +35,24 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageOperationClass = core::RegisterObject("This class computes an image as an operation between two images")
-        .add<ImageOperation<ImageUC> >(true)
-        .add<ImageOperation<ImageD> >()
-        .add<ImageOperation<ImageB> >()
+void registerImageOperation(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("This class computes an image as an operation between two images")
+    .add<ImageOperation<ImageUC> >(true)
+    .add<ImageOperation<ImageD> >()
+    .add<ImageOperation<ImageB> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<ImageOperation<ImageC> >()
-        .add<ImageOperation<ImageI> >()
-        .add<ImageOperation<ImageUI> >()
-        .add<ImageOperation<ImageS> >()
-        .add<ImageOperation<ImageUS> >()
-        .add<ImageOperation<ImageL> >()
-        .add<ImageOperation<ImageUL> >()
-        .add<ImageOperation<ImageF> >()
+    .add<ImageOperation<ImageC> >()
+    .add<ImageOperation<ImageI> >()
+    .add<ImageOperation<ImageUI> >()
+    .add<ImageOperation<ImageS> >()
+    .add<ImageOperation<ImageUS> >()
+    .add<ImageOperation<ImageL> >()
+    .add<ImageOperation<ImageUL> >()
+    .add<ImageOperation<ImageF> >()
 #endif
-        ;
+    );
+}
 
 template class SOFA_IMAGE_API ImageOperation<ImageUC>;
 template class SOFA_IMAGE_API ImageOperation<ImageD>;
diff --git a/applications/plugins/image/ImageSampler.cpp b/applications/plugins/image/ImageSampler.cpp
index d0ceee3f822..8d5152d6506 100644
--- a/applications/plugins/image/ImageSampler.cpp
+++ b/applications/plugins/image/ImageSampler.cpp
@@ -35,21 +35,24 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageSamplerClass = core::RegisterObject("Samples an object represented by an image")
-        .add<ImageSampler<ImageB> >(true)
-        .add<ImageSampler<ImageUC> >()
-        .add<ImageSampler<ImageD> >()
+void registerImageSampler(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Samples an object represented by an image")
+    .add<ImageSampler<ImageB> >(true)
+    .add<ImageSampler<ImageUC> >()
+    .add<ImageSampler<ImageD> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-.add<ImageSampler<ImageC> >()
-.add<ImageSampler<ImageI> >()
-.add<ImageSampler<ImageUI> >()
-.add<ImageSampler<ImageS> >()
-.add<ImageSampler<ImageUS> >()
-.add<ImageSampler<ImageL> >()
-.add<ImageSampler<ImageUL> >()
-.add<ImageSampler<ImageF> >()
+    .add<ImageSampler<ImageC> >()
+    .add<ImageSampler<ImageI> >()
+    .add<ImageSampler<ImageUI> >()
+    .add<ImageSampler<ImageS> >()
+    .add<ImageSampler<ImageUS> >()
+    .add<ImageSampler<ImageL> >()
+    .add<ImageSampler<ImageUL> >()
+    .add<ImageSampler<ImageF> >()
 #endif
-        ;
+    );
+}
 
 template class SOFA_IMAGE_API ImageSampler<ImageB>;
 template class SOFA_IMAGE_API ImageSampler<ImageUC>;
diff --git a/applications/plugins/image/ImageToRigidMassEngine.cpp b/applications/plugins/image/ImageToRigidMassEngine.cpp
index d67f872a642..54b935a6945 100644
--- a/applications/plugins/image/ImageToRigidMassEngine.cpp
+++ b/applications/plugins/image/ImageToRigidMassEngine.cpp
@@ -35,35 +35,18 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageToRigidMassEngineClass = core::RegisterObject("Compute rigid mass from a density image")
-        .add<ImageToRigidMassEngine<ImageD> >(true)
-        .add<ImageToRigidMassEngine<ImageUC> >()
-        .add<ImageToRigidMassEngine<ImageB> >()
-#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-//        .add<ImageToRigidMassEngine<ImageC> >()
-//        .add<ImageToRigidMassEngine<ImageI> >()
-//        .add<ImageToRigidMassEngine<ImageUI> >()
-//        .add<ImageToRigidMassEngine<ImageS> >()
-//        .add<ImageToRigidMassEngine<ImageUS> >()
-//        .add<ImageToRigidMassEngine<ImageL> >()
-//        .add<ImageToRigidMassEngine<ImageUL> >()
-//        .add<ImageToRigidMassEngine<ImageF> >()
-#endif
-        ;
+void registerImageToRigidMassEngine(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Compute rigid mass from a density image")
+    .add<ImageToRigidMassEngine<ImageD> >(true)
+    .add<ImageToRigidMassEngine<ImageUC> >()
+    .add<ImageToRigidMassEngine<ImageB> >()
+    );
+}
 
 template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageD>;
 template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageUC>;
 template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageB>;
-#if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-//template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageC>;
-//template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageI>;
-//template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageUI>;
-//template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageS>;
-//template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageUS>;
-//template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageL>;
-//template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageUL>;
-//template class SOFA_IMAGE_API ImageToRigidMassEngine<ImageF>;
-#endif
 
 
 } //
diff --git a/applications/plugins/image/ImageTransform.cpp b/applications/plugins/image/ImageTransform.cpp
index ed941d92555..f13a95a290a 100644
--- a/applications/plugins/image/ImageTransform.cpp
+++ b/applications/plugins/image/ImageTransform.cpp
@@ -33,21 +33,24 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageTransformClass = core::RegisterObject("Read data from ImageContainer")
-        .add<ImageTransform<ImageUC> >(true)
-        .add<ImageTransform<ImageD> >()
-        .add<ImageTransform<ImageB> >()
+void registerImageTransform(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Read data from ImageContainer")
+    .add<ImageTransform<ImageUC> >(true)
+    .add<ImageTransform<ImageD> >()
+    .add<ImageTransform<ImageB> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<ImageTransform<ImageC> >()
-        .add<ImageTransform<ImageI> >()
-        .add<ImageTransform<ImageUI> >()
-        .add<ImageTransform<ImageS> >()
-        .add<ImageTransform<ImageUS> >()
-        .add<ImageTransform<ImageL> >()
-        .add<ImageTransform<ImageUL> >()
-        .add<ImageTransform<ImageF> >()
-#endif
-        ;
+    .add<ImageTransform<ImageC> >()
+    .add<ImageTransform<ImageI> >()
+    .add<ImageTransform<ImageUI> >()
+    .add<ImageTransform<ImageS> >()
+    .add<ImageTransform<ImageUS> >()
+    .add<ImageTransform<ImageL> >()
+    .add<ImageTransform<ImageUL> >()
+    .add<ImageTransform<ImageF> >()
+#endif    
+    );
+}
 
 template class SOFA_IMAGE_API ImageTransform<ImageUC>;
 template class SOFA_IMAGE_API ImageTransform<ImageD>;
diff --git a/applications/plugins/image/ImageTransformEngine.cpp b/applications/plugins/image/ImageTransformEngine.cpp
index 39d117a1d13..dd49af95089 100644
--- a/applications/plugins/image/ImageTransformEngine.cpp
+++ b/applications/plugins/image/ImageTransformEngine.cpp
@@ -35,9 +35,11 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageTransformEngineClass = core::RegisterObject("Apply a transform to the data 'transform'")
-        .add<ImageTransformEngine>(true)
-        ;
+void registerImageTransformEngine(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Apply a transform to the data 'transform")
+    .add<ImageTransformEngine>(true));
+}
 
 } //
 } // namespace component
diff --git a/applications/plugins/image/ImageTypes.cpp b/applications/plugins/image/ImageTypes.cpp
index 8164c3d3fd3..11b8dd45997 100644
--- a/applications/plugins/image/ImageTypes.cpp
+++ b/applications/plugins/image/ImageTypes.cpp
@@ -17,21 +17,26 @@ static RegisterTemplateAlias ImageRAlias("ImageR", "ImageD");
 
 
 #if IMAGE_HAVE_MULTITHREADING
-// Register in the Factory
 using sofa::core::DataExchange;
-int DataExchangeClass = core::RegisterObject("DataExchange")
-.add< DataExchange<sofa::defaulttype::ImageB>>()
-.add< DataExchange<sofa::defaulttype::ImageC>>()
-.add< DataExchange<sofa::defaulttype::ImageUC>>()
-.add< DataExchange<sofa::defaulttype::ImageI>>()
-.add< DataExchange<sofa::defaulttype::ImageUI>>()
-.add< DataExchange<sofa::defaulttype::ImageS>>()
-.add< DataExchange<sofa::defaulttype::ImageUS>>()
-.add< DataExchange<sofa::defaulttype::ImageL>>()
-.add< DataExchange<sofa::defaulttype::ImageUL>>()
-.add< DataExchange<sofa::defaulttype::ImageF>>()
-.add< DataExchange<sofa::defaulttype::ImageD>>()
-;
+
+// Register in the Factory
+void registerDataExchange(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("DataExchange")
+    .add< DataExchange<sofa::defaulttype::ImageB>>()
+    .add< DataExchange<sofa::defaulttype::ImageC>>()
+    .add< DataExchange<sofa::defaulttype::ImageUC>>()
+    .add< DataExchange<sofa::defaulttype::ImageI>>()
+    .add< DataExchange<sofa::defaulttype::ImageUI>>()
+    .add< DataExchange<sofa::defaulttype::ImageS>>()
+    .add< DataExchange<sofa::defaulttype::ImageUS>>()
+    .add< DataExchange<sofa::defaulttype::ImageL>>()
+    .add< DataExchange<sofa::defaulttype::ImageUL>>()
+    .add< DataExchange<sofa::defaulttype::ImageF>>()
+    .add< DataExchange<sofa::defaulttype::ImageD>>()
+    );
+}
+
 }  // namespace defaulttype
 
 namespace core
diff --git a/applications/plugins/image/ImageValuesFromPositions.cpp b/applications/plugins/image/ImageValuesFromPositions.cpp
index 9ca726b9d07..58d2083a912 100644
--- a/applications/plugins/image/ImageValuesFromPositions.cpp
+++ b/applications/plugins/image/ImageValuesFromPositions.cpp
@@ -35,21 +35,24 @@ namespace engine
 
 using namespace defaulttype;
 
-int ImageValuesFromPositionsClass = core::RegisterObject("Get image intensities at sample locations")
-        .add<ImageValuesFromPositions<ImageD> >(true)
-        .add<ImageValuesFromPositions<ImageUC> >()
-        .add<ImageValuesFromPositions<ImageB> >()
+void registerImageValuesFromPositions(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Get image intensities at sample locations")
+    .add<ImageValuesFromPositions<ImageD> >(true)
+    .add<ImageValuesFromPositions<ImageUC> >()
+    .add<ImageValuesFromPositions<ImageB> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<ImageValuesFromPositions<ImageC> >()
-        .add<ImageValuesFromPositions<ImageI> >()
-        .add<ImageValuesFromPositions<ImageUI> >()
-        .add<ImageValuesFromPositions<ImageS> >()
-        .add<ImageValuesFromPositions<ImageUS> >()
-        .add<ImageValuesFromPositions<ImageL> >()
-        .add<ImageValuesFromPositions<ImageUL> >()
-        .add<ImageValuesFromPositions<ImageF> >()
+    .add<ImageValuesFromPositions<ImageC> >()
+    .add<ImageValuesFromPositions<ImageI> >()
+    .add<ImageValuesFromPositions<ImageUI> >()
+    .add<ImageValuesFromPositions<ImageS> >()
+    .add<ImageValuesFromPositions<ImageUS> >()
+    .add<ImageValuesFromPositions<ImageL> >()
+    .add<ImageValuesFromPositions<ImageUL> >()
+    .add<ImageValuesFromPositions<ImageF> >()
 #endif
-        ;
+    );
+}
 
 template class SOFA_IMAGE_API ImageValuesFromPositions<ImageD>;
 template class SOFA_IMAGE_API ImageValuesFromPositions<ImageUC>;
diff --git a/applications/plugins/image/MarchingCubesEngine.cpp b/applications/plugins/image/MarchingCubesEngine.cpp
index c486bb6f07f..57230c105ce 100644
--- a/applications/plugins/image/MarchingCubesEngine.cpp
+++ b/applications/plugins/image/MarchingCubesEngine.cpp
@@ -35,21 +35,24 @@ namespace engine
 
 using namespace defaulttype;
 
-int MarchingCubesEngineClass = core::RegisterObject("Compute an isosurface from an image using marching cubes algorithm")
-        .add<MarchingCubesEngine<ImageUC> >(true)
-        .add<MarchingCubesEngine<ImageD> >()
-        .add<MarchingCubesEngine<ImageB> >()
+void registerMarchingCubesEngine(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Compute an isosurface from an image using marching cubes algorithm")
+    .add<MarchingCubesEngine<ImageUC> >(true)
+    .add<MarchingCubesEngine<ImageD> >()
+    .add<MarchingCubesEngine<ImageB> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<MarchingCubesEngine<ImageC> >()
-        .add<MarchingCubesEngine<ImageI> >()
-        .add<MarchingCubesEngine<ImageUI> >()
-        .add<MarchingCubesEngine<ImageS> >()
-        .add<MarchingCubesEngine<ImageUS> >()
-        .add<MarchingCubesEngine<ImageL> >()
-        .add<MarchingCubesEngine<ImageUL> >()
-        .add<MarchingCubesEngine<ImageF> >()
+    .add<MarchingCubesEngine<ImageC> >()
+    .add<MarchingCubesEngine<ImageI> >()
+    .add<MarchingCubesEngine<ImageUI> >()
+    .add<MarchingCubesEngine<ImageS> >()
+    .add<MarchingCubesEngine<ImageUS> >()
+    .add<MarchingCubesEngine<ImageL> >()
+    .add<MarchingCubesEngine<ImageUL> >()
+    .add<MarchingCubesEngine<ImageF> >()
 #endif
-        ;
+    );
+}
 
 template class SOFA_IMAGE_API MarchingCubesEngine<ImageUC>;
 template class SOFA_IMAGE_API MarchingCubesEngine<ImageD>;
diff --git a/applications/plugins/image/MergeImages.cpp b/applications/plugins/image/MergeImages.cpp
index 8257b73813a..ec03c560bec 100644
--- a/applications/plugins/image/MergeImages.cpp
+++ b/applications/plugins/image/MergeImages.cpp
@@ -35,21 +35,24 @@ namespace engine
 
 using namespace defaulttype;
 
-int MergeImagesClass = core::RegisterObject("Merge images")
-        .add<MergeImages<ImageUC> >(true)
-        .add<MergeImages<ImageD> >()
-        .add<MergeImages<ImageB> >()
+void registerMergeImages(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Merge images")
+    .add<MergeImages<ImageUC> >(true)
+    .add<MergeImages<ImageD> >()
+    .add<MergeImages<ImageB> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<MergeImages<ImageC> >()
-        .add<MergeImages<ImageI> >()
-        .add<MergeImages<ImageUI> >()
-        .add<MergeImages<ImageS> >()
-        .add<MergeImages<ImageUS> >()
-        .add<MergeImages<ImageL> >()
-        .add<MergeImages<ImageUL> >()
-        .add<MergeImages<ImageF> >()
+    .add<MergeImages<ImageC> >()
+    .add<MergeImages<ImageI> >()
+    .add<MergeImages<ImageUI> >()
+    .add<MergeImages<ImageS> >()
+    .add<MergeImages<ImageUS> >()
+    .add<MergeImages<ImageL> >()
+    .add<MergeImages<ImageUL> >()
+    .add<MergeImages<ImageF> >()
 #endif
-        ;
+    );
+}
 
 template class SOFA_IMAGE_API MergeImages<ImageUC>;
 template class SOFA_IMAGE_API MergeImages<ImageD>;
diff --git a/applications/plugins/image/MeshToImageEngine.cpp b/applications/plugins/image/MeshToImageEngine.cpp
index 99b1a64d250..b7bf0f54f72 100644
--- a/applications/plugins/image/MeshToImageEngine.cpp
+++ b/applications/plugins/image/MeshToImageEngine.cpp
@@ -35,12 +35,15 @@ namespace engine
 
 using namespace defaulttype;
 
-int MeshToImageEngineClass = core::RegisterObject("Compute a rasterization image from several meshes")
-        .add<MeshToImageEngine<ImageB> >(true)
-        .add<MeshToImageEngine<ImageUC> >()
-        .add<MeshToImageEngine<ImageUS> >()
-        .add<MeshToImageEngine<ImageD> >()
-        ;
+void registerMeshToImageEngine(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Compute a rasterization image from several meshes")
+    .add<MeshToImageEngine<ImageB> >(true)
+    .add<MeshToImageEngine<ImageUC> >()
+    .add<MeshToImageEngine<ImageUS> >()
+    .add<MeshToImageEngine<ImageD> >()
+    );
+}
 
 template class SOFA_IMAGE_API MeshToImageEngine<ImageB>;
 template class SOFA_IMAGE_API MeshToImageEngine<ImageUC>;
diff --git a/applications/plugins/image/MeshToImageEngine.h b/applications/plugins/image/MeshToImageEngine.h
index e5ff3738f50..76fc1e16dff 100644
--- a/applications/plugins/image/MeshToImageEngine.h
+++ b/applications/plugins/image/MeshToImageEngine.h
@@ -322,8 +322,7 @@ class MeshToImageEngine : public core::DataEngine
             M/=(Real)nbpTotal;
 
             // get eigen vectors of the covariance matrix
-            Eigen::Matrix<Real, -1, -1> e;
-            e.resize(3, 3);
+            Eigen::Matrix<Real, 3, 3> e;
             e.setZero();
             for (size_t j = 0; j < 3; j++) 
             { 
@@ -334,7 +333,7 @@ class MeshToImageEngine : public core::DataEngine
             }
 
             //compute eigenvalues and eigenvectors
-            Eigen::JacobiSVD svd(e, Eigen::ComputeThinU | Eigen::ComputeThinV);
+            Eigen::JacobiSVD<Eigen::Matrix<Real, 3, 3>> svd(e, Eigen::ComputeThinU | Eigen::ComputeThinV);
             auto V = svd.matrixV();
 
             for(size_t j=0; j<3; j++) for(size_t k=0; k<3; k++) M[j][k]=V(j,k);
diff --git a/applications/plugins/image/TransferFunction.cpp b/applications/plugins/image/TransferFunction.cpp
index bd9d4c4d178..e8a548ccc40 100644
--- a/applications/plugins/image/TransferFunction.cpp
+++ b/applications/plugins/image/TransferFunction.cpp
@@ -33,45 +33,45 @@ namespace engine
 
 using namespace defaulttype;
 
-int TransferFunctionClass = core::RegisterObject("Transforms pixel intensities")
-        .add<TransferFunction<ImageUC,ImageUC    > >(true)
-        .add<TransferFunction<ImageD ,ImageD     > >()
-        .add<TransferFunction<ImageUC,ImageD    > >()
-        .add<TransferFunction<ImageD,ImageUC    > >()
-        .add<TransferFunction<ImageUC,ImageUI    > >()
-        .add<TransferFunction<ImageUC,ImageUS    > >()
-        .add<TransferFunction<ImageUS,ImageUC    > >()
-        .add<TransferFunction<ImageUC,ImageB    > >()
-        .add<TransferFunction<ImageUC,ImageF    > >()
+void registerTransferFunction(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Transforms pixel intensities")
+    .add<TransferFunction<ImageUC,ImageUC    > >(true)
+    .add<TransferFunction<ImageD ,ImageD     > >()
+    .add<TransferFunction<ImageUC,ImageD    > >()
+    .add<TransferFunction<ImageD,ImageUC    > >()
+    .add<TransferFunction<ImageUC,ImageUI    > >()
+    .add<TransferFunction<ImageUC,ImageUS    > >()
+    .add<TransferFunction<ImageUS,ImageUC    > >()
+    .add<TransferFunction<ImageUC,ImageB    > >()
+    .add<TransferFunction<ImageUC,ImageF    > >()
 
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<TransferFunction<ImageC ,ImageC     > >()
-        .add<TransferFunction<ImageI ,ImageI     > >()
-        .add<TransferFunction<ImageUI,ImageUI    > >()
-        .add<TransferFunction<ImageS ,ImageS     > >()
-        .add<TransferFunction<ImageUS,ImageUS    > >()
-        .add<TransferFunction<ImageL ,ImageL     > >()
-        .add<TransferFunction<ImageUL,ImageUL    > >()
-        .add<TransferFunction<ImageF ,ImageF     > >()
-        .add<TransferFunction<ImageB ,ImageB     > >()
-
-        .add<TransferFunction<ImageC ,ImageD     > >()
-        .add<TransferFunction<ImageI ,ImageD     > >()
-        .add<TransferFunction<ImageUI,ImageD    > >()
-        .add<TransferFunction<ImageS ,ImageD     > >()
-        .add<TransferFunction<ImageUS,ImageD    > >()
-        .add<TransferFunction<ImageL ,ImageD     > >()
-        .add<TransferFunction<ImageUL,ImageD    > >()
-        .add<TransferFunction<ImageF ,ImageD     > >()
-        .add<TransferFunction<ImageB ,ImageD     > >()
+    .add<TransferFunction<ImageC ,ImageC     > >()
+    .add<TransferFunction<ImageI ,ImageI     > >()
+    .add<TransferFunction<ImageUI,ImageUI    > >()
+    .add<TransferFunction<ImageS ,ImageS     > >()
+    .add<TransferFunction<ImageUS,ImageUS    > >()
+    .add<TransferFunction<ImageL ,ImageL     > >()
+    .add<TransferFunction<ImageUL,ImageUL    > >()
+    .add<TransferFunction<ImageF ,ImageF     > >()
+    .add<TransferFunction<ImageB ,ImageB     > >()
+    .add<TransferFunction<ImageC ,ImageD     > >()
+    .add<TransferFunction<ImageI ,ImageD     > >()
+    .add<TransferFunction<ImageUI,ImageD    > >()
+    .add<TransferFunction<ImageS ,ImageD     > >()
+    .add<TransferFunction<ImageUS,ImageD    > >()
+    .add<TransferFunction<ImageL ,ImageD     > >()
+    .add<TransferFunction<ImageUL,ImageD    > >()
+    .add<TransferFunction<ImageF ,ImageD     > >()
+    .add<TransferFunction<ImageB ,ImageD     > >()
 #endif
-        ;
+    );
+}
 
 template class SOFA_IMAGE_API TransferFunction<ImageUC  ,ImageUC    >;
 template class SOFA_IMAGE_API TransferFunction<ImageD   ,ImageD     >;
-
 template class SOFA_IMAGE_API TransferFunction<ImageUC  ,ImageD    >;
-
 template class SOFA_IMAGE_API TransferFunction<ImageD  ,ImageUC    >;
 template class SOFA_IMAGE_API TransferFunction<ImageUC   ,ImageUI     >;
 template class SOFA_IMAGE_API TransferFunction<ImageUC   ,ImageUS     >;
diff --git a/applications/plugins/image/VoronoiToMeshEngine.cpp b/applications/plugins/image/VoronoiToMeshEngine.cpp
index 2f341b9ce34..24bc9093f21 100644
--- a/applications/plugins/image/VoronoiToMeshEngine.cpp
+++ b/applications/plugins/image/VoronoiToMeshEngine.cpp
@@ -35,14 +35,17 @@ namespace engine
 
 using namespace defaulttype;
 
-int VoronoiToMeshEngineClass = core::RegisterObject("Generate flat faces between adjacent regions of an image")
-        .add<VoronoiToMeshEngine<ImageUI> >(true)
-        .add<VoronoiToMeshEngine<ImageUC> >()
+void registerVoronoiToMeshEngine(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("Generate flat faces between adjacent regions of an image")
+    .add<VoronoiToMeshEngine<ImageUI> >(true)
+    .add<VoronoiToMeshEngine<ImageUC> >()
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<VoronoiToMeshEngine<ImageUS> >()
-        .add<VoronoiToMeshEngine<ImageUL> >()
+    .add<VoronoiToMeshEngine<ImageUS> >()
+    .add<VoronoiToMeshEngine<ImageUL> >()
 #endif
-        ;
+    );
+}
 
 template class SOFA_IMAGE_API VoronoiToMeshEngine<ImageUI>;
 template class SOFA_IMAGE_API VoronoiToMeshEngine<ImageUC>;
diff --git a/applications/plugins/image/config.h.in b/applications/plugins/image/config.h.in
index d92d9a85673..dbd14024e87 100644
--- a/applications/plugins/image/config.h.in
+++ b/applications/plugins/image/config.h.in
@@ -19,8 +19,7 @@
 *                                                                             *
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
-#ifndef IMAGE_CONFIG_H
-#define IMAGE_CONFIG_H
+#pragma once
 
 #include <sofa/config.h>
 
@@ -33,6 +32,9 @@
 #cmakedefine01 IMAGE_HAVE_FREENECT
 #cmakedefine01 IMAGE_HAVE_SOFA_GL
 
+#cmakedefine SOFA_BUILD_TESTS
+#cmakedefine PLUGIN_IMAGE_COMPILE_GUI
+
 #define PLUGIN_IMAGE_COMPILE_SET_NONE 0
 #define PLUGIN_IMAGE_COMPILE_SET_STANDARD 1
 #define PLUGIN_IMAGE_COMPILE_SET_FULL 2
@@ -54,4 +56,3 @@ namespace image
 	constexpr const char* MODULE_VERSION = "@PROJECT_VERSION@";
 } // namespace image
 
-#endif
diff --git a/applications/plugins/image/image_test/TestImageEngine.cpp b/applications/plugins/image/image_test/TestImageEngine.cpp
index 35073a797a6..2959fa144bb 100644
--- a/applications/plugins/image/image_test/TestImageEngine.cpp
+++ b/applications/plugins/image/image_test/TestImageEngine.cpp
@@ -33,8 +33,23 @@ namespace engine
 {
 using namespace sofa::defaulttype;
 
-int TestImageEngineClass = core::RegisterObject("TestImageEngine to test engine with data image")
+template class TestImageEngine<ImageUC>;
+template class TestImageEngine<ImageD>;
+#ifdef BUILD_ALL_IMAGE_TYPES
+template class TestImageEngine<ImageC>;
+template class TestImageEngine<ImageI>;
+template class TestImageEngine<ImageUI>;
+template class TestImageEngine<ImageS>;
+template class TestImageEngine<ImageUS>;
+template class TestImageEngine<ImageL>;
+template class TestImageEngine<ImageUL>;
+template class TestImageEngine<ImageF>;
+template class TestImageEngine<ImageB>;
+#endif
 
+// register effectively TestImageEngine in the registry
+// it is done statically as it will be executed into the image_test executable
+bool res = sofa::core::ObjectFactory::getInstance()->registerObjects(sofa::core::ObjectRegistrationData("TestImageEngine to test engine with data image")
         .add<TestImageEngine<ImageUC> >(true)
         .add<TestImageEngine<ImageD> >()
 #ifdef BUILD_ALL_IMAGE_TYPES
@@ -48,21 +63,9 @@ int TestImageEngineClass = core::RegisterObject("TestImageEngine to test engine
         .add<TestImageEngine<ImageF> >()
         .add<TestImageEngine<ImageB> >()
 #endif
-        ;
+    );
+
 
-template class TestImageEngine<ImageUC>;
-template class TestImageEngine<ImageD>;
-#ifdef BUILD_ALL_IMAGE_TYPES
-template class TestImageEngine<ImageC>;
-template class TestImageEngine<ImageI>;
-template class TestImageEngine<ImageUI>;
-template class TestImageEngine<ImageS>;
-template class TestImageEngine<ImageUS>;
-template class TestImageEngine<ImageL>;
-template class TestImageEngine<ImageUL>;
-template class TestImageEngine<ImageF>;
-template class TestImageEngine<ImageB>;
-#endif
 } // namespace constraint
 
 } // namespace component
diff --git a/applications/plugins/image/imagetoolbox/contour/contourimagetoolbox.cpp b/applications/plugins/image/imagetoolbox/contour/contourimagetoolbox.cpp
index 4f27df34ef2..ac890e5823b 100644
--- a/applications/plugins/image/imagetoolbox/contour/contourimagetoolbox.cpp
+++ b/applications/plugins/image/imagetoolbox/contour/contourimagetoolbox.cpp
@@ -16,7 +16,9 @@ namespace component
 namespace engine
 {
 
-int ContourImageToolBox_Class = core::RegisterObject("ContourImageToolBox")
+void registerContourImageToolBox(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("ContourImageToolBox")
         .add<ContourImageToolBox<ImageUC> >()
         .add<ContourImageToolBox<ImageD> >(true)
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
@@ -31,7 +33,9 @@ int ContourImageToolBox_Class = core::RegisterObject("ContourImageToolBox")
         .add<ContourImageToolBox<ImageB> >()
 #endif
         .addLicense("LGPL")
-        .addAuthor("Vincent Majorczyk");
+        .addAuthor("Vincent Majorczyk")
+        );
+}
 
 template class SOFA_IMAGE_GUI_API ContourImageToolBox<ImageUC>;
 template class SOFA_IMAGE_GUI_API ContourImageToolBox<ImageD>;
diff --git a/applications/plugins/image/imagetoolbox/depth/averagecatchallvector.cpp b/applications/plugins/image/imagetoolbox/depth/averagecatchallvector.cpp
index bf2c49d03fd..5bbb6c0a355 100644
--- a/applications/plugins/image/imagetoolbox/depth/averagecatchallvector.cpp
+++ b/applications/plugins/image/imagetoolbox/depth/averagecatchallvector.cpp
@@ -33,30 +33,29 @@ namespace engine
 
 using namespace defaulttype;
 
-int AverageCatchAllVectorClass = core::RegisterObject("AverageCatchAllVector")
+void registerAverageCatchAllVector(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("AverageCatchAllVector")
         .add<AverageCatchAllVector<float > >(true)
-        //.add<AverageCatchAllVector<unsigned float> >()
         .add<AverageCatchAllVector<short > >()
         .add<AverageCatchAllVector<unsigned short > >()
         .add<AverageCatchAllVector<int > >()
         .add<AverageCatchAllVector<unsigned int > >()
         .add<AverageCatchAllVector<double > >()
-        //.add<AverageCatchAllVector<unsigned double> >()
         .add<AverageCatchAllVector<long > >()
         .add<AverageCatchAllVector<unsigned long > >()
         .add<AverageCatchAllVector<bool > >()
         .add<AverageCatchAllVector<sofa::type::Vec3f> >()
         .add<AverageCatchAllVector<sofa::type::Vec3d> >()
-        ;
+        );
+}
 
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<float >;
-//template class SOFA_IMAGE_API AverageCatchAllVector<unsigned float >;
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<short >;
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<unsigned short >;
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<int >;
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<unsigned int >;
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<double >;
-//template class SOFA_IMAGE_API AverageCatchAllVector<unsigned double >;
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<long >;
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<unsigned long >;
 template class SOFA_IMAGE_GUI_API AverageCatchAllVector<bool >;
diff --git a/applications/plugins/image/imagetoolbox/depth/catchallvector.cpp b/applications/plugins/image/imagetoolbox/depth/catchallvector.cpp
index 1ec2a45517d..b38fdaf2b61 100644
--- a/applications/plugins/image/imagetoolbox/depth/catchallvector.cpp
+++ b/applications/plugins/image/imagetoolbox/depth/catchallvector.cpp
@@ -34,30 +34,30 @@ namespace engine
 
 using namespace defaulttype;
 
-int CatchAllVectorClass = core::RegisterObject("CatchAllVector")
+void registerCatchAllVector(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("CatchAllVector")
         .add<CatchAllVector<float > >(true)
-        //.add<CatchAllVector<unsigned float> >()
         .add<CatchAllVector<short > >()
         .add<CatchAllVector<unsigned short > >()
         .add<CatchAllVector<int > >()
         .add<CatchAllVector<unsigned int > >()
         .add<CatchAllVector<double > >()
-        //.add<CatchAllVector<unsigned double> >()
         .add<CatchAllVector<long > >()
         .add<CatchAllVector<unsigned long > >()
         .add<CatchAllVector<bool > >()
         .add<CatchAllVector<sofa::type::Vec3f> >()
         .add<CatchAllVector<sofa::type::Vec3d> >()
-        ;
+        );
+}
+
 
 template class SOFA_IMAGE_GUI_API CatchAllVector<float >;
-//template class SOFA_IMAGE_GUI_API CatchAllVector<unsigned float >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<short >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<unsigned short >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<int >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<unsigned int >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<double >;
-//template class SOFA_IMAGE_GUI_API CatchAllVector<unsigned double >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<long >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<unsigned long >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<bool >;
@@ -65,8 +65,6 @@ template class SOFA_IMAGE_GUI_API CatchAllVector<sofa::type::Vec3f >;
 template class SOFA_IMAGE_GUI_API CatchAllVector<sofa::type::Vec3d >;
 
 
-
-
 } //
 } // namespace component
 } // namespace sofa
diff --git a/applications/plugins/image/imagetoolbox/depth/depthimagetoolbox.cpp b/applications/plugins/image/imagetoolbox/depth/depthimagetoolbox.cpp
index 9153b2cc9d7..ee7af3d9d85 100644
--- a/applications/plugins/image/imagetoolbox/depth/depthimagetoolbox.cpp
+++ b/applications/plugins/image/imagetoolbox/depth/depthimagetoolbox.cpp
@@ -18,10 +18,14 @@ namespace component
 namespace engine
 {
 
-int DepthImageToolBox_Class = core::RegisterObject("DepthImageToolBox")
-.add< DepthImageToolBox >()
-.addLicense("LGPL")
-.addAuthor("Vincent Majorczyk");
+void registerDepthImageToolBox(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("DepthImageToolBox")
+    .add< DepthImageToolBox >()
+    .addLicense("LGPL")
+    .addAuthor("Vincent Majorczyk")
+    );
+}
 
 }}}
 
diff --git a/applications/plugins/image/imagetoolbox/depth/mergedcatchallvector.cpp b/applications/plugins/image/imagetoolbox/depth/mergedcatchallvector.cpp
index 380c985f336..880ea608e31 100644
--- a/applications/plugins/image/imagetoolbox/depth/mergedcatchallvector.cpp
+++ b/applications/plugins/image/imagetoolbox/depth/mergedcatchallvector.cpp
@@ -34,30 +34,29 @@ namespace engine
 
 using namespace defaulttype;
 
-int MergedCatchAllVectorClass = core::RegisterObject("MergedCatchAllVector")
+void registerMergedCatchAllVector(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("MergedCatchAllVector")
         .add<MergedCatchAllVector<float > >(true)
-        //.add<MergedCatchAllVector<unsigned float> >()
         .add<MergedCatchAllVector<short > >()
         .add<MergedCatchAllVector<unsigned short > >()
         .add<MergedCatchAllVector<int > >()
         .add<MergedCatchAllVector<unsigned int > >()
         .add<MergedCatchAllVector<double > >()
-        //.add<MergedCatchAllVector<unsigned double> >()
         .add<MergedCatchAllVector<long > >()
         .add<MergedCatchAllVector<unsigned long > >()
         .add<MergedCatchAllVector<bool > >()
         .add<MergedCatchAllVector<sofa::type::Vec3f> >()
         .add<MergedCatchAllVector<sofa::type::Vec3d> >()
-        ;
+    );
+}
 
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<float >;
-//template class SOFA_IMAGE_GUI_API MergedCatchAllVector<unsigned float >;
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<short >;
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<unsigned short >;
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<int >;
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<unsigned int >;
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<double >;
-//template class SOFA_IMAGE_GUI_API MergedCatchAllVector<unsigned double >;
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<long >;
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<unsigned long >;
 template class SOFA_IMAGE_GUI_API MergedCatchAllVector<bool >;
diff --git a/applications/plugins/image/imagetoolbox/labelbox/labelboximagetoolbox.cpp b/applications/plugins/image/imagetoolbox/labelbox/labelboximagetoolbox.cpp
index 1f4321c6a7d..942aff22a02 100644
--- a/applications/plugins/image/imagetoolbox/labelbox/labelboximagetoolbox.cpp
+++ b/applications/plugins/image/imagetoolbox/labelbox/labelboximagetoolbox.cpp
@@ -13,10 +13,14 @@ namespace component
 namespace engine
 {
 
-int LabelBoxImageToolBox_Class = core::RegisterObject("LabelBoxImageToolBox")
-.add< LabelBoxImageToolBox >()
-.addLicense("LGPL")
-.addAuthor("Vincent Majorczyk");
+void registerLabelBoxImageToolBox(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("LabelBoxImageToolBox")
+    .add< LabelBoxImageToolBox >()
+    .addLicense("LGPL")
+    .addAuthor("Vincent Majorczyk")
+    );
+}
 
 }}}
 
diff --git a/applications/plugins/image/imagetoolbox/labelgrid/labelgridimagetoolbox.cpp b/applications/plugins/image/imagetoolbox/labelgrid/labelgridimagetoolbox.cpp
index 45bcd406d6e..f223f7a6651 100644
--- a/applications/plugins/image/imagetoolbox/labelgrid/labelgridimagetoolbox.cpp
+++ b/applications/plugins/image/imagetoolbox/labelgrid/labelgridimagetoolbox.cpp
@@ -19,22 +19,26 @@ namespace engine
 
 using namespace sofa::defaulttype;
 
-int LabelGridImageToolBox_Class = core::RegisterObject("LabelGridImageToolBox")
-        .add<LabelGridImageToolBox<ImageUC> >()
-        .add<LabelGridImageToolBox<ImageD> >(true)
+void registerLabelGridImageToolBox(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("LabelGridImageToolBox")
+    .add<LabelGridImageToolBox<ImageUC> >()
+    .add<LabelGridImageToolBox<ImageD> >(true)
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<LabelGridImageToolBox<ImageC> >()
-        .add<LabelGridImageToolBox<ImageI> >()
-        .add<LabelGridImageToolBox<ImageUI> >()
-        .add<LabelGridImageToolBox<ImageS> >()
-        .add<LabelGridImageToolBox<ImageUS> >()
-        .add<LabelGridImageToolBox<ImageL> >()
-        .add<LabelGridImageToolBox<ImageUL> >()
-        .add<LabelGridImageToolBox<ImageF> >()
-        .add<LabelGridImageToolBox<ImageB> >()
+    .add<LabelGridImageToolBox<ImageC> >()
+    .add<LabelGridImageToolBox<ImageI> >()
+    .add<LabelGridImageToolBox<ImageUI> >()
+    .add<LabelGridImageToolBox<ImageS> >()
+    .add<LabelGridImageToolBox<ImageUS> >()
+    .add<LabelGridImageToolBox<ImageL> >()
+    .add<LabelGridImageToolBox<ImageUL> >()
+    .add<LabelGridImageToolBox<ImageF> >()
+    .add<LabelGridImageToolBox<ImageB> >()
 #endif
         .addLicense("LGPL")
-        .addAuthor("Vincent Majorczyk");
+        .addAuthor("Vincent Majorczyk")
+    );
+}
 
 template class SOFA_IMAGE_GUI_API LabelGridImageToolBox<ImageUC>;
 template class SOFA_IMAGE_GUI_API LabelGridImageToolBox<ImageD>;
diff --git a/applications/plugins/image/imagetoolbox/labelpoint/labelpointimagetoolbox.cpp b/applications/plugins/image/imagetoolbox/labelpoint/labelpointimagetoolbox.cpp
index 3d6b2baa283..42b7f917837 100644
--- a/applications/plugins/image/imagetoolbox/labelpoint/labelpointimagetoolbox.cpp
+++ b/applications/plugins/image/imagetoolbox/labelpoint/labelpointimagetoolbox.cpp
@@ -13,10 +13,14 @@ namespace component
 namespace engine
 {
 
-int LabelPointImageToolBox_Class = core::RegisterObject("LabelPointImageToolBox")
-.add< LabelPointImageToolBox >()
-.addLicense("LGPL")
-.addAuthor("Vincent Majorczyk");
+void registerLabelPointImageToolBox(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("LabelPointImageToolBox")
+    .add< LabelPointImageToolBox >()
+    .addLicense("LGPL")
+    .addAuthor("Vincent Majorczyk")
+    );
+}
 
 }}}
 
diff --git a/applications/plugins/image/imagetoolbox/labelpointsbysection/labelpointsbysectionimagetoolbox.cpp b/applications/plugins/image/imagetoolbox/labelpointsbysection/labelpointsbysectionimagetoolbox.cpp
index dca408071ed..c03e67ab670 100644
--- a/applications/plugins/image/imagetoolbox/labelpointsbysection/labelpointsbysectionimagetoolbox.cpp
+++ b/applications/plugins/image/imagetoolbox/labelpointsbysection/labelpointsbysectionimagetoolbox.cpp
@@ -13,10 +13,14 @@ namespace component
 namespace engine
 {
 
-int LabelPointsBySectionImageToolBox_Class = core::RegisterObject("LabelPointsBySectionImageToolBox")
-.add< LabelPointsBySectionImageToolBox >()
-.addLicense("LGPL")
-.addAuthor("Vincent Majorczyk");
+void registerLabelPointsBySectionImageToolBox(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("LabelPointsBySectionImageToolBox")
+    .add< LabelPointsBySectionImageToolBox >()
+    .addLicense("LGPL")
+    .addAuthor("Vincent Majorczyk")
+    );
+}
 
 }}}
 
diff --git a/applications/plugins/image/imagetoolbox/zonegenerator/distancezoneimagetoolbox.cpp b/applications/plugins/image/imagetoolbox/zonegenerator/distancezoneimagetoolbox.cpp
index ba195f7d81d..03cb0ba0fd9 100644
--- a/applications/plugins/image/imagetoolbox/zonegenerator/distancezoneimagetoolbox.cpp
+++ b/applications/plugins/image/imagetoolbox/zonegenerator/distancezoneimagetoolbox.cpp
@@ -15,23 +15,26 @@ namespace component
 namespace engine
 {
 
-int DistanceZoneImageToolBox_Class = core::RegisterObject("DistanceZoneImageToolBox")
-        .add<DistanceZoneImageToolBox<ImageUC> >()
-        .add<DistanceZoneImageToolBox<ImageD> >(true)
+void registerDistanceZoneImageToolBox(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("DistanceZoneImageToolBox")
+    .add<DistanceZoneImageToolBox<ImageUC> >()
+    .add<DistanceZoneImageToolBox<ImageD> >(true)
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<DistanceZoneImageToolBox<ImageC> >()
-        .add<DistanceZoneImageToolBox<ImageI> >()
-        .add<DistanceZoneImageToolBox<ImageUI> >()
-        .add<DistanceZoneImageToolBox<ImageS> >()
-        .add<DistanceZoneImageToolBox<ImageUS> >()
-        .add<DistanceZoneImageToolBox<ImageL> >()
-        .add<DistanceZoneImageToolBox<ImageUL> >()
-        .add<DistanceZoneImageToolBox<ImageF> >()
-        .add<DistanceZoneImageToolBox<ImageB> >()
+    .add<DistanceZoneImageToolBox<ImageC> >()
+    .add<DistanceZoneImageToolBox<ImageI> >()
+    .add<DistanceZoneImageToolBox<ImageUI> >()
+    .add<DistanceZoneImageToolBox<ImageS> >()
+    .add<DistanceZoneImageToolBox<ImageUS> >()
+    .add<DistanceZoneImageToolBox<ImageL> >()
+    .add<DistanceZoneImageToolBox<ImageUL> >()
+    .add<DistanceZoneImageToolBox<ImageF> >()
+    .add<DistanceZoneImageToolBox<ImageB> >()
 #endif
-        .addLicense("LGPL")
-        .addAuthor("Vincent Majorczyk");
-
+    .addLicense("LGPL")
+    .addAuthor("Vincent Majorczyk")
+    );
+}
 
 
 
diff --git a/applications/plugins/image/imagetoolbox/zonegenerator/zonegeneratorimagetoolbox.cpp b/applications/plugins/image/imagetoolbox/zonegenerator/zonegeneratorimagetoolbox.cpp
index 82903105c5c..4584e7ff72c 100644
--- a/applications/plugins/image/imagetoolbox/zonegenerator/zonegeneratorimagetoolbox.cpp
+++ b/applications/plugins/image/imagetoolbox/zonegenerator/zonegeneratorimagetoolbox.cpp
@@ -15,22 +15,27 @@ namespace component
 namespace engine
 {
 
-int ZoneGeneratorImageToolBox_Class = core::RegisterObject("ZoneGeneratorImageToolBox")
-        .add<ZoneGeneratorImageToolBox<ImageUC> >()
-        .add<ZoneGeneratorImageToolBox<ImageD> >(true)
+void registerZoneGeneratorImageToolBox(sofa::core::ObjectFactory* factory)
+{
+    factory->registerObjects(sofa::core::ObjectRegistrationData("ZoneGeneratorImageToolBox")
+    .add<ZoneGeneratorImageToolBox<ImageUC> >()
+    .add<ZoneGeneratorImageToolBox<ImageD> >(true)
 #if PLUGIN_IMAGE_COMPILE_SET == PLUGIN_IMAGE_COMPILE_SET_FULL
-        .add<ZoneGeneratorImageToolBox<ImageC> >()
-        .add<ZoneGeneratorImageToolBox<ImageI> >()
-        .add<ZoneGeneratorImageToolBox<ImageUI> >()
-        .add<ZoneGeneratorImageToolBox<ImageS> >()
-        .add<ZoneGeneratorImageToolBox<ImageUS> >()
-        .add<ZoneGeneratorImageToolBox<ImageL> >()
-        .add<ZoneGeneratorImageToolBox<ImageUL> >()
-        .add<ZoneGeneratorImageToolBox<ImageF> >()
-        .add<ZoneGeneratorImageToolBox<ImageB> >()
+    .add<ZoneGeneratorImageToolBox<ImageC> >()
+    .add<ZoneGeneratorImageToolBox<ImageI> >()
+    .add<ZoneGeneratorImageToolBox<ImageUI> >()
+    .add<ZoneGeneratorImageToolBox<ImageS> >()
+    .add<ZoneGeneratorImageToolBox<ImageUS> >()
+    .add<ZoneGeneratorImageToolBox<ImageL> >()
+    .add<ZoneGeneratorImageToolBox<ImageUL> >()
+    .add<ZoneGeneratorImageToolBox<ImageF> >()
+    .add<ZoneGeneratorImageToolBox<ImageB> >()
 #endif
-        .addLicense("LGPL")
-        .addAuthor("Vincent Majorczyk");
+    .addLicense("LGPL")
+    .addAuthor("Vincent Majorczyk")
+    );
+}
+
 
 template<>
 double ZoneGeneratorImageToolBox<ImageD>::color(int index,int max)
diff --git a/applications/plugins/image/initImage.cpp b/applications/plugins/image/initImage.cpp
index a1a83e3cbc0..fa1c3739e39 100644
--- a/applications/plugins/image/initImage.cpp
+++ b/applications/plugins/image/initImage.cpp
@@ -20,6 +20,7 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #include <image/config.h>
+#include <sofa/core/ObjectFactory.h>
 #include <sofa/helper/system/PluginManager.h>
 #include <sofa/helper/logging/Messaging.h>
 
@@ -28,12 +29,53 @@
     #include "python/Binding_ImageData.h"
 #endif
 
+namespace sofa::defaulttype
+{
+    extern void registerDataExchange(sofa::core::ObjectFactory* factory);
+}
 
-namespace sofa
+namespace sofa::component
 {
 
-namespace component
+namespace misc
 {
+    extern void registerImageExporter(sofa::core::ObjectFactory* factory);
+}
+
+namespace engine
+{
+    extern void registerVoronoiToMeshEngine(sofa::core::ObjectFactory* factory);
+    extern void registerTransferFunction(sofa::core::ObjectFactory* factory);
+    extern void registerMeshToImageEngine(sofa::core::ObjectFactory* factory);
+    extern void registerMergeImages(sofa::core::ObjectFactory* factory);
+    extern void registerMarchingCubesEngine(sofa::core::ObjectFactory* factory);
+    extern void registerImageValuesFromPositions(sofa::core::ObjectFactory* factory);
+    extern void registerImageTransformEngine(sofa::core::ObjectFactory* factory);
+    extern void registerImageTransform(sofa::core::ObjectFactory* factory);
+    extern void registerImageToRigidMassEngine(sofa::core::ObjectFactory* factory);
+    extern void registerImageSampler(sofa::core::ObjectFactory* factory);
+    extern void registerImageOperation(sofa::core::ObjectFactory* factory);
+    extern void registerImageFilter(sofa::core::ObjectFactory* factory);
+    extern void registerImageDataDisplay(sofa::core::ObjectFactory* factory);
+    extern void registerImageCoordValuesFromPositions(sofa::core::ObjectFactory* factory);
+    extern void registerGenerateImage(sofa::core::ObjectFactory* factory);
+    extern void registerDepthMapToMeshEngine(sofa::core::ObjectFactory* factory);
+    extern void registerCollisionToCarvingEngine(sofa::core::ObjectFactory* factory);
+
+#ifdef PLUGIN_IMAGE_COMPILE_GUI
+    extern void registerContourImageToolBox(sofa::core::ObjectFactory* factory);
+    extern void registerAverageCatchAllVector(sofa::core::ObjectFactory* factory);
+    extern void registerCatchAllVector(sofa::core::ObjectFactory* factory);
+    extern void registerDepthImageToolBox(sofa::core::ObjectFactory* factory);
+    extern void registerMergedCatchAllVector(sofa::core::ObjectFactory* factory);
+    extern void registerLabelBoxImageToolBox(sofa::core::ObjectFactory* factory);
+    extern void registerLabelGridImageToolBox(sofa::core::ObjectFactory* factory);
+    extern void registerLabelPointImageToolBox(sofa::core::ObjectFactory* factory);
+    extern void registerLabelPointsBySectionImageToolBox(sofa::core::ObjectFactory* factory);
+    extern void registerDistanceZoneImageToolBox(sofa::core::ObjectFactory* factory);
+    extern void registerZoneGeneratorImageToolBox(sofa::core::ObjectFactory* factory);
+#endif
+}
 
 //Here are just several convenient functions to help user to know what contains the plugin
 
@@ -43,7 +85,7 @@ extern "C" {
     SOFA_IMAGE_API const char* getModuleVersion();
     SOFA_IMAGE_API const char* getModuleLicense();
     SOFA_IMAGE_API const char* getModuleDescription();
-    SOFA_IMAGE_API const char* getModuleComponentList();
+    SOFA_IMAGE_API void registerObjects(sofa::core::ObjectFactory* factory);
 }
 
 void initExternalModule()
@@ -51,6 +93,9 @@ void initExternalModule()
     static bool first = true;
     if (first)
     {
+        // make sure that this plugin is registered into the PluginManager
+        sofa::helper::system::PluginManager::getInstance().registerPlugin(image::MODULE_NAME);
+
         first = false;
 
 #if IMAGE_HAVE_SOFAPYTHON
@@ -106,12 +151,28 @@ const char* getModuleDescription()
     return "Image support in SOFA";
 }
 
-const char* getModuleComponentList()
+void registerObjects(sofa::core::ObjectFactory* factory)
 {
-    return "ImageContainer,ImageExporter,ImageViewer,ImageFilter,ImageToMeshEngine";
+    sofa::defaulttype::registerDataExchange(factory);
+    sofa::component::misc::registerImageExporter(factory);
+    sofa::component::engine::registerVoronoiToMeshEngine(factory);
+    sofa::component::engine::registerTransferFunction(factory);
+    sofa::component::engine::registerMeshToImageEngine(factory);
+    sofa::component::engine::registerMergeImages(factory);
+    sofa::component::engine::registerMarchingCubesEngine(factory);
+    sofa::component::engine::registerImageValuesFromPositions(factory);
+    sofa::component::engine::registerImageTransformEngine(factory);
+    sofa::component::engine::registerImageTransform(factory);
+    sofa::component::engine::registerImageToRigidMassEngine(factory);
+    sofa::component::engine::registerImageSampler(factory);
+    sofa::component::engine::registerImageOperation(factory);
+    sofa::component::engine::registerImageFilter(factory);
+    sofa::component::engine::registerImageDataDisplay(factory);
+    sofa::component::engine::registerImageCoordValuesFromPositions(factory);
+    sofa::component::engine::registerGenerateImage(factory);
+    sofa::component::engine::registerDepthMapToMeshEngine(factory);
+    sofa::component::engine::registerCollisionToCarvingEngine(factory);
 }
 
-} // namespace image
-
-} // namespace sofa
+} // namespace sofa::component