diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index d1e1711830fc83b899e9a4a47401c5936339d912..9cbd13ed2f87accd140f5343c2ab20264abdc497 100644
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -357,7 +357,7 @@ ImageFileReader<TOutputImage>
   {
     otbMsgDevMacro( <<"OSSIM Open Image SUCCESS ! ");
 //     hasMetaData = handler->getImageGeometry(geom_kwl);
-    hasMetaData = handler->saveState(geom_kwl);
+    hasMetaData = handler->getImageGeometry()->getProjection()->saveState(geom_kwl);
   }
   // Free memory
   delete handler;
diff --git a/Code/IO/otbImageFileWriter.txx b/Code/IO/otbImageFileWriter.txx
index cf39f6998d68450e04e7d3f42792b4c5d8584ae5..348b412f4aa91f4399a1e332f30340f6a64f439a 100644
--- a/Code/IO/otbImageFileWriter.txx
+++ b/Code/IO/otbImageFileWriter.txx
@@ -109,7 +109,7 @@ ImageFileWriter<TInputImage>
     else
       {
 //       handler->setImageGeometry(geom_kwl);
-      handler->loadState(geom_kwl);
+      handler->getImageGeometry()->getProjection()->loadState(geom_kwl);
       handler->saveImageGeometry();
       handler->close();
       }
diff --git a/Code/IO/otbStreamingImageFileWriter.txx b/Code/IO/otbStreamingImageFileWriter.txx
index 56fc23598867cde2443921d7307d4232fa0db8e5..23fb0ac2541b657056a5680297bc71b0c32627b2 100644
--- a/Code/IO/otbStreamingImageFileWriter.txx
+++ b/Code/IO/otbStreamingImageFileWriter.txx
@@ -553,7 +553,7 @@ StreamingImageFileWriter<TInputImage>
     else
       {
 //       handler->setImageGeometry(geom_kwl);
-      handler->loadState(geom_kwl);
+      handler->getImageGeometry()->getProjection()->loadState(geom_kwl);
       handler->saveImageGeometry();
       handler->close();
       }
diff --git a/Testing/Utilities/ossimIntegrationTest.cxx b/Testing/Utilities/ossimIntegrationTest.cxx
index a37d8335964ccbd8e0412fdfce4a5bd8e737853d..96dcb1aa20a27fd11788047e36e0d7903a6c69a7 100644
--- a/Testing/Utilities/ossimIntegrationTest.cxx
+++ b/Testing/Utilities/ossimIntegrationTest.cxx
@@ -90,7 +90,7 @@ int ossimIntegrationTest(int argc, char* argv[])
 
       ossimKeywordlist geom;
 //       handler->getImageGeometry(geom);
-      handler->saveState(geom);
+      handler->getImageGeometry()->getProjection()->saveState(geom);
       // grab a projection if it exists
       //
       ossimProjection* inputProjection = ossimProjectionFactoryRegistry::instance()->createProjection(geom);
diff --git a/Testing/Utilities/ossimKeywordlistTest.cxx b/Testing/Utilities/ossimKeywordlistTest.cxx
index e59de52ff4f61efadb66cfe07b4b6bcf9fb2643c..e60882a947c58e1c2c640aa2cf9992c13124015e 100644
--- a/Testing/Utilities/ossimKeywordlistTest.cxx
+++ b/Testing/Utilities/ossimKeywordlistTest.cxx
@@ -47,7 +47,7 @@ int ossimKeywordlistTest(int argc, char* argv[])
         }
 
         ossimKeywordlist geom;
-        handler->saveState(geom);
+        handler->getImageGeometry()->getProjection()->saveState(geom);
         ofstream file;
         file.open(argv[2]);
         file << " keywordlist:"<<std::endl<<geom<<std::endl;
diff --git a/Testing/Utilities/ossimRadarSatSupport.cxx b/Testing/Utilities/ossimRadarSatSupport.cxx
index 46510b0bbf7cbd3eb7f129e595977cf42fa00d11..6573d25ff9a730805a6ce456d992ae595bb7853e 100644
--- a/Testing/Utilities/ossimRadarSatSupport.cxx
+++ b/Testing/Utilities/ossimRadarSatSupport.cxx
@@ -79,7 +79,7 @@ int ossimRadarSatSupport( int argc, char* argv[] )
 		 */
         ossimKeywordlist geom;
         std::cout<<"Read ossim Keywordlist...";
-		  if  (! handler->saveState(geom)) {
+		  if  (! handler->getImageGeometry()->getProjection()->saveState(geom)) {
 				std::cout << "Bad metadata parsing "<< std::endl;
 				return EXIT_FAILURE;
 		  }