diff --git a/tools/generate_dm_xml.py b/tools/generate_dm_xml.py
index 9306ae97..0633f908 100755
--- a/tools/generate_dm_xml.py
+++ b/tools/generate_dm_xml.py
@@ -86,6 +86,7 @@ def get_info_from_json(data, dm_json_files=None):
                 string=string + "."
 
         if len(string) != 0:
+            string = string.replace("X_IOWRT_EU_", "{BBF_VENDOR_PREFIX}").replace("X_GENEXIS_EU_", "{BBF_VENDOR_PREFIX}")
             list_data.append(string)
 
     if len(list_data) == 0:
@@ -103,6 +104,12 @@ def get_info_from_json(data, dm_json_files=None):
 
                 index = -1
                 for key in ob.keys():
+
+                    if key == "json_plugin_version":
+                        continue
+
+                    key = key.replace("X_IOWRT_EU_", "{BBF_VENDOR_PREFIX}").replace("X_GENEXIS_EU_", "{BBF_VENDOR_PREFIX}")
+
                     if key in list_data:
                         index = list_data.index(key)
                         break
diff --git a/tools/tools_input.json b/tools/tools_input.json
index adc61fa8..fc7afdc3 100644
--- a/tools/tools_input.json
+++ b/tools/tools_input.json
@@ -465,6 +465,7 @@
       "version": "devel",
       "service_name": "ieee1905",
       "unified_daemon": false,
+      "dm_info_file": "../iopsys/ieee1905/files/datamodel_description.json",
       "compile": [
         "make -C tr181 clean",
         "make -C tr181"
@@ -598,6 +599,7 @@
       "repo": "https://dev.iopsys.eu/feed/iopsys.git",
       "proto": "git",
       "version": "devel",
+      "dm_info_file": "netmode/files/datamodel.json",
       "service_name": "netmode",
       "unified_daemon": false,
       "post_install": [
@@ -624,7 +626,7 @@
       "repo": "https://dev.iopsys.eu/feed/gnx.git",
       "proto": "git",
       "version": "devel",
-      "dm_info_file": "package/gnx-files-ftth/bbf_plugin/datamodel_description.json",
+      "dm_info_file": "package/gnx-files-ftth/bbf_plugin/link_forwarding.json",
       "post_install": [
         "mkdir -p /usr/share/bbfdm/micro_services/ethmngr",
         "sed 's/{BBF_VENDOR_PREFIX}/X_GENEXIS_EU_/g' package/gnx-files-ftth/bbf_plugin/link_forwarding.json > /usr/share/bbfdm/micro_services/ethmngr/link_forwarding.json"
@@ -666,7 +668,7 @@
       "repo": "https://dev.iopsys.eu/feed/gnx.git",
       "proto": "git",
       "version": "devel",
-      "dm_info_file": "genexis-packages/easywifi/files/datamodel_description.json",
+      "dm_info_file": "genexis-packages/easywifi/files/wifi_extn.json",
       "post_install": [
         "mkdir -p /usr/share/bbfdm/micro_services/wifidmd",
         "sed 's/{BBF_VENDOR_PREFIX}/X_GENEXIS_EU_/g' genexis-packages/easywifi/files/wifi_extn.json > /usr/share/bbfdm/micro_services/wifidmd/wifi_extn.json"