diff --git a/CDB/test_ConfigDb.json b/CDB/test_ConfigDb.json
index 92331cd38297e3f014321c8565b1dca69f4a7572..879d73f275d0b7c275a01219cffcea92501be870 100644
--- a/CDB/test_ConfigDb.json
+++ b/CDB/test_ConfigDb.json
@@ -19,17 +19,36 @@
                     "LTS/SDP/1": {
                         "properties": {
                             "OPC_Server_Name": [
-                                "DESPi2.astron.nl"
+                                "dop36.astron.nl"
                             ]
                         }
                     }
                 }
             }
         },
-        "example_device": {
+        "APSCTL": {
             "1": {
-                "example_device": {
-                    "LTS/example_device/1": {
+                "APSCTL": {
+                    "LTS/APSCTL/1": {
+                        "properties": {
+                            "OPC_Server_Name": [
+                                "ltspi.astron.nl"
+                            ],
+                            "OPC_Server_Port": [
+                                "4844"
+                            ],
+                            "OPC_Time_Out": [
+                                "5.0"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "test_device": {
+            "1": {
+                "test_device": {
+                    "LTS/test_device/1": {
                          "attribute_properties": {
                             "Ant_mask_RW": {
                                 "archive_period": [
diff --git a/CDB/windows_ConfigDb.json b/CDB/windows_ConfigDb.json
index 47c23ed110ba476e508bebe1ccf7bca1c387bd8d..c84fb3855372ba588de5bdef470d665b46ea6a99 100644
--- a/CDB/windows_ConfigDb.json
+++ b/CDB/windows_ConfigDb.json
@@ -26,10 +26,62 @@
                 }
             }
         },
-        "example_device": {
+		"ini_device": {
             "1": {
-                "example_device": {
-                    "LTS/example_device/1": {
+                "ini_device": {
+                    "LTS/ini_device/1": {
+                         "attribute_properties": {
+                            "Ant_mask_RW": {
+                                "archive_period": [
+                                    "600000"
+                                ]
+                            }
+						},
+                        "properties": {
+                            "SNMP_community": [
+                                "public"
+                            ],
+                            "SNMP_host": [
+                                "172.22.176.1"
+                            ],
+                            "SNMP_timeout": [
+                                "5.0"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "SNMP": {
+            "1": {
+                "SNMP": {
+                    "LTS/SNMP/1": {
+                         "attribute_properties": {
+                            "Ant_mask_RW": {
+                                "archive_period": [
+                                    "600000"
+                                ]
+                            }
+						},
+                        "properties": {
+                            "SNMP_community": [
+                                "public"
+                            ],
+                            "SNMP_host": [
+                                "172.22.176.1"
+                            ],
+                            "SNMP_timeout": [
+                                "5.0"
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+		"test_device": {
+            "1": {
+                "test_device": {
+                    "LTS/test_device/1": {
                          "attribute_properties": {
                             "Ant_mask_RW": {
                                 "archive_period": [