diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarFacilityData.h b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarFacilityData.h
index 26db87f0a129581aa83a1dec52c41355016f1feb..c0ce939743ac543153d3af172bfa47c2d95ca2aa 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarFacilityData.h
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarFacilityData.h
@@ -1109,63 +1109,63 @@ public:
   /**
   * @brief coef_ground_range_1
   */
-  double   get_coef_ground_range_1()
+  double   get_coef_ground_range_1() const
   {
     return _coef_ground_range_1;
   };
   /**
   * @brief coef_ground_range_2
   */
-  double   get_coef_ground_range_2()
+  double   get_coef_ground_range_2() const
   {
     return _coef_ground_range_2;
   };
   /**
   * @brief coef_ground_range_3
   */
-  double   get_coef_ground_range_3()
+  double   get_coef_ground_range_3() const
   {
     return _coef_ground_range_3;
   };
   /**
   * @brief coef_ground_range_4
   */
-  double   get_coef_ground_range_4()
+  double   get_coef_ground_range_4() const
   {
     return _coef_ground_range_4;
   };
   /**
   * @brief coef_ant_elev_1
   */
-  double   get_coef_ant_elev_1()
+  double   get_coef_ant_elev_1() const
   {
     return _coef_ant_elev_1;
   };
   /**
   * @brief coef_ant_elev_2
   */
-  double   get_coef_ant_elev_2()
+  double   get_coef_ant_elev_2() const
   {
     return _coef_ant_elev_2;
   };
   /**
   * @brief coef_ant_elev_3
   */
-  double   get_coef_ant_elev_3()
+  double   get_coef_ant_elev_3() const
   {
     return _coef_ant_elev_3;
   };
   /**
   * @brief coef_ant_elev_4
   */
-  double   get_coef_ant_elev_4()
+  double   get_coef_ant_elev_4() const
   {
     return _coef_ant_elev_4;
   };
   /**
   * @brief coef_ant_elev_5
   */
-  double   get_coef_ant_elev_5()
+  double   get_coef_ant_elev_5() const
   {
     return _coef_ant_elev_5;
   };
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
index 88c370bef1ccb440f7cbce410e9a7989a39440f1..b137076704ce5a878f2e7ebacb5e8819858ced0d 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.cpp
@@ -144,7 +144,7 @@ bool AlosSarLeader::saveState(ossimKeywordlist& kwl,
   /*
    * Adding metadata necessary to the sensor model in the keywordlist
    */
-  AlosSarFileDescriptor *leaderfiledesc = get_AlosSarFileDescriptor();
+  const AlosSarFileDescriptor *leaderfiledesc = get_AlosSarFileDescriptor();
   if (leaderfiledesc != NULL)
   {
     kwl.add(prefix, "filename",leaderfiledesc->get_file_name().c_str(),true);
@@ -157,7 +157,7 @@ bool AlosSarLeader::saveState(ossimKeywordlist& kwl,
   /*
    * Adding metadata necessary to the sensor model in the keywordlist
    */
-  AlosSarDataSetSummary *datasetSummary = get_AlosSarDataSetSummary();
+  const AlosSarDataSetSummary *datasetSummary = get_AlosSarDataSetSummary();
   if ( (datasetSummary != NULL) && (result == true) )
   {
     kwl.add(prefix, "inp_sctim",(datasetSummary->get_inp_sctim()).c_str(),true);
@@ -174,37 +174,39 @@ bool AlosSarLeader::saveState(ossimKeywordlist& kwl,
     kwl.add(prefix, "pix_spacing", datasetSummary->get_pix_spacing(),true);
     kwl.add(prefix, "nlooks_az", datasetSummary->get_n_azilok(),true);
     kwl.add(prefix, "n_rnglok", datasetSummary->get_n_rnglok(),true);
-    kwl.add(prefix, "zero_dop_range_time_f_pixel", datasetSummary->get_zero_dop_range_time_f_pixel(),true);
-    kwl.add(prefix, "zero_dop_range_time_c_pixel", datasetSummary->get_zero_dop_range_time_c_pixel(),true);
-    kwl.add(prefix, "zero_dop_range_time_l_pixel", datasetSummary->get_zero_dop_range_time_l_pixel(),true);
+    //FIXME check if those data are available
+//     kwl.add(prefix, "zero_dop_range_time_f_pixel", datasetSummary->get_zero_dop_range_time_f_pixel(),true);
+//     kwl.add(prefix, "zero_dop_range_time_c_pixel", datasetSummary->get_zero_dop_range_time_c_pixel(),true);
+//     kwl.add(prefix, "zero_dop_range_time_l_pixel", datasetSummary->get_zero_dop_range_time_l_pixel(),true);
   }
   else
   {
     result = false;
   }
 
-  AlosSarMapProjectionData *mapprojectiondata = get_AlosSarMapProjectionData();
-  if ( (mapprojectiondata != NULL) && (result == true) )
-  {
-    kwl.add(prefix, "map_proj_des",(mapprojectiondata->get_map_proj_des()).c_str(),true);
-    kwl.add(prefix, "num_lines",(double) mapprojectiondata->get_num_lines(),true);
-    kwl.add(prefix, "num_pix",(double) mapprojectiondata->get_num_pix_in_line(),true);
-    kwl.add(prefix, "first_line_first_pixel_lat",mapprojectiondata->get_first_line_first_pixel_lat(), true);
-    kwl.add(prefix, "first_line_first_pixel_lon",mapprojectiondata->get_first_line_first_pixel_lon(), true);
-    kwl.add(prefix, "first_line_last_pixel_lat",mapprojectiondata->get_first_line_last_pixel_lat(), true);
-    kwl.add(prefix, "first_line_last_pixel_lon",mapprojectiondata->get_first_line_last_pixel_lon(), true);
-    kwl.add(prefix, "last_line_first_pixel_lat",mapprojectiondata->get_last_line_first_pixel_lat(), true);
-    kwl.add(prefix, "last_line_first_pixel_lon",mapprojectiondata->get_last_line_first_pixel_lon(), true);
-    kwl.add(prefix, "last_line_last_pixel_lat",mapprojectiondata->get_last_line_last_pixel_lat(), true);
-    kwl.add(prefix, "last_line_last_pixel_lon",mapprojectiondata->get_last_line_last_pixel_lon(), true);
-  }
-  else
-  {
-    result = false;
-  }
-
-  AlosSarPlatformPositionData *platformposition = get_AlosSarPlatformPositionData();
-  if ( (mapprojectiondata != NULL) && (result == true) )
+  // FIXME do not handle Alos map projection information for now...
+//   const AlosSarMapProjectionData *mapprojectiondata = get_AlosSarMapProjectionData();
+//   if ( (mapprojectiondata != NULL) && (result == true) )
+//   {
+//     kwl.add(prefix, "map_proj_des",(mapprojectiondata->get_map_proj_des()).c_str(),true);
+//     kwl.add(prefix, "num_lines",(double) mapprojectiondata->get_num_lines(),true);
+//     kwl.add(prefix, "num_pix",(double) mapprojectiondata->get_num_pix_in_line(),true);
+//     kwl.add(prefix, "first_line_first_pixel_lat",mapprojectiondata->get_first_line_first_pixel_lat(), true);
+//     kwl.add(prefix, "first_line_first_pixel_lon",mapprojectiondata->get_first_line_first_pixel_lon(), true);
+//     kwl.add(prefix, "first_line_last_pixel_lat",mapprojectiondata->get_first_line_last_pixel_lat(), true);
+//     kwl.add(prefix, "first_line_last_pixel_lon",mapprojectiondata->get_first_line_last_pixel_lon(), true);
+//     kwl.add(prefix, "last_line_first_pixel_lat",mapprojectiondata->get_last_line_first_pixel_lat(), true);
+//     kwl.add(prefix, "last_line_first_pixel_lon",mapprojectiondata->get_last_line_first_pixel_lon(), true);
+//     kwl.add(prefix, "last_line_last_pixel_lat",mapprojectiondata->get_last_line_last_pixel_lat(), true);
+//     kwl.add(prefix, "last_line_last_pixel_lon",mapprojectiondata->get_last_line_last_pixel_lon(), true);
+//   }
+//   else
+//   {
+//     result = false;
+//   }
+
+  const AlosSarPlatformPositionData *platformposition = get_AlosSarPlatformPositionData();
+  if ( (platformposition != NULL) && (result == true) )
   {
     kwl.add(prefix, "neph", platformposition->get_ndata(),true);
     kwl.add(prefix, "eph_year", platformposition->get_year(),true);
@@ -239,7 +241,7 @@ bool AlosSarLeader::saveState(ossimKeywordlist& kwl,
   /*
    * Adding metadata necessary to the sensor model in the keywordlist
    */
-  AlosSarFacilityData *facilitydata = get_AlosSarFacilityData();
+  const AlosSarFacilityData *facilitydata = get_AlosSarFacilityData();
   if ( (facilitydata != NULL) && (result == true) )
   {
     kwl.add(prefix, "coef_ground_range_1",facilitydata->get_coef_ground_range_1(),true);
@@ -264,31 +266,38 @@ bool AlosSarLeader::saveState(ossimKeywordlist& kwl,
   return result;
 }
 
-AlosSarFacilityData * AlosSarLeader::get_AlosSarFacilityData() const
+const AlosSarFacilityData * AlosSarLeader::get_AlosSarFacilityData() const
 {
-  return (AlosSarFacilityData*)_records[AlosSarFacilityDataID];
+//   return const_cast<const AlosSarFacilityData*>(dynamic_cast<AlosSarFacilityData*>(_records[AlosSarFacilityDataID]));
+//   RecordType::const_iterator it = _records.find(AlosSarFacilityDataID)->second;
+//   return dynamic_cast<const AlosSarFacilityData*>(it.find(AlosSarFacilityDataID));
+  return dynamic_cast<const AlosSarFacilityData*>(_records.find(AlosSarFacilityDataID)->second);
 }
-AlosSarPlatformPositionData * AlosSarLeader::get_AlosSarPlatformPositionData() const
+const AlosSarPlatformPositionData * AlosSarLeader::get_AlosSarPlatformPositionData() const
 {
-  return (AlosSarPlatformPositionData*)_records[AlosSarPlatformPositionDataID];
+//   return (AlosSarPlatformPositionData*)_records[AlosSarPlatformPositionDataID];
+  return dynamic_cast<const AlosSarPlatformPositionData*>(_records.find(AlosSarPlatformPositionDataID)->second);
 }
-/* AlosSarMapProjectionData * AlosSarLeader::get_AlosSarMapProjectionData() const
+/*const AlosSarMapProjectionData * AlosSarLeader::get_AlosSarMapProjectionData() const
 {
-  return (AlosSarMapProjectionData*)_records[AlosSarMapProjectionDataID];
+//   return (AlosSarMapProjectionData*)_records[AlosSarMapProjectionDataID];
+  return dynamic_cast<const AlosSarMapProjectionData*>(_records.find(AlosSarMapProjectionDataID)->second);
 }
 
 */
 
 //no map projection data
 
-AlosSarDataSetSummary * AlosSarLeader::get_AlosSarDataSetSummary() const
+const AlosSarDataSetSummary * AlosSarLeader::get_AlosSarDataSetSummary() const
 {
-  return (AlosSarDataSetSummary*)_records[AlosSarDataSetSummaryID];
+//   return (AlosSarDataSetSummary*)_records[AlosSarDataSetSummaryID];
+  return dynamic_cast<const AlosSarDataSetSummary*>(_records.find(AlosSarDataSetSummaryID)->second);
 }
 
-AlosSarFileDescriptor * AlosSarLeader::get_AlosSarFileDescriptor() const
+const AlosSarFileDescriptor * AlosSarLeader::get_AlosSarFileDescriptor() const
 {
-  return (AlosSarFileDescriptor*)_records[AlosSarFileDescriptorID];
+//   return (AlosSarFileDescriptor*)_records[AlosSarFileDescriptorID];
+  return dynamic_cast<const AlosSarFileDescriptor*>(_records.find(AlosSarFileDescriptorID)->second);
 }
 
 }
diff --git a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.h b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.h
index 58d475bd694a03c01ba767ac4275e7bb9fe800e0..619ec6cfc55774fa0692b628355da7d56d00db7a 100644
--- a/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.h
+++ b/Utilities/otbossimplugins/ossim/AlosPalsar/AlosSarLeader.h
@@ -85,14 +85,15 @@ public:
                          const char* prefix=0) const;
 
 
-  AlosSarFacilityData * get_AlosSarFacilityData() const;
-  AlosSarPlatformPositionData * get_AlosSarPlatformPositionData() const;
-//  AlosSarMapProjectionData * get_AlosSarMapProjectionData() const;
-  AlosSarDataSetSummary * get_AlosSarDataSetSummary() const;
-  AlosSarFileDescriptor * get_AlosSarFileDescriptor() const;
+  const AlosSarFacilityData * get_AlosSarFacilityData() const;
+  const AlosSarPlatformPositionData * get_AlosSarPlatformPositionData() const;
+//  const AlosSarMapProjectionData * get_AlosSarMapProjectionData() const;
+  const AlosSarDataSetSummary * get_AlosSarDataSetSummary() const;
+  const AlosSarFileDescriptor * get_AlosSarFileDescriptor() const;
 
 protected:
-  std::map<int, AlosSarRecord*> _records;
+  typedef std::map<int, AlosSarRecord*> RecordType;
+  RecordType _records;
 
   static const int AlosSarFacilityDataID;
   static const int AlosSarPlatformPositionDataID;