diff --git a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
index 99f91e342b3711dc82082935ca58138308f3968a..49520c8a22edb3f4fb8851bddaad429836330b6a 100644
--- a/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSentinel1ImageMetadataInterface.h
@@ -105,22 +105,22 @@ protected:
   }
 
   /* Fetch the AzimuthFmRate metadata */
-  std::vector<OTB_azimuthFmRate> GetAzimuthFmRate(XMLMetadataSupplier) const;
+  std::vector<OTB_azimuthFmRate> GetAzimuthFmRate(const XMLMetadataSupplier&) const;
 
   /* Fetch the DopplerCentroid metadata */
-  std::vector<OTB_dopplerCentroid> GetDopplerCentroid(XMLMetadataSupplier) const;
+  std::vector<OTB_dopplerCentroid> GetDopplerCentroid(const XMLMetadataSupplier&) const;
 
   /* Fetch the Orbits metadata */
-  std::vector<OTB_Orbit> GetOrbits(XMLMetadataSupplier) const;
+  std::vector<OTB_Orbit> GetOrbits(const XMLMetadataSupplier&) const;
 
   /* Fetch the Calibration metadata */
-  std::vector<OTB_calibrationVector> GetCalibrationVector(XMLMetadataSupplier) const;
+  std::vector<OTB_calibrationVector> GetCalibrationVector(const XMLMetadataSupplier&) const;
 
   /* Fetch the noise LUTs */
-  std::vector<OTB_SARNoise> GetNoiseVector(XMLMetadataSupplier) const;
+  std::vector<OTB_SARNoise> GetNoiseVector(const XMLMetadataSupplier&) const;
 
   /* Compute the mean terrain elevation */
-  double getBandTerrainHeight(XMLMetadataSupplier) const;
+  double getBandTerrainHeight(const XMLMetadataSupplier&) const;
 
 private:
   Sentinel1ImageMetadataInterface(const Self&) = delete;
diff --git a/Modules/Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx
index 2e93973d7702fa12dc01da0d34deb17b19b7f08b..959aa22fad4ede820c48cf1c7beb4f2b382e9f56 100644
--- a/Modules/Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx
+++ b/Modules/Core/Metadata/src/otbSentinel1ImageMetadataInterface.cxx
@@ -352,7 +352,7 @@ double Sentinel1ImageMetadataInterface::GetCenterIncidenceAngle() const
   return 0;
 }
 
-std::vector<OTB_azimuthFmRate> Sentinel1ImageMetadataInterface::GetAzimuthFmRate(XMLMetadataSupplier xmlMS) const
+std::vector<OTB_azimuthFmRate> Sentinel1ImageMetadataInterface::GetAzimuthFmRate(const XMLMetadataSupplier &xmlMS) const
 {
   std::vector<OTB_azimuthFmRate> azimuthFmRateVector;
   // Number of entries in the vector
@@ -375,7 +375,7 @@ std::vector<OTB_azimuthFmRate> Sentinel1ImageMetadataInterface::GetAzimuthFmRate
   return azimuthFmRateVector;
 }
 
-std::vector<OTB_dopplerCentroid> Sentinel1ImageMetadataInterface::GetDopplerCentroid(XMLMetadataSupplier xmlMS) const
+std::vector<OTB_dopplerCentroid> Sentinel1ImageMetadataInterface::GetDopplerCentroid(const XMLMetadataSupplier &xmlMS) const
 {
   std::vector<OTB_dopplerCentroid> dopplerCentroidVector;
   // Number of entries in the vector
@@ -400,7 +400,7 @@ std::vector<OTB_dopplerCentroid> Sentinel1ImageMetadataInterface::GetDopplerCent
   return dopplerCentroidVector;
 }
 
-std::vector<OTB_Orbit> Sentinel1ImageMetadataInterface::GetOrbits(XMLMetadataSupplier xmlMS) const
+std::vector<OTB_Orbit> Sentinel1ImageMetadataInterface::GetOrbits(const XMLMetadataSupplier &xmlMS) const
 {
   std::vector<OTB_Orbit> orbitVector;
   // Number of entries in the vector
@@ -426,7 +426,7 @@ std::vector<OTB_Orbit> Sentinel1ImageMetadataInterface::GetOrbits(XMLMetadataSup
   return orbitVector;
 }
 
-std::vector<OTB_calibrationVector> Sentinel1ImageMetadataInterface::GetCalibrationVector(XMLMetadataSupplier xmlMS) const
+std::vector<OTB_calibrationVector> Sentinel1ImageMetadataInterface::GetCalibrationVector(const XMLMetadataSupplier &xmlMS) const
 {
   std::vector<OTB_calibrationVector> calibrationVector;
   // Number of entries in the vector
@@ -478,7 +478,7 @@ std::vector<OTB_calibrationVector> Sentinel1ImageMetadataInterface::GetCalibrati
   return calibrationVector;
 }
 
-std::vector<OTB_SARNoise> Sentinel1ImageMetadataInterface::GetNoiseVector(XMLMetadataSupplier xmlMS) const
+std::vector<OTB_SARNoise> Sentinel1ImageMetadataInterface::GetNoiseVector(const XMLMetadataSupplier &xmlMS) const
 {
   std::vector<OTB_SARNoise> noiseVector;
   // Number of entries in the vector
@@ -506,7 +506,7 @@ std::vector<OTB_SARNoise> Sentinel1ImageMetadataInterface::GetNoiseVector(XMLMet
   return noiseVector;
 }
 
-double Sentinel1ImageMetadataInterface::getBandTerrainHeight(XMLMetadataSupplier xmlMS) const
+double Sentinel1ImageMetadataInterface::getBandTerrainHeight(const XMLMetadataSupplier &xmlMS) const
 {
   double heightSum = 0.0;
   // Number of entries in the vector