diff --git a/cpp/src/Manager.cpp b/cpp/src/Manager.cpp
index f6966b24c0..1c8aa12016 100644
--- a/cpp/src/Manager.cpp
+++ b/cpp/src/Manager.cpp
@@ -4821,6 +4821,25 @@ if (Driver* driver = GetDriver(_homeId))
 return "";
 }
 
+//-----------------------------------------------------------------------------
+// <Manager::GetMetaDataId>
+// Retrieve metadata from its name
+//-----------------------------------------------------------------------------
+Node::MetaDataFields Manager::GetMetaDataId(const string& metaDataFiledToParse)
+{
+	return Node::GetMetaDataId(metaDataFiledToParse);
+}
+
+
+//-----------------------------------------------------------------------------
+// <Manager::GetMetaDataString>
+// Get the MetaData string representation
+//-----------------------------------------------------------------------------
+string const Manager::GetMetaDataString(Node::MetaDataFields metaData)
+{
+	return Node::GetMetaDataString(metaData);
+}
+
 //-----------------------------------------------------------------------------
 // <Manager::GetChangeLog>
 // Retrieve ChangeLog of a Configuration File about a Node.
diff --git a/cpp/src/Manager.h b/cpp/src/Manager.h
index 3abe392f53..1a77cd57f8 100644
--- a/cpp/src/Manager.h
+++ b/cpp/src/Manager.h
@@ -2645,6 +2645,18 @@ namespace OpenZWave
 			 * \return a string containing the requested metadata
 			 */
 			string const GetMetaData(uint32 const _homeId, uint8 const _nodeId, Node::MetaDataFields _metadata);
+			 /**
+			  * \brief Retrieve metadata from its name
+			  * \param metaDataFiledToParse the string to parse (careful, case sensitive)
+			  * \return the found metaDataField if parsing is successful, or MetaData_Invalid 
+			  */
+			 Node::MetaDataFields GetMetaDataId(const string & metaDataFiledToParse);
+			 /**
+			  * \brief Get the MetaData string representation
+			  * \param metaData the metaData enum
+			  * \return the metaData name (or empty string if not found)
+			  */
+			 string const GetMetaDataString(Node::MetaDataFields metaData);			
 			/**
 			 * \brief Retrieve ChangeLogs about a configuration revision
 			 * \param _homeId The Home ID of the driver for the node
diff --git a/cpp/src/Node.h b/cpp/src/Node.h
index 374b7bc49b..89a5ba28fe 100644
--- a/cpp/src/Node.h
+++ b/cpp/src/Node.h
@@ -902,8 +902,8 @@ namespace OpenZWave
 					string description;
 			};
 			string const GetMetaData(MetaDataFields);
-			MetaDataFields GetMetaDataId(string);
-			string const GetMetaDataString(MetaDataFields);
+			static MetaDataFields GetMetaDataId(string);
+			static string const GetMetaDataString(MetaDataFields);
 			ChangeLogEntry const GetChangeLog(uint32_t);
 
 		private: