diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 2c667f3b6..65199a080 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -17,21 +17,58 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<DeviceManagementConfiguration name="android">
+<DeviceTypeConfiguration name="android">
+
+    <License>
+        <Language>en_US</Language>
+        <Version>1.0.0</Version>
+        <Text>This is license text</Text>
+    </License>
+
+    <ProvisioningConfig>
+        <SharedWithAllTenants>false</SharedWithAllTenants>
+    </ProvisioningConfig>
+
     <DataSource>
         <jndiConfig>
             <name>jdbc/MobileAndroidDM_DS</name>
         </jndiConfig>
+        <tableConfig>
+            <Table name="AD_DEVICE">
+                <PrimaryKey>DEVICE_ID</PrimaryKey>
+                <Attributes>
+                    <Attribute>DEVICE_ID</Attribute>
+                    <Attribute>GCM_TOKEN</Attribute>
+                    <Attribute>DEVICE_INFO</Attribute>
+                    <Attribute>IMEI</Attribute>
+                    <Attribute>IMSI</Attribute>
+                    <Attribute>OS_VERSION</Attribute>
+                    <Attribute>DEVICE_MODEL</Attribute>
+                    <Attribute>VENDOR</Attribute>
+                    <Attribute>LATITUDE</Attribute>
+                    <Attribute>LONGITUDE</Attribute>
+                    <Attribute>SERIAL</Attribute>
+                    <Attribute>MAC_ADDRESS</Attribute>
+                    <Attribute>DEVICE_NAME</Attribute>
+                    <Attribute>OS_BUILD_DATE</Attribute>
+                </Attributes>
+            </Table>
+        </tableConfig>
     </DataSource>
-    <ProvisioningConfig>
-        <TenantDomain>carbon.super</TenantDomain>
-        <SharedWithAllTenants>false</SharedWithAllTenants>
-    </ProvisioningConfig>
+
     <Features>
-        <Feature name="abc">
-            <Property name="prop1">place_holder</Property>
-            <Property name="prop2">place_holder</Property>
-            <Property name="prop3">place_holder</Property>
+        <Feature code="abc">
+            <Name>abc</Name>
+            <Description>this is a feature</Description>
+            <Operation context="/bulb/{state}" method="PUT">
+                <QueryParameters>
+                    <Parameter>deviceId</Parameter>
+                </QueryParameters>
+                <FormParameters>
+                    <Parameter>test</Parameter>
+                </FormParameters>
+            </Operation>
         </Feature>
     </Features>
-</DeviceManagementConfiguration>
+
+</DeviceTypeConfiguration>
\ No newline at end of file
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
index 3d79ba953..d62ad7d90 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
@@ -17,21 +17,58 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<DeviceManagementConfiguration name="windows">
-    <DataSource>
-        <jndiConfig>
-            <name>jdbc/MobileWindowsDM_DS</name>
-        </jndiConfig>
-    </DataSource>
-    <ProvisioningConfig>
-        <TenantDomain>carbon.super</TenantDomain>
-        <SharedWithAllTenants>false</SharedWithAllTenants>
-    </ProvisioningConfig>
-    <Features>
-        <Feature name="abc">
-            <Property name="prop1">place_holder</Property>
-            <Property name="prop2">place_holder</Property>
-            <Property name="prop3">place_holder</Property>
-        </Feature>
-    </Features>
-</DeviceManagementConfiguration>
+<DeviceTypeConfiguration name="windows">
+
+<License>
+    <Language>en_US</Language>
+    <Version>1.0.0</Version>
+    <Text>This is license text</Text>
+</License>
+
+<ProvisioningConfig>
+    <SharedWithAllTenants>false</SharedWithAllTenants>
+</ProvisioningConfig>
+
+<DataSource>
+    <jndiConfig>
+        <name>jdbc/MobileWindowsDM_DS</name>
+    </jndiConfig>
+    <tableConfig>
+        <Table name="WIN_DEVICE">
+            <PrimaryKey>DEVICE_ID</PrimaryKey>
+            <Attributes>
+                <Attribute>DEVICE_ID</Attribute>
+                <Attribute>CHANNEL_URI</Attribute>
+                <Attribute>DEVICE_INFO</Attribute>
+                <Attribute>IMEI</Attribute>
+                <Attribute>IMSI</Attribute>
+                <Attribute>OS_VERSION</Attribute>
+                <Attribute>DEVICE_MODEL</Attribute>
+                <Attribute>VENDOR</Attribute>
+                <Attribute>LATITUDE</Attribute>
+                <Attribute>LONGITUDE</Attribute>
+                <Attribute>SERIAL</Attribute>
+                <Attribute>MAC_ADDRESS</Attribute>
+                <Attribute>DEVICE_NAME</Attribute>
+                <Attribute>OS_BUILD_DATE</Attribute>
+            </Attributes>
+        </Table>
+    </tableConfig>
+</DataSource>
+
+<Features>
+    <Feature code="abc">
+        <Name>abc</Name>
+        <Description>this is a feature</Description>
+        <Operation context="/bulb/{state}" method="PUT">
+            <QueryParameters>
+                <Parameter>deviceId</Parameter>
+            </QueryParameters>
+            <FormParameters>
+                <Parameter>test</Parameter>
+            </FormParameters>
+        </Operation>
+    </Feature>
+</Features>
+
+</DeviceTypeConfiguration>