diff --git a/tests/variableTreeXml/rename.xml b/tests/variableTreeXml/rename.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8bcbffbfaab96c5d793033bed29f65d7275ee653
--- /dev/null
+++ b/tests/variableTreeXml/rename.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<device_server xmlns="https://github.com/ChimeraTK/ControlSystemAdapter-DoocsAdapter">
+  <location name="DUMMY_LOCATION">
+    <property source="/A/b/cd/e" name="LOLO"/>
+    <property source="jo" name="yep"/>
+  </location>
+</device_server>
diff --git a/tests/variableTreeXml/simpleTree.xml b/tests/variableTreeXml/simpleTree.xml
deleted file mode 100644
index 28bc38a81c2875992893fbb2d9b354344d86f5c2..0000000000000000000000000000000000000000
--- a/tests/variableTreeXml/simpleTree.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doocs_variable_tree xmlns="https://github.com/ChimeraTK/ControlSystemAdapter-DoocsAdapter" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://github.com/ChimeraTK/ControlSystemAdapter-DoocsAdapter doocs_variable_tree.xsd">
-  <facility>
-    <device>
-      <location>
-        <property source="A/b/cd/e">
-          <has_history/>
-          <is_constant/>
-        </property>
-      </location>
-    </device>
-  </facility>
-</doocs_variable_tree>
diff --git a/xmlschema/doocs_variable_tree.xsd b/xmlschema/doocs_variable_tree.xsd
index 55315306bf90f6ca89cf70ea5249a35d1137715d..12ca838e19147c6963dc9d9a794a0c8607c1ac59 100644
--- a/xmlschema/doocs_variable_tree.xsd
+++ b/xmlschema/doocs_variable_tree.xsd
@@ -12,36 +12,27 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:element name="doocs_variable_tree" type="DoocsTreeType"/>
-
-  <xs:complexType name="DoocsTreeType">
-    <xs:sequence>
-      <xs:element name="facility" type="FacilityType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="FacilityType">
-    <xs:sequence>
-      <xs:element name="device" type="DeviceType" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
+  <xs:element name="device_server" type="DeviceType"/>
 
   <xs:complexType name="DeviceType">
     <xs:sequence>
-      <xs:element name="location" type="LocationType" maxOccurs="unbounded"/>
-    </xs:sequence>
+      <xs:element name="location" type="LocationType"  minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="import" type="xs:string"  minOccurs="0" maxOccurs="unbounded"/>
+   </xs:sequence>
   </xs:complexType>
 
   <xs:complexType name="LocationType">
     <xs:sequence>
-      <xs:element name="property" type="PropertyType" maxOccurs="unbounded"/>
+      <xs:element name="property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="import" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
     </xs:sequence>
-  </xs:complexType>
+     <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
 
   <xs:complexType name="PropertyType">
     <xs:sequence>
-      <xs:element name="has_history" type="xs:boolean" default="true"/>
-      <xs:element name="is_constant" type="xs:boolean" default="false"/>
+      <xs:element name="has_history" type="xs:boolean" default="true" minOccurs="0"/>
+      <xs:element name="is_writeable" type="xs:boolean" default="true" minOccurs="0"/>
       <xs:element name="spectrum" type="SpectrumType" minOccurs="0"/>
     </xs:sequence>
     <xs:attribute name="source" type="xs:string" use="required"/>