diff --git a/.adonisjs/client/manifest.d.ts b/.adonisjs/client/manifest.d.ts
index 9120583..7e37b53 100644
--- a/.adonisjs/client/manifest.d.ts
+++ b/.adonisjs/client/manifest.d.ts
@@ -4,5 +4,6 @@
  */
 
 /// <reference path="../../adonisrc.ts" />
+/// <reference path="../../config/exchange_store.ts" />
 /// <reference path="../../config/hash.ts" />
 /// <reference path="../../config/logger.ts" />
diff --git a/.adonisjs/client/registry/index.ts b/.adonisjs/client/registry/index.ts
index 790086f..2777798 100644
--- a/.adonisjs/client/registry/index.ts
+++ b/.adonisjs/client/registry/index.ts
@@ -24,6 +24,12 @@ const routes = {
     tokens: [{"old":"/api/v1/checkservice","type":0,"val":"api","end":""},{"old":"/api/v1/checkservice","type":0,"val":"v1","end":""},{"old":"/api/v1/checkservice","type":0,"val":"checkservice","end":""}],
     types: placeholder as Registry['health.checkservice']['types'],
   },
+  'health.check_tr_069_exchanges': {
+    methods: ["GET","HEAD"],
+    pattern: '/api/v1/health/tr069-exchanges',
+    tokens: [{"old":"/api/v1/health/tr069-exchanges","type":0,"val":"api","end":""},{"old":"/api/v1/health/tr069-exchanges","type":0,"val":"v1","end":""},{"old":"/api/v1/health/tr069-exchanges","type":0,"val":"health","end":""},{"old":"/api/v1/health/tr069-exchanges","type":0,"val":"tr069-exchanges","end":""}],
+    types: placeholder as Registry['health.check_tr_069_exchanges']['types'],
+  },
   'devices.index': {
     methods: ["GET","HEAD"],
     pattern: '/api/v1/devices',
@@ -60,6 +66,30 @@ const routes = {
     tokens: [{"old":"/api/v1/devices/:identifier/refresh","type":0,"val":"api","end":""},{"old":"/api/v1/devices/:identifier/refresh","type":0,"val":"v1","end":""},{"old":"/api/v1/devices/:identifier/refresh","type":0,"val":"devices","end":""},{"old":"/api/v1/devices/:identifier/refresh","type":1,"val":"identifier","end":""},{"old":"/api/v1/devices/:identifier/refresh","type":0,"val":"refresh","end":""}],
     types: placeholder as Registry['devices.refresh']['types'],
   },
+  'references.index': {
+    methods: ["GET","HEAD"],
+    pattern: '/api/v1/devices/:identifier/references',
+    tokens: [{"old":"/api/v1/devices/:identifier/references","type":0,"val":"api","end":""},{"old":"/api/v1/devices/:identifier/references","type":0,"val":"v1","end":""},{"old":"/api/v1/devices/:identifier/references","type":0,"val":"devices","end":""},{"old":"/api/v1/devices/:identifier/references","type":1,"val":"identifier","end":""},{"old":"/api/v1/devices/:identifier/references","type":0,"val":"references","end":""}],
+    types: placeholder as Registry['references.index']['types'],
+  },
+  'references.show': {
+    methods: ["GET","HEAD"],
+    pattern: '/api/v1/devices/:identifier/references/:provider',
+    tokens: [{"old":"/api/v1/devices/:identifier/references/:provider","type":0,"val":"api","end":""},{"old":"/api/v1/devices/:identifier/references/:provider","type":0,"val":"v1","end":""},{"old":"/api/v1/devices/:identifier/references/:provider","type":0,"val":"devices","end":""},{"old":"/api/v1/devices/:identifier/references/:provider","type":1,"val":"identifier","end":""},{"old":"/api/v1/devices/:identifier/references/:provider","type":0,"val":"references","end":""},{"old":"/api/v1/devices/:identifier/references/:provider","type":1,"val":"provider","end":""}],
+    types: placeholder as Registry['references.show']['types'],
+  },
+  'references.resolve_all': {
+    methods: ["POST"],
+    pattern: '/api/v1/devices/:identifier/references/resolve',
+    tokens: [{"old":"/api/v1/devices/:identifier/references/resolve","type":0,"val":"api","end":""},{"old":"/api/v1/devices/:identifier/references/resolve","type":0,"val":"v1","end":""},{"old":"/api/v1/devices/:identifier/references/resolve","type":0,"val":"devices","end":""},{"old":"/api/v1/devices/:identifier/references/resolve","type":1,"val":"identifier","end":""},{"old":"/api/v1/devices/:identifier/references/resolve","type":0,"val":"references","end":""},{"old":"/api/v1/devices/:identifier/references/resolve","type":0,"val":"resolve","end":""}],
+    types: placeholder as Registry['references.resolve_all']['types'],
+  },
+  'references.resolve_one': {
+    methods: ["POST"],
+    pattern: '/api/v1/devices/:identifier/references/resolve/:provider',
+    tokens: [{"old":"/api/v1/devices/:identifier/references/resolve/:provider","type":0,"val":"api","end":""},{"old":"/api/v1/devices/:identifier/references/resolve/:provider","type":0,"val":"v1","end":""},{"old":"/api/v1/devices/:identifier/references/resolve/:provider","type":0,"val":"devices","end":""},{"old":"/api/v1/devices/:identifier/references/resolve/:provider","type":1,"val":"identifier","end":""},{"old":"/api/v1/devices/:identifier/references/resolve/:provider","type":0,"val":"references","end":""},{"old":"/api/v1/devices/:identifier/references/resolve/:provider","type":0,"val":"resolve","end":""},{"old":"/api/v1/devices/:identifier/references/resolve/:provider","type":1,"val":"provider","end":""}],
+    types: placeholder as Registry['references.resolve_one']['types'],
+  },
   'commands.index': {
     methods: ["GET","HEAD"],
     pattern: '/api/v1/commands',
@@ -114,6 +144,24 @@ const routes = {
     tokens: [{"old":"/api/v1/tr069-trace/:id/log","type":0,"val":"api","end":""},{"old":"/api/v1/tr069-trace/:id/log","type":0,"val":"v1","end":""},{"old":"/api/v1/tr069-trace/:id/log","type":0,"val":"tr069-trace","end":""},{"old":"/api/v1/tr069-trace/:id/log","type":1,"val":"id","end":""},{"old":"/api/v1/tr069-trace/:id/log","type":0,"val":"log","end":""}],
     types: placeholder as Registry['tr_069_trace.show_log']['types'],
   },
+  'exchange.index': {
+    methods: ["GET","HEAD"],
+    pattern: '/api/v1/tr069-trace/:deviceId/exchanges',
+    tokens: [{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":0,"val":"api","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":0,"val":"v1","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":0,"val":"tr069-trace","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":1,"val":"deviceId","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":0,"val":"exchanges","end":""}],
+    types: placeholder as Registry['exchange.index']['types'],
+  },
+  'exchange.destroy': {
+    methods: ["DELETE"],
+    pattern: '/api/v1/tr069-trace/:deviceId/exchanges',
+    tokens: [{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":0,"val":"api","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":0,"val":"v1","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":0,"val":"tr069-trace","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":1,"val":"deviceId","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges","type":0,"val":"exchanges","end":""}],
+    types: placeholder as Registry['exchange.destroy']['types'],
+  },
+  'exchange.stream': {
+    methods: ["GET","HEAD"],
+    pattern: '/api/v1/tr069-trace/:deviceId/exchanges/stream',
+    tokens: [{"old":"/api/v1/tr069-trace/:deviceId/exchanges/stream","type":0,"val":"api","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges/stream","type":0,"val":"v1","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges/stream","type":0,"val":"tr069-trace","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges/stream","type":1,"val":"deviceId","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges/stream","type":0,"val":"exchanges","end":""},{"old":"/api/v1/tr069-trace/:deviceId/exchanges/stream","type":0,"val":"stream","end":""}],
+    types: placeholder as Registry['exchange.stream']['types'],
+  },
   'configurations_v_1.index': {
     methods: ["GET","HEAD"],
     pattern: '/api/v1/configurations',
diff --git a/.adonisjs/client/registry/schema.d.ts b/.adonisjs/client/registry/schema.d.ts
index 4156996..b151dc9 100644
--- a/.adonisjs/client/registry/schema.d.ts
+++ b/.adonisjs/client/registry/schema.d.ts
@@ -43,6 +43,18 @@ export interface Registry {
       errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/health_controller').default['checkservice']>>>
     }
   }
+  'health.check_tr_069_exchanges': {
+    methods: ["GET","HEAD"]
+    pattern: '/api/v1/health/tr069-exchanges'
+    types: {
+      body: {}
+      paramsTuple: []
+      params: {}
+      query: {}
+      response: ExtractResponse<Awaited<ReturnType<import('#controllers/health_controller').default['checkTr069Exchanges']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/health_controller').default['checkTr069Exchanges']>>>
+    }
+  }
   'devices.index': {
     methods: ["GET","HEAD"]
     pattern: '/api/v1/devices'
@@ -115,6 +127,54 @@ export interface Registry {
       errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/devices_controller').default['refresh']>>>
     }
   }
+  'references.index': {
+    methods: ["GET","HEAD"]
+    pattern: '/api/v1/devices/:identifier/references'
+    types: {
+      body: {}
+      paramsTuple: [ParamValue]
+      params: { identifier: ParamValue }
+      query: {}
+      response: ExtractResponse<Awaited<ReturnType<import('#controllers/references_controller').default['index']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/references_controller').default['index']>>>
+    }
+  }
+  'references.show': {
+    methods: ["GET","HEAD"]
+    pattern: '/api/v1/devices/:identifier/references/:provider'
+    types: {
+      body: {}
+      paramsTuple: [ParamValue, ParamValue]
+      params: { identifier: ParamValue; provider: ParamValue }
+      query: {}
+      response: ExtractResponse<Awaited<ReturnType<import('#controllers/references_controller').default['show']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/references_controller').default['show']>>>
+    }
+  }
+  'references.resolve_all': {
+    methods: ["POST"]
+    pattern: '/api/v1/devices/:identifier/references/resolve'
+    types: {
+      body: {}
+      paramsTuple: [ParamValue]
+      params: { identifier: ParamValue }
+      query: {}
+      response: ExtractResponse<Awaited<ReturnType<import('#controllers/references_controller').default['resolveAll']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/references_controller').default['resolveAll']>>>
+    }
+  }
+  'references.resolve_one': {
+    methods: ["POST"]
+    pattern: '/api/v1/devices/:identifier/references/resolve/:provider'
+    types: {
+      body: {}
+      paramsTuple: [ParamValue, ParamValue]
+      params: { identifier: ParamValue; provider: ParamValue }
+      query: {}
+      response: ExtractResponse<Awaited<ReturnType<import('#controllers/references_controller').default['resolveOne']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/references_controller').default['resolveOne']>>>
+    }
+  }
   'commands.index': {
     methods: ["GET","HEAD"]
     pattern: '/api/v1/commands'
@@ -223,6 +283,42 @@ export interface Registry {
       errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/tr069_trace_controller').default['showLog']>>>
     }
   }
+  'exchange.index': {
+    methods: ["GET","HEAD"]
+    pattern: '/api/v1/tr069-trace/:deviceId/exchanges'
+    types: {
+      body: {}
+      paramsTuple: [ParamValue]
+      params: { deviceId: ParamValue }
+      query: {}
+      response: ExtractResponse<Awaited<ReturnType<import('#controllers/exchange_controller').default['index']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/exchange_controller').default['index']>>>
+    }
+  }
+  'exchange.destroy': {
+    methods: ["DELETE"]
+    pattern: '/api/v1/tr069-trace/:deviceId/exchanges'
+    types: {
+      body: {}
+      paramsTuple: [ParamValue]
+      params: { deviceId: ParamValue }
+      query: {}
+      response: ExtractResponse<Awaited<ReturnType<import('#controllers/exchange_controller').default['destroy']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/exchange_controller').default['destroy']>>>
+    }
+  }
+  'exchange.stream': {
+    methods: ["GET","HEAD"]
+    pattern: '/api/v1/tr069-trace/:deviceId/exchanges/stream'
+    types: {
+      body: {}
+      paramsTuple: [ParamValue]
+      params: { deviceId: ParamValue }
+      query: {}
+      response: ExtractResponse<Awaited<ReturnType<import('#controllers/exchange_controller').default['stream']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/exchange_controller').default['stream']>>>
+    }
+  }
   'configurations_v_1.index': {
     methods: ["GET","HEAD"]
     pattern: '/api/v1/configurations'
@@ -251,12 +347,12 @@ export interface Registry {
     methods: ["POST"]
     pattern: '/api/v1/configurations'
     types: {
-      body: {}
+      body: ExtractBody<InferInput<(typeof import('#validators/configuration').createConfigurationValidator)>>
       paramsTuple: []
       params: {}
-      query: {}
+      query: ExtractQuery<InferInput<(typeof import('#validators/configuration').createConfigurationValidator)>>
       response: ExtractResponse<Awaited<ReturnType<import('#controllers/configurations_v1_controller').default['store']>>>
-      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/configurations_v1_controller').default['store']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/configurations_v1_controller').default['store']>>> | { status: 422; response: { errors: SimpleError[] } }
     }
   }
   'configurations_v_1.show': {
@@ -275,12 +371,12 @@ export interface Registry {
     methods: ["PUT"]
     pattern: '/api/v1/configurations/:id'
     types: {
-      body: {}
+      body: ExtractBody<InferInput<(typeof import('#validators/configuration').updateConfigurationValidator)>>
       paramsTuple: [ParamValue]
       params: { id: ParamValue }
-      query: {}
+      query: ExtractQuery<InferInput<(typeof import('#validators/configuration').updateConfigurationValidator)>>
       response: ExtractResponse<Awaited<ReturnType<import('#controllers/configurations_v1_controller').default['update']>>>
-      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/configurations_v1_controller').default['update']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/configurations_v1_controller').default['update']>>> | { status: 422; response: { errors: SimpleError[] } }
     }
   }
   'configurations_v_1.destroy': {
@@ -407,24 +503,24 @@ export interface Registry {
     methods: ["POST"]
     pattern: '/api/v1/firmware-catalog/entries'
     types: {
-      body: {}
+      body: ExtractBody<InferInput<(typeof import('#validators/firmware_catalog').createFirmwareEntryValidator)>>
       paramsTuple: []
       params: {}
-      query: {}
+      query: ExtractQuery<InferInput<(typeof import('#validators/firmware_catalog').createFirmwareEntryValidator)>>
       response: ExtractResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['createEntry']>>>
-      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['createEntry']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['createEntry']>>> | { status: 422; response: { errors: SimpleError[] } }
     }
   }
   'firmware_catalog.update_entry': {
     methods: ["PUT"]
     pattern: '/api/v1/firmware-catalog/entries/:id'
     types: {
-      body: {}
+      body: ExtractBody<InferInput<(typeof import('#validators/firmware_catalog').updateFirmwareEntryValidator)>>
       paramsTuple: [ParamValue]
       params: { id: ParamValue }
-      query: {}
+      query: ExtractQuery<InferInput<(typeof import('#validators/firmware_catalog').updateFirmwareEntryValidator)>>
       response: ExtractResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['updateEntry']>>>
-      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['updateEntry']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['updateEntry']>>> | { status: 422; response: { errors: SimpleError[] } }
     }
   }
   'firmware_catalog.delete_entry': {
@@ -443,12 +539,12 @@ export interface Registry {
     methods: ["POST"]
     pattern: '/api/v1/firmware-catalog/routes'
     types: {
-      body: {}
+      body: ExtractBody<InferInput<(typeof import('#validators/firmware_catalog').createMigrationRouteValidator)>>
       paramsTuple: []
       params: {}
-      query: {}
+      query: ExtractQuery<InferInput<(typeof import('#validators/firmware_catalog').createMigrationRouteValidator)>>
       response: ExtractResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['createRoute']>>>
-      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['createRoute']>>>
+      errorResponse: ExtractErrorResponse<Awaited<ReturnType<import('#controllers/firmware_catalog_controller').default['createRoute']>>> | { status: 422; response: { errors: SimpleError[] } }
     }
   }
   'firmware_catalog.update_route': {
diff --git a/.adonisjs/client/registry/tree.d.ts b/.adonisjs/client/registry/tree.d.ts
index 7303bc5..9af49f3 100644
--- a/.adonisjs/client/registry/tree.d.ts
+++ b/.adonisjs/client/registry/tree.d.ts
@@ -6,6 +6,7 @@ export interface ApiDefinition {
   health: {
     checklife: typeof routes['health.checklife']
     checkservice: typeof routes['health.checkservice']
+    checkTr069Exchanges: typeof routes['health.check_tr_069_exchanges']
   }
   devices: {
     index: typeof routes['devices.index']
@@ -15,6 +16,12 @@ export interface ApiDefinition {
     executeCommand: typeof routes['devices.execute_command']
     refresh: typeof routes['devices.refresh']
   }
+  references: {
+    index: typeof routes['references.index']
+    show: typeof routes['references.show']
+    resolveAll: typeof routes['references.resolve_all']
+    resolveOne: typeof routes['references.resolve_one']
+  }
   commands: {
     index: typeof routes['commands.index']
     show: typeof routes['commands.show']
@@ -29,6 +36,11 @@ export interface ApiDefinition {
     destroy: typeof routes['tr_069_trace.destroy']
     showLog: typeof routes['tr_069_trace.show_log']
   }
+  exchange: {
+    index: typeof routes['exchange.index']
+    destroy: typeof routes['exchange.destroy']
+    stream: typeof routes['exchange.stream']
+  }
   configurationsV1: {
     index: typeof routes['configurations_v_1.index']
     listTags: typeof routes['configurations_v_1.list_tags']
diff --git a/.adonisjs/server/controllers.ts b/.adonisjs/server/controllers.ts
index f74b65d..ed1075f 100644
--- a/.adonisjs/server/controllers.ts
+++ b/.adonisjs/server/controllers.ts
@@ -8,8 +8,10 @@ export const controllers = {
   ConfigurationsV1: () => import('#controllers/configurations_v1_controller'),
   Cwmp: () => import('#controllers/cwmp_controller'),
   Devices: () => import('#controllers/devices_controller'),
+  Exchange: () => import('#controllers/exchange_controller'),
   FirmwareCatalog: () => import('#controllers/firmware_catalog_controller'),
   Health: () => import('#controllers/health_controller'),
   Pages: () => import('#controllers/pages_controller'),
+  References: () => import('#controllers/references_controller'),
   Tr069Trace: () => import('#controllers/tr069_trace_controller'),
 }
diff --git a/.adonisjs/server/routes.d.ts b/.adonisjs/server/routes.d.ts
index 213f655..9c87d89 100644
--- a/.adonisjs/server/routes.d.ts
+++ b/.adonisjs/server/routes.d.ts
@@ -7,12 +7,17 @@ export type ScannedRoutes = {
     'cwmp': { paramsTuple?: []; params?: {} }
     'health.checklife': { paramsTuple?: []; params?: {} }
     'health.checkservice': { paramsTuple?: []; params?: {} }
+    'health.check_tr_069_exchanges': { paramsTuple?: []; params?: {} }
     'devices.index': { paramsTuple?: []; params?: {} }
     'devices.criteria_values': { paramsTuple?: []; params?: {} }
     'devices.show': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
     'devices.destroy': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
     'devices.execute_command': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
     'devices.refresh': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.index': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.show': { paramsTuple: [ParamValue,ParamValue]; params: {'identifier': ParamValue,'provider': ParamValue} }
+    'references.resolve_all': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.resolve_one': { paramsTuple: [ParamValue,ParamValue]; params: {'identifier': ParamValue,'provider': ParamValue} }
     'commands.index': { paramsTuple?: []; params?: {} }
     'commands.show': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
     'commands.store': { paramsTuple?: []; params?: {} }
@@ -22,6 +27,9 @@ export type ScannedRoutes = {
     'tr_069_trace.save_raw_config': { paramsTuple?: []; params?: {} }
     'tr_069_trace.destroy': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
     'tr_069_trace.show_log': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
+    'exchange.index': { paramsTuple: [ParamValue]; params: {'deviceId': ParamValue} }
+    'exchange.destroy': { paramsTuple: [ParamValue]; params: {'deviceId': ParamValue} }
+    'exchange.stream': { paramsTuple: [ParamValue]; params: {'deviceId': ParamValue} }
     'configurations_v_1.index': { paramsTuple?: []; params?: {} }
     'configurations_v_1.list_tags': { paramsTuple?: []; params?: {} }
     'configurations_v_1.store': { paramsTuple?: []; params?: {} }
@@ -64,6 +72,8 @@ export type ScannedRoutes = {
     'cwmp': { paramsTuple?: []; params?: {} }
     'devices.execute_command': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
     'devices.refresh': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.resolve_all': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.resolve_one': { paramsTuple: [ParamValue,ParamValue]; params: {'identifier': ParamValue,'provider': ParamValue} }
     'commands.store': { paramsTuple?: []; params?: {} }
     'tr_069_trace.store': { paramsTuple?: []; params?: {} }
     'configurations_v_1.store': { paramsTuple?: []; params?: {} }
@@ -78,14 +88,19 @@ export type ScannedRoutes = {
   GET: {
     'health.checklife': { paramsTuple?: []; params?: {} }
     'health.checkservice': { paramsTuple?: []; params?: {} }
+    'health.check_tr_069_exchanges': { paramsTuple?: []; params?: {} }
     'devices.index': { paramsTuple?: []; params?: {} }
     'devices.criteria_values': { paramsTuple?: []; params?: {} }
     'devices.show': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.index': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.show': { paramsTuple: [ParamValue,ParamValue]; params: {'identifier': ParamValue,'provider': ParamValue} }
     'commands.index': { paramsTuple?: []; params?: {} }
     'commands.show': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
     'tr_069_trace.index': { paramsTuple?: []; params?: {} }
     'tr_069_trace.raw_config': { paramsTuple?: []; params?: {} }
     'tr_069_trace.show_log': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
+    'exchange.index': { paramsTuple: [ParamValue]; params: {'deviceId': ParamValue} }
+    'exchange.stream': { paramsTuple: [ParamValue]; params: {'deviceId': ParamValue} }
     'configurations_v_1.index': { paramsTuple?: []; params?: {} }
     'configurations_v_1.list_tags': { paramsTuple?: []; params?: {} }
     'configurations_v_1.show': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
@@ -111,14 +126,19 @@ export type ScannedRoutes = {
   HEAD: {
     'health.checklife': { paramsTuple?: []; params?: {} }
     'health.checkservice': { paramsTuple?: []; params?: {} }
+    'health.check_tr_069_exchanges': { paramsTuple?: []; params?: {} }
     'devices.index': { paramsTuple?: []; params?: {} }
     'devices.criteria_values': { paramsTuple?: []; params?: {} }
     'devices.show': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.index': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
+    'references.show': { paramsTuple: [ParamValue,ParamValue]; params: {'identifier': ParamValue,'provider': ParamValue} }
     'commands.index': { paramsTuple?: []; params?: {} }
     'commands.show': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
     'tr_069_trace.index': { paramsTuple?: []; params?: {} }
     'tr_069_trace.raw_config': { paramsTuple?: []; params?: {} }
     'tr_069_trace.show_log': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
+    'exchange.index': { paramsTuple: [ParamValue]; params: {'deviceId': ParamValue} }
+    'exchange.stream': { paramsTuple: [ParamValue]; params: {'deviceId': ParamValue} }
     'configurations_v_1.index': { paramsTuple?: []; params?: {} }
     'configurations_v_1.list_tags': { paramsTuple?: []; params?: {} }
     'configurations_v_1.show': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
@@ -144,6 +164,7 @@ export type ScannedRoutes = {
   DELETE: {
     'devices.destroy': { paramsTuple: [ParamValue]; params: {'identifier': ParamValue} }
     'tr_069_trace.destroy': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
+    'exchange.destroy': { paramsTuple: [ParamValue]; params: {'deviceId': ParamValue} }
     'configurations_v_1.destroy': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
     'firmware_catalog.delete_entry': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
     'firmware_catalog.delete_route': { paramsTuple: [ParamValue]; params: {'id': ParamValue} }
diff --git a/.kiro/tasks/state-machine-single-session.md b/.kiro/tasks/state-machine-single-session.md
new file mode 100644
index 0000000..5df880a
--- /dev/null
+++ b/.kiro/tasks/state-machine-single-session.md
@@ -0,0 +1,78 @@
+# Tâche : Refactoring State Machine — Session unique
+
+## Objectif
+
+Refactorer la `MainStateMachine` pour que tout le workflow d'onboarding se fasse en **une seule session CWMP**, sans déclencher de `ScheduleInform`.
+
+## Flow attendu (session unique)
+
+```
+CPE → ACS : Inform (BOOTSTRAP)
+ACS → CPE : InformResponse
+CPE → ACS : POST vide
+ACS → CPE : GetParameterNames
+CPE → ACS : Fault (9003 si non supporté) OU GetParameterNamesResponse (si supporté)
+ACS → CPE : GetParameterValues (lectures critiques)
+CPE → ACS : GetParameterValuesResponse
+ACS → CPE : SetParameterValues (ProvisioningCode + PeriodicInformInterval)
+CPE → ACS : SetParameterValuesResponse
+ACS → CPE : 204 (fin de session)
+```
+
+## Flow actuel (problème)
+
+```
+Session 1 (BOOTSTRAP):
+  Inform → InformResponse → Empty → SPV → SPVResponse → 204
+
+Session 2 (SCHEDULED - déclenchée par ScheduleInform):
+  Inform → InformResponse → Empty → GPV → GPVResponse → GPN → Fault → 204
+
+Session 3 (PERIODIC):
+  Inform → InformResponse → Empty → SPV → SPVResponse → 204
+```
+
+## Problèmes identifiés
+
+1. **Le GPV critique est servi par la task queue AVANT la state machine** — le `continue()` dans `state_machine_manager.ts` servait les queued tasks en priorité sur la state machine (corrigé partiellement)
+2. **L'ordre des états n'est pas optimal** — actuellement `IdleState → DiscoveringParams → ConfigEval → ComplianceUpdate → ExecutingCommands`, mais le GPV critique est hors de la state machine (dans la task queue)
+3. **Le SCHEDULED est déclenché par l'équipement** suite au changement du PeriodicInformInterval — l'ACS ne l'envoie pas explicitement mais le CPE refait un Inform avec event SCHEDULED après avoir accepté le SPV
+
+## Changements requis
+
+### 1. Intégrer le GPV critique dans la state machine
+
+Au lieu d'enqueuer le GPV via `manager.enqueueImmediate()` dans le controller, l'ajouter comme état dans la state machine :
+
+```
+IdleState → DiscoveringParametersState (GPN) → CriticalReadsState (GPV) → ConfigurationEvaluationState → ComplianceUpdateState (SPV) → ExecutingCommandsState → CompletedState
+```
+
+### 2. Ne pas retenter GPN si gpnStatus est déjà "unsupported"
+
+Dans `IdleState`, vérifier `device.gpnStatus` :
+- Si `'unsupported'` → skip directement à `CriticalReadsState`
+- Si `'unknown'` ou `'supported'` → tenter GPN
+
+### 3. Supprimer les enqueue critiques du controller
+
+Retirer le bloc `enqueueImmediate(device, 'get_parameter_values', criticalPaths)` du `cwmp_controller.ts` — c'est la state machine qui gère.
+
+## Fichiers impactés
+
+| Fichier | Changement |
+|---------|-----------|
+| `app/services/cwmp/main_state_machine.ts` | Ajouter `CriticalReadsState`, réordonner les états |
+| `app/services/cwmp/state_machine_manager.ts` | Simplifier `continue()` (plus de task queue priority) |
+| `app/controllers/cwmp_controller.ts` | Retirer `enqueueImmediate` pour GPV |
+| `tests/unit/services/main_state_machine.spec.ts` | Adapter les tests |
+| `tests/unit/services/cwmp/main_state_machine_extended.spec.ts` | Adapter |
+
+## Critères de succès
+
+- [ ] Un BOOTSTRAP frais produit une seule session : `Inform → GPN → Fault/Response → GPV → SPV → 204`
+- [ ] Un PERIODIC sur un device connu (gpnStatus=unsupported) : `Inform → SPV → 204` (pas de GPN)
+- [ ] Pas de session SCHEDULED superflue (le GPV/GPN est fait dans la session BOOTSTRAP)
+- [ ] Tous les tests unitaires passent
+- [ ] Le genieacs-sim (Huawei, GPN supporté) continue de fonctionner
+- [ ] Le simulateur Livebox (GPN non supporté) provisionne correctement en 1 session
diff --git a/app/controllers/cwmp_controller.ts b/app/controllers/cwmp_controller.ts
index 3ed8201..bbc560b 100644
--- a/app/controllers/cwmp_controller.ts
+++ b/app/controllers/cwmp_controller.ts
@@ -3,12 +3,12 @@ import { buildSoapEnvelope } from '../protocol/soap.js'
 import { CWMPMessageBuilder } from '../protocol/common/cwmp_message_builder.js'
 import { StateMachineManager } from '../services/cwmp/state_machine_manager.js'
 import { Device, detectDataModelFromParams } from '../domain/device/device.js'
-import { reclassifyDeviceFromCatalog } from '../services/parameter_writability.js'
 import { DeviceId } from '../domain/device/device_id.js'
 import { DeviceParameter, DeviceProperty } from '../domain/device/device_parameter.js'
 import DeviceModel from '../models/device.js'
 import { getDeviceHashIdentifier } from '../utils/device_utils.js'
 import { getReferenceEngine } from '../services/references/reference_engine.js'
+import { normalizeEventCode } from '../utils/cwmp-events.js'
 import logger from '@adonisjs/core/services/logger'
 
 export default class CwmpController {
@@ -118,6 +118,12 @@ export default class CwmpController {
     let device = await this.loadDevice(deviceId)
     if (!device) {
       device = new Device(deviceId)
+      logger.info({ deviceId: deviceId.toIdentifier() }, '[handleInform] Device not found in DB — creating new')
+    } else {
+      logger.info(
+        { deviceId: deviceId.toIdentifier(), gpnStatus: device.gpnStatus, circuitBreaker: device.gpnCircuitBreaker },
+        '[handleInform] Device loaded from DB'
+      )
     }
     device.updateLastSeen()
 
@@ -127,11 +133,6 @@ export default class CwmpController {
       device.updateFromValues(paramValues)
     }
 
-    // Reclassify properties → parameters using catalog when GPN is unsupported
-    if (device.gpnStatus === 'unsupported') {
-      reclassifyDeviceFromCatalog(device)
-    }
-
     device.setTmpParamValues(paramValues)
 
     // Detect TR data model from Inform parameter names (Device.* = TR-181, InternetGatewayDevice.* = TR-098)
@@ -157,6 +158,8 @@ export default class CwmpController {
       parameters: device.getParameters().map((p) => p.toSnapshot()),
       gpnStatus: device.gpnStatus,
       dataModel: device.dataModel,
+      gpnCircuitBreaker: device.gpnCircuitBreaker,
+      lastGpnSentDate: device.lastGpnSentDate,
       updatedAt: new Date(),
     })
     logger.info({ hashId }, 'Inform received')
@@ -174,12 +177,23 @@ export default class CwmpController {
     logger.info({ events }, 'CWMP Inform events extracted')
 
     // Track last periodic inform timestamp
-    const isPeriodic = events.some((e) => String(e).toUpperCase().includes('PERIODIC') || String(e) === '2')
-    const isBootstrap = events.some((e) => String(e).toUpperCase().includes('BOOTSTRAP') || String(e) === '0')
+    const normalizedEvents = events.map((e) => normalizeEventCode(e))
+    const isPeriodic = normalizedEvents.some((e) => e === 'PERIODIC')
+    const isBootstrap = normalizedEvents.some((e) => e === 'BOOTSTRAP')
     if (isPeriodic || isBootstrap) {
       await DeviceModel.updateOne({ identifier: hashId }, { $set: { lastPeriodicInformAt: new Date() } }).catch(() => {})
     }
 
+    // Phase 12: Crash pattern detection
+    const hasBoot = normalizedEvents.some((e) => e === 'BOOT')
+    if (hasBoot && device.lastGpnSentDate) {
+      const timeSinceGpn = Date.now() - device.lastGpnSentDate.getTime()
+      if (timeSinceGpn < 60000) {
+        device.recordCrashPattern()
+        logger.warn({ hashId, timeSinceGpn }, 'Possible GPN-induced crash detected for device')
+      }
+    }
+
     // Start state machine
     await manager.startStateMachine(device, session, { events })
     manager.bindRemoteToDevice(remoteKey, device.deviceId)
@@ -204,25 +218,6 @@ export default class CwmpController {
       logger.error({ error: _e?.message, stack: _e?.stack }, '[References] Error during resolution')
     }
 
-    // After Inform for onboarding events, enqueue critical reads using the detected data model
-    const onlyConnReq = events.length > 0 && events.every((e) => e === '6 CONNECTION REQUEST')
-    if (!onlyConnReq) {
-      try {
-        const isTr181 = device.dataModel === 'tr-181'
-        const root = isTr181 ? 'Device' : 'InternetGatewayDevice'
-        const criticalPaths = [
-          `${root}.DeviceInfo.HardwareVersion`,
-          `${root}.DeviceInfo.SoftwareVersion`,
-          `${root}.ManagementServer.ConnectionRequestURL`,
-          ...(isTr181 ? [] : [`${root}.DeviceInfo.SpecVersion`]),
-        ]
-        logger.debug({ dataModel: device.dataModel, criticalPaths }, 'Enqueueing critical reads')
-        await manager.enqueueImmediate(device, 'get_parameter_values', criticalPaths)
-      } catch (_e) {
-        // Non-critical
-      }
-    }
-
     return { xml: CWMPMessageBuilder.informResponse(cwmpId), hashId }
   }
 
@@ -280,6 +275,19 @@ export default class CwmpController {
       device.setGpnStatus(record.gpnStatus ?? 'unknown')
       device.setDataModel(record.dataModel ?? 'unknown')
 
+      // Restore circuit breaker state
+      if (record.gpnCircuitBreaker) {
+        device.setGpnCircuitBreaker({
+          failureCount: record.gpnCircuitBreaker.failureCount ?? 0,
+          lastFailureDate: record.gpnCircuitBreaker.lastFailureDate ? new Date(record.gpnCircuitBreaker.lastFailureDate) : null,
+          state: record.gpnCircuitBreaker.state ?? 'closed',
+          cooldownUntil: record.gpnCircuitBreaker.cooldownUntil ? new Date(record.gpnCircuitBreaker.cooldownUntil) : null,
+        })
+      }
+      if (record.lastGpnSentDate) {
+        device.lastGpnSentDate = new Date(record.lastGpnSentDate)
+      }
+
       return device
     } catch (_error) {
       return null
diff --git a/app/domain/device/device.ts b/app/domain/device/device.ts
index 9fd6989..64738f3 100644
--- a/app/domain/device/device.ts
+++ b/app/domain/device/device.ts
@@ -5,14 +5,28 @@ import { createHash } from 'node:crypto'
 
 export type GpnStatus = 'supported' | 'unsupported' | 'unknown'
 
+export interface GpnCircuitBreaker {
+  failureCount: number
+  lastFailureDate: Date | null
+  state: 'closed' | 'open' | 'half-open'
+  cooldownUntil: Date | null
+}
+
 /** TR-098: InternetGatewayDevice.* root — TR-181: Device.* root */
 export type DataModel = 'tr-181' | 'tr-098' | 'unknown'
 
+/** Extract a string name from a SOAP parsed node (may be a string or an object with _ text node) */
+function extractName(raw: any): string | null {
+  if (typeof raw === 'string') return raw || null
+  if (raw && typeof raw === 'object' && typeof raw._ === 'string') return raw._ || null
+  return null
+}
+
 /** Detect which TR data model a device uses from a ParameterValueStruct list */
 export function detectDataModelFromParams(paramValues: any[]): DataModel {
   for (const pv of paramValues ?? []) {
-    const name: unknown = pv?.Name
-    if (typeof name !== 'string') continue
+    const name = extractName(pv?.Name)
+    if (!name) continue
     if (name.startsWith('Device.')) return 'tr-181'
     if (name.startsWith('InternetGatewayDevice.')) return 'tr-098'
   }
@@ -37,6 +51,15 @@ export class Device {
   private _onboardingStatus: OnboardingStatus = OnboardingStatus.PENDING
   private _gpnStatus: GpnStatus = 'unknown'
   private _dataModel: DataModel = 'unknown'
+  private _gpnCircuitBreaker: GpnCircuitBreaker = {
+    failureCount: 0,
+    lastFailureDate: null,
+    state: 'closed',
+    cooldownUntil: null,
+  }
+  private _lastGpnSentDate: Date | null = null
+  private _operationalStatus: string = ''
+  private _lastFailureReason: string = ''
 
   constructor(
     public readonly deviceId: DeviceId,
@@ -71,6 +94,100 @@ export class Device {
     this._dataModel = model
   }
 
+  public get gpnCircuitBreaker(): GpnCircuitBreaker {
+    return this._gpnCircuitBreaker
+  }
+
+  public setGpnCircuitBreaker(cb: GpnCircuitBreaker): void {
+    this._gpnCircuitBreaker = cb
+  }
+
+  public get lastGpnSentDate(): Date | null {
+    return this._lastGpnSentDate
+  }
+
+  public set lastGpnSentDate(date: Date | null) {
+    this._lastGpnSentDate = date
+  }
+
+  public get operationalStatus(): string {
+    return this._operationalStatus
+  }
+
+  public set operationalStatus(status: string) {
+    this._operationalStatus = status
+  }
+
+  public get lastFailureReason(): string {
+    return this._lastFailureReason
+  }
+
+  public set lastFailureReason(reason: string) {
+    this._lastFailureReason = reason
+  }
+
+  /**
+   * Returns true if GPN is allowed based on circuit breaker state.
+   * Closed = always allowed. Half-open = allowed if cooldown expired. Open = not allowed.
+   */
+  public isGpnAllowed(): boolean {
+    const { state, cooldownUntil } = this._gpnCircuitBreaker
+    if (state === 'closed') return true
+    if (state === 'half-open') {
+      return cooldownUntil === null || new Date() >= cooldownUntil
+    }
+    // state === 'open': check if cooldown expired → transition to half-open
+    if (cooldownUntil && new Date() >= cooldownUntil) {
+      this._gpnCircuitBreaker.state = 'half-open'
+      return true
+    }
+    return false
+  }
+
+  /**
+   * Record a GPN failure. >=2 failures → open with 24h cooldown.
+   * If already half-open → re-open with 72h cooldown.
+   */
+  public recordGpnFailure(): void {
+    const cb = this._gpnCircuitBreaker
+    cb.failureCount++
+    cb.lastFailureDate = new Date()
+
+    if (cb.state === 'half-open') {
+      // Half-open probe failed → re-open with 72h cooldown
+      cb.state = 'open'
+      cb.cooldownUntil = new Date(Date.now() + 72 * 60 * 60 * 1000)
+    } else if (cb.failureCount >= 2) {
+      cb.state = 'open'
+      cb.cooldownUntil = new Date(Date.now() + 24 * 60 * 60 * 1000)
+    }
+  }
+
+  /**
+   * Record a successful GPN. Resets circuit breaker to closed.
+   */
+  public recordGpnSuccess(): void {
+    this._gpnCircuitBreaker = {
+      failureCount: 0,
+      lastFailureDate: null,
+      state: 'closed',
+      cooldownUntil: null,
+    }
+  }
+
+  /**
+   * Record a crash pattern (BOOT Inform within 60s of last GPN).
+   * Immediately opens circuit breaker with 7-day cooldown.
+   */
+  public recordCrashPattern(): void {
+    this._gpnCircuitBreaker = {
+      failureCount: this._gpnCircuitBreaker.failureCount + 1,
+      lastFailureDate: new Date(),
+      state: 'open',
+      cooldownUntil: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000),
+    }
+  }
+
   public get identifier(): string {
     const raw = `${this.deviceId.manufacturer}-${this.deviceId.oui}-${this.deviceId.productClass}-${this.deviceId.serialNumber}`
     return createHash('sha256').update(raw).digest('hex').substring(0, 24)
@@ -170,7 +287,7 @@ export class Device {
   public organizeParameters(response: any, timestamp: Date): void {
     const infoList = response?.ParameterList?.ParameterInfoStruct || []
     for (const info of infoList) {
-      const name = info?.Name
+      const name = extractName(info?.Name)
       if (!name) continue
       // Skip object paths (ending with dot) - only store leaf parameters
       if (name.endsWith('.')) continue
@@ -200,7 +317,7 @@ export class Device {
 
   public updateFromValues(paramValues: any[]): void {
     for (const pv of paramValues || []) {
-      const name = pv?.Name
+      const name = extractName(pv?.Name)
       const valueObj = pv?.Value
       const hasTextNode = valueObj && Object.prototype.hasOwnProperty.call(valueObj as any, '_')
       const hasTypeAttr = valueObj && (valueObj['$xsi:type'] || valueObj?.$?.Type)
@@ -263,6 +380,10 @@ export class Device {
       isOnline: this.isOnline(),
       gpnStatus: this._gpnStatus,
       dataModel: this._dataModel,
+      gpnCircuitBreaker: { ...this._gpnCircuitBreaker },
+      lastGpnSentDate: this._lastGpnSentDate,
+      operationalStatus: this._operationalStatus,
+      lastFailureReason: this._lastFailureReason,
       parameters: this.getParameters().map((p) => p.toSnapshot()),
       properties: this.getProperties().map((p) => p.toSnapshot()),
     }
@@ -282,6 +403,10 @@ export interface DeviceSnapshot {
   isOnline: boolean
   gpnStatus: GpnStatus
   dataModel: DataModel
+  gpnCircuitBreaker: GpnCircuitBreaker
+  lastGpnSentDate: Date | null
+  operationalStatus: string
+  lastFailureReason: string
   parameters: ParameterSnapshot[]
   properties: PropertySnapshot[]
 }
diff --git a/app/domain/device/device_record.ts b/app/domain/device/device_record.ts
index bdf9336..36748b3 100644
--- a/app/domain/device/device_record.ts
+++ b/app/domain/device/device_record.ts
@@ -1,7 +1,7 @@
 import { DeviceId } from './device_id.js'
 import { PropertySnapshot, ParameterSnapshot } from './device_parameter.js'
 import { DeviceComplianceInfo } from '../configuration/compliance.js'
-import { DataModel, GpnStatus } from './device.js'
+import { DataModel, GpnStatus, GpnCircuitBreaker } from './device.js'
 import type { DeviceReference } from '../../services/references/types.js'
 
 export interface DeviceRecord {
@@ -11,6 +11,10 @@ export interface DeviceRecord {
   parameters: ParameterSnapshot[]
   gpnStatus?: GpnStatus
   dataModel?: DataModel
+  gpnCircuitBreaker?: GpnCircuitBreaker
+  lastGpnSentDate?: Date | null
+  operationalStatus?: string
+  lastFailureReason?: string
   compliance?: DeviceComplianceInfo
   provisioningCode?: string
   references?: DeviceReference[]
diff --git a/app/middleware/cwmp_logger_middleware.ts b/app/middleware/cwmp_logger_middleware.ts
index 60500b6..8cc1872 100644
--- a/app/middleware/cwmp_logger_middleware.ts
+++ b/app/middleware/cwmp_logger_middleware.ts
@@ -42,10 +42,13 @@ export default class CwmpLoggerMiddleware {
     const sessionId = `${remoteIp}:${remotePort}->${localAddress}:${localPort}`
 
     let capturedResponseXml: string | null = null
+    let isEmptyResponse = false
     const originalSend = response.send.bind(response)
     response.send = (body: any) => {
       if (typeof body === 'string' && body.includes('soap-env:Envelope')) {
         capturedResponseXml = body
+      } else if (!body || (typeof body === 'string' && body.trim() === '')) {
+        isEmptyResponse = true
       }
       return originalSend(body)
     }
@@ -77,6 +80,13 @@ export default class CwmpLoggerMiddleware {
           sessionId,
           rawXml: capturedResponseXml,
         }).catch(() => {})
+      } else if (isEmptyResponse) {
+        exchangeStore.persistExchange({
+          deviceId,
+          direction: 'ACS→CPE',
+          sessionId,
+          rawXml: '',
+        }).catch(() => {})
       }
 
       // Old system: file-based writes (kept for Phase 1 dual-write rollback safety)
diff --git a/app/protocol/soap.ts b/app/protocol/soap.ts
index 02b4a46..b1db3d8 100644
--- a/app/protocol/soap.ts
+++ b/app/protocol/soap.ts
@@ -67,6 +67,15 @@ export function extractCwmpMessage(body: any): CwmpMessage | null {
       return { type, data: body[key] }
     }
   }
+
+  // Detect SOAP Fault (CPE sends soap-env:Fault / SOAP-ENV:Fault when it cannot process a request)
+  const faultKey = Object.keys(body).find(
+    (k) => k.toLowerCase().endsWith(':fault') || k === 'Fault'
+  )
+  if (faultKey) {
+    return { type: 'Fault', data: body[faultKey] }
+  }
+
   return null
 }
 
diff --git a/app/services/cwmp/configuration_evaluation_state.ts b/app/services/cwmp/configuration_evaluation_state.ts
index 953db7e..20772bb 100644
--- a/app/services/cwmp/configuration_evaluation_state.ts
+++ b/app/services/cwmp/configuration_evaluation_state.ts
@@ -1,6 +1,7 @@
 import ConfigurationEngine from '../configuration_engine.js'
 import type { EngineResult } from '../configuration_engine.js'
 import type { DeviceStateResult, DeviceContext } from './main_state_machine.js'
+import { PartialOperationalState } from './main_state_machine.js'
 import DeviceModel from '#models/device'
 import logger from '@adonisjs/core/services/logger'
 import { ComplianceStatus } from '../../domain/configuration/compliance.js'
@@ -35,10 +36,10 @@ export class ConfigurationEvaluationState {
         this.initialized = true
 
         this.engineResult = await this.engine.evaluate(context.device)
-        logger.debug(
+        logger.info(
           {
             identifier: context.device.identifier,
-            configId: this.engineResult.configuration?.identifier,
+            configId: this.engineResult.configuration?.identifier || null,
             inventoryPaths: this.engineResult.inventoryPaths.length,
             paramDiffs: this.engineResult.parameterDiffs.length,
             firmwareSteps: this.engineResult.firmwareMigrationPath.length,
@@ -56,10 +57,9 @@ export class ConfigurationEvaluationState {
           }
         )
 
-        // Always populate inventory queue (discovery happens regardless of compliance)
-        this.inventoryQueue = [...this.engineResult.inventoryPaths]
-
+        // Skip inventory when already compliant — no need to re-read parameters
         if (!this.engineResult.isAlreadyCompliant) {
+          this.inventoryQueue = [...this.engineResult.inventoryPaths]
           this.paramDiffs = this.engineResult.parameterDiffs.map((d) => ({
             name: d.name,
             value: d.targetValue,
@@ -81,24 +81,35 @@ export class ConfigurationEvaluationState {
         }
       ).catch(() => {})
 
-      return { isComplete: true }
+      return { nextState: new PartialOperationalState(context.device, {
+        reason: 'configuration_evaluation_failed',
+        blockingState: 'configuration-evaluation',
+        error: error.message,
+      }) }
     }
   }
 
   private async processNextAction(context: DeviceContext): Promise<DeviceStateResult> {
     // 1. Inventory phase 1: GetParameterNames per subtree path
-    //    Skip if device does not support GPN (avoids useless round-trips that will fail)
-    if (this.inventoryQueue.length > 0 && context.device.gpnStatus !== 'unsupported') {
+    //    Skip if device does not support GPN or circuit breaker is active
+    if (this.inventoryQueue.length > 0 && context.device.gpnStatus !== 'unsupported' && context.device.isGpnAllowed()) {
       const path = this.inventoryQueue.shift()!
       logger.debug({ identifier: context.device.identifier, path }, '[ConfigEval] Inventory GetParameterNames')
       const response = await context.services.deviceAction.getParameterNames(
         context.device,
         path,
         async (result) => {
+          if (result.status === 'error') {
+            // GPN failed during inventory — record failure
+            context.device.recordGpnFailure()
+          }
           // Collect leaf names into pendingValuesQueue for phase 2
           const infoList = result.data?.ParameterList?.ParameterInfoStruct || []
           const leafNames: string[] = infoList
-            .map((info: any) => info?.Name)
+            .map((info: any) => {
+              const n = info?.Name
+              return typeof n === 'string' ? n : (n && typeof n._ === 'string' ? n._ : null)
+            })
             .filter((name: any): name is string => !!name && !name.endsWith('.'))
           if (leafNames.length > 0) {
             this.pendingValuesQueue.push(...leafNames)
@@ -108,9 +119,8 @@ export class ConfigurationEvaluationState {
       )
       return { response }
     } else if (this.inventoryQueue.length > 0) {
-      // GPN unsupported — skip inventory (GPV on object paths also fails on most simulators)
-      // Parameters will be discovered via Inform values and SPV responses
-      logger.debug({ identifier: context.device.identifier, skipped: this.inventoryQueue.length }, '[ConfigEval] Skipping inventory (GPN unsupported)')
+      // GPN unsupported or circuit breaker active — skip inventory
+      logger.debug({ identifier: context.device.identifier, skipped: this.inventoryQueue.length }, '[ConfigEval] Skipping inventory (GPN unsupported or circuit breaker active)')
       this.inventoryQueue = []
     }
 
@@ -250,6 +260,19 @@ export class ComplianceUpdateState {
       // Always build and write provisioning code to device (functional for "once", informative for "maintain")
       if (this.engineResult.configuration) {
         const provCode = buildProvisioningCode(this.engineResult.configuration)
+
+        // Check if device already has the correct provisioning code — skip SPV if so
+        const allParams = [...context.device.getParameters(), ...context.device.getProperties()]
+        const currentPC = allParams.find((p: any) => /(^|\.)ProvisioningCode$/.test(p?.name))
+        const currentPCValue = currentPC?.value ?? ''
+
+        if (currentPCValue === provCode) {
+          logger.debug({ identifier: context.device.identifier, provCode }, '[ComplianceUpdate] Provisioning code already matches — skipping SPV')
+          updateData.provisioningCode = provCode
+          await DeviceModel.updateOne({ identifier: context.device.identifier }, updateData).catch(() => {})
+          return { nextState: new ExecutingCommandsState(true) }
+        }
+
         updateData.provisioningCode = provCode
 
         await DeviceModel.updateOne({ identifier: context.device.identifier }, updateData).catch(() => {})
diff --git a/app/services/cwmp/device_action_executor.ts b/app/services/cwmp/device_action_executor.ts
index 7a1009f..2604009 100644
--- a/app/services/cwmp/device_action_executor.ts
+++ b/app/services/cwmp/device_action_executor.ts
@@ -1,7 +1,6 @@
 import { Device } from '../../domain/device/device.js'
 import { ParameterType } from '../../domain/shared/types.js'
 import { CWMPTaskQueue, ResultStatus, TaskResult } from './task_queue.js'
-import { reclassifyDeviceFromCatalog } from '../parameter_writability.js'
 import DeviceModel from '../../models/device.js'
 import logger from '@adonisjs/core/services/logger'
 
@@ -98,9 +97,6 @@ export class DeviceActionExecutor {
           const list = resp?.ParameterList?.ParameterValueStruct
           if (Array.isArray(list) && list.length > 0) {
             device.updateFromValues(list)
-            if (device.gpnStatus === 'unsupported') {
-              reclassifyDeviceFromCatalog(device)
-            }
             await this.persistDevice(device)
           }
         } catch (e) {
@@ -110,7 +106,7 @@ export class DeviceActionExecutor {
       return await callback(result)
     }
 
-    return this.taskQueue.addTask(device.deviceId, 'get_parameter_values', parameterPaths, wrappedCallback)
+    return this.taskQueue.addTask(device.deviceId, 'get_parameter_values', parameterPaths, wrappedCallback).xml
   }
 
   async getParameterAttributes(
@@ -149,7 +145,7 @@ export class DeviceActionExecutor {
       return await callback(result)
     }
 
-    return this.taskQueue.addTask(device.deviceId, 'get_parameter_attributes', parameterList, wrappedCallback)
+    return this.taskQueue.addTask(device.deviceId, 'get_parameter_attributes', parameterList, wrappedCallback).xml
   }
 
   async getParameterNames(
@@ -162,30 +158,37 @@ export class DeviceActionExecutor {
         try {
           device.organizeParameters(result.data as any, new Date())
           device.setGpnStatus('supported')
+          device.recordGpnSuccess()
+          device.lastGpnSentDate = new Date()
           await this.persistDevice(device)
         } catch (e) {
           logger.error(`Error organizing parameters: ${e}`)
         }
       } else {
-        // Inspecter le fault code pour distinguer "non supporté" de "erreur transitoire"
+        // Inspect fault code to distinguish "unsupported" from "transient error"
         const faultCode =
           result.data?.FaultCode ??
           result.data?.faultCode ??
           result.data?.Detail?.Fault?.FaultCode ??
           result.data?.detail?.Fault?.FaultCode
         const code = typeof faultCode === 'string' ? parseInt(faultCode, 10) : faultCode
-        if (code === 9000 || code === 9001) {
+        const GPN_UNSUPPORTED_CODES = [9000, 9001, 9003, 9004, 9005]
+        const GPN_TRANSIENT_CODES = [9002]
+
+        if (GPN_UNSUPPORTED_CODES.includes(code)) {
           device.setGpnStatus('unsupported')
-          // Reclassify parameters using TR-181 catalog writability
-          reclassifyDeviceFromCatalog(device)
+          device.recordGpnFailure()
           await this.persistDevice(device)
+        } else if (GPN_TRANSIENT_CODES.includes(code)) {
+          // Transient error: log warning, do not mark unsupported, allow retry this session
+          logger.warn({ code, deviceId: device.deviceId?.serialNumber }, 'GPN transient error (9002) — will not mark unsupported')
         }
-        // Autres erreurs (réseau, timeout, 9002+) → gpnStatus inchangé
+        // Network timeout or other codes: do not mark unsupported, skip GPN for this session only
       }
       return await callback(result)
     }
 
-    return this.taskQueue.addTask(device.deviceId, 'get_parameter_names', parameterName, wrappedCallback)
+    return this.taskQueue.addTask(device.deviceId, 'get_parameter_names', parameterName, wrappedCallback).xml
   }
 
   async applySetParameterValues(
@@ -238,15 +241,12 @@ export class DeviceActionExecutor {
       async (result: TaskResult) => {
         if (result.status === ResultStatus.Success) {
           device.updateFromValues(pvStructs as any)
-          if (device.gpnStatus === 'unsupported') {
-            reclassifyDeviceFromCatalog(device)
-          }
           await this.persistDevice(device)
           return await callback(true)
         }
         return await callback(false)
       }
-    )
+    ).xml
   }
 
   async applySetParameterAttributes(
@@ -272,7 +272,7 @@ export class DeviceActionExecutor {
         }
         return await callback(false)
       }
-    )
+    ).xml
   }
 
   async applyScheduleInform(
@@ -288,7 +288,7 @@ export class DeviceActionExecutor {
       async (result: TaskResult) => {
         return await callback(result.status === ResultStatus.Success)
       }
-    )
+    ).xml
   }
 
   async applyFactoryReset(
@@ -303,7 +303,7 @@ export class DeviceActionExecutor {
       async (result: TaskResult) => {
         return await callback(result.status === ResultStatus.Success)
       }
-    )
+    ).xml
   }
 
   async applyReboot(
@@ -318,7 +318,7 @@ export class DeviceActionExecutor {
       async (result: TaskResult) => {
         return await callback(result.status === ResultStatus.Success)
       }
-    )
+    ).xml
   }
 
   async applyDownload(
@@ -344,7 +344,7 @@ export class DeviceActionExecutor {
       async (result: TaskResult) => {
         return await callback(result.status === ResultStatus.Success)
       }
-    )
+    ).xml
   }
 
   async applyUpload(
@@ -366,7 +366,7 @@ export class DeviceActionExecutor {
       async (result: TaskResult) => {
         return await callback(result.status === ResultStatus.Success)
       }
-    )
+    ).xml
   }
 
   async insertProvisioningCode(
@@ -402,15 +402,12 @@ export class DeviceActionExecutor {
       async (result: TaskResult) => {
         if (result.status === ResultStatus.Success) {
           device.updateFromValues(pvStructs as any)
-          if (device.gpnStatus === 'unsupported') {
-            reclassifyDeviceFromCatalog(device)
-          }
           await this.persistDevice(device)
           device.tmpPC = ''
           return await callback(true)
         }
         return await callback(false)
       }
-    )
+    ).xml
   }
 }
diff --git a/app/services/cwmp/immediate_command_state_machine.ts b/app/services/cwmp/immediate_command_state_machine.ts
index 18621ef..e78bf86 100644
--- a/app/services/cwmp/immediate_command_state_machine.ts
+++ b/app/services/cwmp/immediate_command_state_machine.ts
@@ -40,7 +40,7 @@ export class ImmediateCommandStateMachine {
   }
 
   isCompleted(): boolean {
-    return this.currentState.name === 'completed'
+    return this.currentState.name === 'completed' || this.currentState.name === 'operational' || this.currentState.name === 'partial_operational'
   }
 
   private async execute(): Promise<string> {
diff --git a/app/services/cwmp/main_state_machine.ts b/app/services/cwmp/main_state_machine.ts
index 729c9cd..eab9155 100644
--- a/app/services/cwmp/main_state_machine.ts
+++ b/app/services/cwmp/main_state_machine.ts
@@ -17,6 +17,7 @@ export interface DeviceContext {
   session: string
   message?: { success: boolean; data: any }
   taskQueue: CWMPTaskQueue
+  events?: string[]
   services: {
     deviceAction: DeviceActionExecutor
   }
@@ -41,15 +42,32 @@ class IdleState extends DeviceState {
   name = 'idle'
 
   async handle(context: DeviceContext): Promise<DeviceStateResult> {
-    // Test GPN support using the ManagementServer object path (not leaf params from Inform)
-    const dataModel = context.device.dataModel
+    const { device } = context
+
+    // Phase 4: Check GPN circuit breaker before attempting GPN
+    if (device.gpnStatus === 'unsupported' || !device.isGpnAllowed()) {
+      logger.info(
+        { gpnStatus: device.gpnStatus, circuitBreaker: device.gpnCircuitBreaker, deviceId: device.identifier },
+        '[IdleState] Skipping GPN — device unsupported or circuit breaker open'
+      )
+      // Skip GPN, go directly to CriticalReadsState
+      return { nextState: new CriticalReadsState(), response: '' }
+    }
+
+    logger.info(
+      { gpnStatus: device.gpnStatus, circuitBreaker: device.gpnCircuitBreaker, deviceId: device.identifier },
+      '[IdleState] GPN allowed — proceeding to discovery'
+    )
+
+    // Test GPN support using the ManagementServer object path
+    const dataModel = device.dataModel
     if (dataModel === 'tr-181') {
       return { nextState: new DiscoveringParametersState(['Device.ManagementServer.']), response: '' }
     } else if (dataModel === 'tr-098') {
       return { nextState: new DiscoveringParametersState(['InternetGatewayDevice.ManagementServer.']), response: '' }
     }
-    // Unknown data model — skip GPN test
-    return { nextState: new ConfigurationEvaluationState(), response: '' }
+    // Unknown data model — skip GPN test, go to CriticalReadsState
+    return { nextState: new CriticalReadsState(), response: '' }
   }
 }
 
@@ -67,7 +85,7 @@ class DiscoveringParametersState extends DeviceState {
     if (!this.started) {
       this.started = true
       if (this.parameterQueue.length === 0) {
-        return { nextState: new ConfigurationEvaluationState(), response: '' }
+        return { nextState: new CriticalReadsState(), response: '' }
       }
       return { response: await this.processNext(context) }
     }
@@ -79,7 +97,37 @@ class DiscoveringParametersState extends DeviceState {
         '[DiscoveringParameters] GPN Fault received — marking as unsupported'
       )
       context.device.setGpnStatus('unsupported')
-      return { nextState: new ConfigurationEvaluationState(), response: '' }
+      context.device.recordGpnFailure()
+
+      // Persist circuit breaker state immediately so it survives session drops
+      try {
+        const hashId = getDeviceHashIdentifier({
+          manufacturer: context.device.deviceId.manufacturer,
+          oui: context.device.deviceId.oui,
+          productClass: context.device.deviceId.productClass,
+          serialNumber: context.device.deviceId.serialNumber,
+        })
+        const snapshot = context.device.toSnapshot()
+        await DeviceModel.createOrUpdate({
+          identifier: hashId,
+          deviceId: context.device.deviceId,
+          properties: snapshot.properties,
+          parameters: snapshot.parameters,
+          gpnStatus: context.device.gpnStatus,
+          dataModel: context.device.dataModel,
+          gpnCircuitBreaker: snapshot.gpnCircuitBreaker,
+          lastGpnSentDate: snapshot.lastGpnSentDate,
+          updatedAt: new Date(),
+        })
+        logger.info(
+          { hashId, gpnStatus: context.device.gpnStatus, circuitBreaker: context.device.gpnCircuitBreaker },
+          '[DiscoveringParameters] Persisted GPN failure state to DB'
+        )
+      } catch (e) {
+        logger.error(`Failed to persist GPN circuit breaker state: ${e}`)
+      }
+
+      return { nextState: new CriticalReadsState(), response: '' }
     }
 
     // Process response and continue
@@ -87,7 +135,7 @@ class DiscoveringParametersState extends DeviceState {
       return { response: await this.processNext(context) }
     }
 
-    return { nextState: new ConfigurationEvaluationState(), response: '' }
+    return { nextState: new CriticalReadsState(), response: '' }
   }
 
   private async processNext(context: DeviceContext): Promise<string> {
@@ -97,6 +145,75 @@ class DiscoveringParametersState extends DeviceState {
   }
 }
 
+/**
+ * CriticalReadsState (Phase 6)
+ *
+ * Performs GPV for HardwareVersion, SoftwareVersion, ConnectionRequestURL.
+ * Always executed regardless of gpnStatus.
+ * Replaces the enqueueImmediate(GPV) from the controller.
+ */
+class CriticalReadsState extends DeviceState {
+  name = 'critical-reads'
+  private started = false
+
+  async handle(context: DeviceContext): Promise<DeviceStateResult> {
+    if (!this.started) {
+      this.started = true
+
+      const isTr181 = context.device.dataModel === 'tr-181'
+      const root = isTr181 ? 'Device' : 'InternetGatewayDevice'
+      const criticalPaths = [
+        `${root}.DeviceInfo.HardwareVersion`,
+        `${root}.DeviceInfo.SoftwareVersion`,
+        `${root}.DeviceInfo.ModelName`,
+        `${root}.ManagementServer.ConnectionRequestURL`,
+      ]
+
+      const response = await context.services.deviceAction.getParameterValues(
+        context.device,
+        criticalPaths,
+        async (result) => {
+          if (result.status === 'success') {
+            const resp: any = result.data
+            const list = resp?.ParameterList?.ParameterValueStruct
+            if (Array.isArray(list) && list.length > 0) {
+              context.device.setTmpParamValues(list)
+            }
+          }
+          return ''
+        }
+      )
+      return { response }
+    }
+
+    // After GPV response: process values from the response, then reclassify
+    if (context.message?.success && context.message.data) {
+      try {
+        const resp = context.message.data
+        const list = resp?.ParameterList?.ParameterValueStruct
+        if (Array.isArray(list) && list.length > 0) {
+          // Normalize Name fields: XMLParser may return {_: "path", "$xsi:type": "..."} when Name has attributes
+          const normalized = list.map((pv: any) => ({
+            ...pv,
+            Name: typeof pv?.Name === 'string' ? pv.Name : pv?.Name?._ || pv?.Name,
+          }))
+          context.device.setTmpParamValues(normalized)
+          context.device.updateFromValues(normalized)
+          logger.info({ count: normalized.length, names: normalized.map((p: any) => p.Name) }, '[CriticalReads] GPV response values processed')
+        }
+      } catch (e: any) {
+        logger.error({ error: e?.message }, '[CriticalReads] Error processing GPV response values')
+      }
+    }
+
+    if (context.device.gpnStatus !== 'supported') {
+      reclassifyDeviceFromCatalog(context.device)
+    }
+
+    return { nextState: new ConfigurationEvaluationState(), response: '' }
+  }
+}
+
 export class ExecutingCommandsState extends DeviceState {
   name = 'executing-commands'
   private commandsQueue: any[] = []
@@ -131,7 +248,7 @@ export class ExecutingCommandsState extends DeviceState {
 
       if (this.commandsQueue.length === 0) {
         if (this.includeNI) {
-          return { nextState: new CompletedState(), isComplete: true, response: '' }
+          return { nextState: new OperationalState(), response: '' }
         }
         // ImmediateCommandStateMachine with no commands — mark complete
         return { isComplete: true, response: '' }
@@ -184,7 +301,7 @@ export class ExecutingCommandsState extends DeviceState {
 
     // All commands done
     if (this.includeNI) {
-      return { nextState: new CompletedState(), isComplete: true, response: '' }
+      return { nextState: new OperationalState(), response: '' }
     }
     return { response: '' }
   }
@@ -286,18 +403,23 @@ export class ExecutingCommandsState extends DeviceState {
   }
 }
 
-class CompletedState extends DeviceState {
-  name = 'completed'
+/**
+ * OperationalState (Phase 10)
+ * Terminal state for successful session completion.
+ */
+export class OperationalState extends DeviceState {
+  name = 'operational'
 
   async handle(context: DeviceContext): Promise<DeviceStateResult> {
-    // Reclassify properties → parameters if GPN is unsupported
-    if (context.device.gpnStatus === 'unsupported') {
-      reclassifyDeviceFromCatalog(context.device)
-    }
+    const { device } = context
 
-    // Persist device on completion
+    // Consolidated reclassification (Phase 11)
+    reclassifyDeviceFromCatalog(device)
+
+    // Persist device with operational status
+    device.operationalStatus = 'operational'
     try {
-      const snapshot = context.device.toSnapshot()
+      const snapshot = device.toSnapshot()
       await DeviceModel.createOrUpdate({
         identifier: snapshot.identifier,
         deviceId: snapshot.deviceId,
@@ -305,11 +427,66 @@ class CompletedState extends DeviceState {
         parameters: snapshot.parameters,
         gpnStatus: snapshot.gpnStatus,
         dataModel: snapshot.dataModel,
+        gpnCircuitBreaker: snapshot.gpnCircuitBreaker,
+        lastGpnSentDate: snapshot.lastGpnSentDate,
+        operationalStatus: 'operational',
         updatedAt: new Date(),
       })
     } catch (e) {
       logger.error(`Failed to persist device on completion: ${e}`)
     }
+
+    logger.info({ deviceId: device.identifier, state: 'operational' }, '[StateMachine] Session completed successfully')
+
+    return { isComplete: true, response: '' }
+  }
+}
+
+/**
+ * PartialOperationalState (Phase 10)
+ * Terminal state for degraded session completion.
+ */
+export class PartialOperationalState extends DeviceState {
+  name = 'partial_operational'
+  private failureContext: { reason: string; blockingState?: string; error?: any }
+
+  constructor(_device: Device, failureContext: { reason: string; blockingState?: string; error?: any }) {
+    super()
+    this.failureContext = failureContext
+  }
+
+  async handle(context: DeviceContext): Promise<DeviceStateResult> {
+    const { device } = context
+
+    device.operationalStatus = 'partial_operational'
+    device.lastFailureReason = this.failureContext.reason
+
+    try {
+      const snapshot = device.toSnapshot()
+      await DeviceModel.createOrUpdate({
+        identifier: snapshot.identifier,
+        deviceId: snapshot.deviceId,
+        properties: snapshot.properties,
+        parameters: snapshot.parameters,
+        gpnStatus: snapshot.gpnStatus,
+        dataModel: snapshot.dataModel,
+        gpnCircuitBreaker: snapshot.gpnCircuitBreaker,
+        lastGpnSentDate: snapshot.lastGpnSentDate,
+        operationalStatus: 'partial_operational',
+        lastFailureReason: this.failureContext.reason,
+        updatedAt: new Date(),
+      })
+    } catch (e) {
+      logger.error(`Failed to persist device on partial completion: ${e}`)
+    }
+
+    logger.error({
+      deviceId: device.identifier,
+      reason: this.failureContext.reason,
+      blockingState: this.failureContext.blockingState,
+      state: 'partial_operational',
+    }, '[StateMachine] Session completed with degraded status')
+
     return { isComplete: true, response: '' }
   }
 }
@@ -320,12 +497,13 @@ export class MainStateMachine {
   private currentState: DeviceState
   private context: DeviceContext
 
-  constructor(device: Device, session: string, taskQueue: CWMPTaskQueue) {
+  constructor(device: Device, session: string, taskQueue: CWMPTaskQueue, events?: string[]) {
     this.currentState = new IdleState()
     this.context = {
       device,
       session,
       taskQueue,
+      events,
       services: {
         deviceAction: new DeviceActionExecutor(taskQueue),
       },
@@ -342,7 +520,7 @@ export class MainStateMachine {
   }
 
   isCompleted(): boolean {
-    return this.currentState.name === 'completed'
+    return this.currentState.name === 'operational' || this.currentState.name === 'partial_operational'
   }
 
   getCurrentStateName(): string {
@@ -350,11 +528,12 @@ export class MainStateMachine {
   }
 
   private async executeCurrentState(): Promise<string> {
-    let safetyGuard = 0
+    const MAX_STATE_TRANSITIONS = 15
+    let transitionCount = 0
 
-    while (safetyGuard++ < 15) {
+    while (transitionCount++ < MAX_STATE_TRANSITIONS) {
       try {
-        logger.debug({ state: this.currentState.name, iteration: safetyGuard }, '[StateMachine] Executing state')
+        logger.debug({ state: this.currentState.name, iteration: transitionCount }, '[StateMachine] Executing state')
         const result = await this.currentState.handle(this.context)
 
         if (result.nextState) {
@@ -377,14 +556,29 @@ export class MainStateMachine {
         }
       } catch (error) {
         logger.error(`Error in state ${this.currentState.name}: ${error}`)
-        // On error, try to complete gracefully
-        this.currentState = new CompletedState()
+        // On error, transition to PartialOperationalState
+        this.currentState = new PartialOperationalState(this.context.device, {
+          reason: 'unrecoverable_error',
+          blockingState: this.currentState.name,
+          error,
+        })
         await this.currentState.handle(this.context)
         return ''
       }
     }
 
-    logger.warn('Main state machine safety guard reached')
+    // Phase 9: Explicit error handling when max transitions exceeded
+    logger.error({
+      deviceId: this.context.device.identifier,
+      lastState: this.currentState.name,
+      sessionId: this.context.session,
+    }, `State machine stuck in ${this.currentState.name} after ${MAX_STATE_TRANSITIONS} transitions`)
+
+    this.currentState = new PartialOperationalState(this.context.device, {
+      reason: 'max_transitions_exceeded',
+      blockingState: this.currentState.name,
+    })
+    await this.currentState.handle(this.context)
     return ''
   }
 }
diff --git a/app/services/cwmp/state_machine_manager.ts b/app/services/cwmp/state_machine_manager.ts
index 628b838..be7dd55 100644
--- a/app/services/cwmp/state_machine_manager.ts
+++ b/app/services/cwmp/state_machine_manager.ts
@@ -5,6 +5,7 @@ import { CWMPTaskQueue, ResultStatus } from './task_queue.js'
 import { MainStateMachine } from './main_state_machine.js'
 import { ImmediateCommandStateMachine } from './immediate_command_state_machine.js'
 import { getDeviceHashIdentifier } from '../../utils/device_utils.js'
+import { resolveHighestPriorityEvent, normalizeEventCode } from '../../utils/cwmp-events.js'
 import { CommandStatus } from '../../domain/commands/command.js'
 import { ModeType } from '../../domain/shared/mode.js'
 import CommandModel from '../../models/command.js'
@@ -47,7 +48,6 @@ export class StateMachineManager extends EventEmitter {
   constructor() {
     super()
     this.taskQueue = new CWMPTaskQueue()
-    this.setupTaskQueueListeners()
   }
 
   static getInstance(): StateMachineManager {
@@ -83,7 +83,8 @@ export class StateMachineManager extends EventEmitter {
   ): Promise<StateMachineInstance> {
     const deviceKey = JSON.stringify(device.deviceId)
     const evts = opts?.events || []
-    const lastEvent = this.normalizeEvent(evts.length > 0 ? evts[evts.length - 1] : '')
+    const primaryEvent = resolveHighestPriorityEvent(evts)
+    const normalizedEvents = evts.map((e) => normalizeEventCode(e))
 
     // Check for NI commands that force MainStateMachine
     let forceMainForNI = false
@@ -113,8 +114,8 @@ export class StateMachineManager extends EventEmitter {
         const existingMachine = this.machines.get(existingMachineId)
         if (existingMachine && existingMachine.status === MachineStatus.RUNNING) {
           const isImmediate = existingMachine.stateMachine instanceof ImmediateCommandStateMachine
-          const onboardingEvent = ['0 BOOTSTRAP', '1 BOOT', '2 PERIODIC', '3 SCHEDULED'].includes(
-            lastEvent
+          const onboardingEvent = ['BOOTSTRAP', 'BOOT', 'PERIODIC', 'SCHEDULED'].includes(
+            primaryEvent
           )
           const shouldPreempt = isImmediate && (forceMainForNI || onboardingEvent)
 
@@ -127,7 +128,7 @@ export class StateMachineManager extends EventEmitter {
               existingMachine.session = session
             }
             // Replace with MainStateMachine
-            const newMachine = new MainStateMachine(device, session, this.taskQueue)
+            const newMachine = new MainStateMachine(device, session, this.taskQueue, normalizedEvents)
             ;(existingMachine as any).stateMachine = newMachine
             existingMachine.events = evts
             await newMachine.start()
@@ -138,7 +139,17 @@ export class StateMachineManager extends EventEmitter {
 
           // For a new CONNECTION REQUEST arriving while a previous immediate session
           // is still technically "running", complete the old one and create a fresh machine
-          if (isImmediate && lastEvent === '6 CONNECTION REQUEST') {
+          if (isImmediate && primaryEvent === 'CONNECTION REQUEST') {
+            this.completeMachine(existingMachine)
+            // Fall through to create a new machine below
+          } else if (!isImmediate && existingSessionId !== session) {
+            // Stale MainStateMachine from a dropped session — the CPE started a new
+            // Inform cycle which means the previous session is dead. Complete the old
+            // machine and create a fresh one for the new session.
+            logger.warn(
+              { oldSession: existingSessionId, newSession: session, state: existingMachine.currentState },
+              '[StateMachineManager] Replacing stale MainStateMachine from dropped session'
+            )
             this.completeMachine(existingMachine)
             // Fall through to create a new machine below
           } else {
@@ -160,17 +171,21 @@ export class StateMachineManager extends EventEmitter {
 
     let stateMachine: MainStateMachine | ImmediateCommandStateMachine
     if (forceMainForNI) {
-      stateMachine = new MainStateMachine(device, session, this.taskQueue)
-    } else if (lastEvent === '6 CONNECTION REQUEST') {
+      stateMachine = new MainStateMachine(device, session, this.taskQueue, normalizedEvents)
+    } else if (primaryEvent === 'BOOTSTRAP' || primaryEvent === 'BOOT') {
+      // BOOTSTRAP/BOOT always triggers full MainStateMachine onboarding
+      stateMachine = new MainStateMachine(device, session, this.taskQueue, normalizedEvents)
+    } else if (primaryEvent === 'CONNECTION REQUEST') {
+      // CONNECTION REQUEST only if no BOOTSTRAP/BOOT present
+      stateMachine = new ImmediateCommandStateMachine(device, session, this.taskQueue)
+    } else if (primaryEvent === 'PERIODIC' || primaryEvent === 'VALUE CHANGE' || primaryEvent === 'SCHEDULED') {
+      // Lightweight MainStateMachine
+      stateMachine = new MainStateMachine(device, session, this.taskQueue, normalizedEvents)
+    } else if (primaryEvent === 'DIAGNOSTICS COMPLETE' || primaryEvent === 'TRANSFER COMPLETE') {
       stateMachine = new ImmediateCommandStateMachine(device, session, this.taskQueue)
-    } else if (
-      ['0 BOOTSTRAP', '1 BOOT', '2 PERIODIC', '3 SCHEDULED'].includes(lastEvent) ||
-      !lastEvent
-    ) {
-      stateMachine = new MainStateMachine(device, session, this.taskQueue)
     } else {
       // Unknown event - use MainStateMachine as default
-      stateMachine = new MainStateMachine(device, session, this.taskQueue)
+      stateMachine = new MainStateMachine(device, session, this.taskQueue, normalizedEvents)
     }
 
     const machineInstance: StateMachineInstance = {
@@ -311,7 +326,29 @@ export class StateMachineManager extends EventEmitter {
         return response
       }
 
-      // Serve queued tasks
+      // Let the state machine continue first (GPN discovery, config eval, etc.)
+      const response = await machineInstance.stateMachine.handleResponse(true, { isFirst: false })
+      logger.debug(
+        {
+          session,
+          stateName: machineInstance.stateMachine.getCurrentStateName(),
+          responseLength: response?.length || 0,
+        },
+        '[Continue] State machine handleResponse result'
+      )
+      machineInstance.currentState = machineInstance.stateMachine.getCurrentStateName()
+
+      if (machineInstance.stateMachine.isCompleted()) {
+        this.completeMachine(machineInstance)
+        return ''
+      }
+
+      // If state machine produced a response, send it
+      if (response && response !== '') {
+        return response
+      }
+
+      // Otherwise, serve queued tasks (GPV, etc.)
       const pendingTask = this.taskQueue.getTaskForDevice(machineInstance.deviceId)
       if (pendingTask) {
         const builder = CWMPTaskQueue.task_map[pendingTask.task]
@@ -322,16 +359,6 @@ export class StateMachineManager extends EventEmitter {
         }
       }
 
-      // Let the state machine continue
-      const response = await machineInstance.stateMachine.handleResponse(true, { isFirst: false })
-      logger.debug({ session, stateName: machineInstance.stateMachine.getCurrentStateName(), responseLength: response?.length || 0 }, '[Continue] State machine handleResponse result')
-      machineInstance.currentState = machineInstance.stateMachine.getCurrentStateName()
-
-      if (machineInstance.stateMachine.isCompleted()) {
-        this.completeMachine(machineInstance)
-        return ''
-      }
-
       return response
     } catch (error) {
       logger.error(`Error continuing session ${session}: ${error}`)
@@ -418,17 +445,6 @@ export class StateMachineManager extends EventEmitter {
     logger.error(`State machine failed: ${error}`)
   }
 
-  private normalizeEvent(evt: string): string {
-    const normalized = (evt || '').toString().trim().replace(/\s+/g, ' ').toUpperCase()
-    // Handle simulator variants that send only the event code number
-    if (normalized === '6') return '6 CONNECTION REQUEST'
-    if (normalized === '0') return '0 BOOTSTRAP'
-    if (normalized === '1') return '1 BOOT'
-    if (normalized === '2') return '2 PERIODIC'
-    if (normalized === '3') return '3 SCHEDULED'
-    return normalized
-  }
-
   cleanupCompletedMachines(olderThanHours: number = 1): void {
     const cutoff = new Date(Date.now() - olderThanHours * 60 * 60 * 1000)
     for (const [id, machine] of this.machines.entries()) {
@@ -446,19 +462,4 @@ export class StateMachineManager extends EventEmitter {
     this.stopCleanupTimer()
     this.cleanupCompletedMachines(0)
   }
-
-  private setupTaskQueueListeners(): void {
-    this.taskQueue.on('taskSent', (task: any) => {
-      // Find the machine for this device and set lastTaskId
-      const deviceKey = JSON.stringify(task.deviceId)
-      const sessionId = this.deviceSessions.get(deviceKey)
-      if (sessionId) {
-        const machineId = this.sessionMachines.get(sessionId)
-        if (machineId) {
-          const machine = this.machines.get(machineId)
-          if (machine) machine.lastTaskId = task.id
-        }
-      }
-    })
-  }
 }
diff --git a/app/services/cwmp/task_queue.ts b/app/services/cwmp/task_queue.ts
index dcf0cf2..85db8a8 100644
--- a/app/services/cwmp/task_queue.ts
+++ b/app/services/cwmp/task_queue.ts
@@ -89,33 +89,32 @@ export class CWMPTaskQueue extends EventEmitter {
 
   /**
    * Adds a task with callback (legacy-compatible API used by DeviceActionExecutor)
-   * Returns the CWMP XML envelope to send to the device
+   * Returns the CWMP XML envelope and task ID
    */
   addTask(
     deviceId: DeviceId,
     taskType: string,
     props: any,
     callback: (result: TaskResult) => Promise<string>
-  ): string {
+  ): { xml: string; taskId: string } {
     const cwmpTask = this.addCWMPTask(deviceId, taskType, props)
 
     if (callback) {
       this.taskCallbacks.set(cwmpTask.id, callback)
     }
 
-    // Mark as SENT immediately so the manager correlates the response
+    // Mark as SENT immediately
     if (cwmpTask.status === TaskStatus.PENDING) {
       cwmpTask.status = TaskStatus.SENT
-      this.emit('taskSent', cwmpTask)
     }
 
     // Generate CWMP envelope
     const builder = CWMPTaskQueue.task_map[taskType]
     if (typeof builder !== 'function') {
       logger.warn(`No CWMP builder found for task '${taskType}'`)
-      return ''
+      return { xml: '', taskId: cwmpTask.id }
     }
-    return builder(props)
+    return { xml: builder(props), taskId: cwmpTask.id }
   }
 
   /**
@@ -168,7 +167,6 @@ export class CWMPTaskQueue extends EventEmitter {
 
     if (cwmpTask.status === TaskStatus.PENDING) {
       cwmpTask.status = TaskStatus.SENT
-      this.emit('taskSent', cwmpTask)
     }
 
     return { id: taskId, task: cwmpTask.type, props: cwmpTask.payload }
diff --git a/app/services/device_service.ts b/app/services/device_service.ts
index 408c9c9..9599ce1 100644
--- a/app/services/device_service.ts
+++ b/app/services/device_service.ts
@@ -1,6 +1,6 @@
 import DeviceModel from '#models/device'
 import CommandModel from '#models/command'
-import { DeviceRecord } from '../domain/device/device_record.js'
+import { type DeviceRecord } from '../domain/device/device_record.js'
 import { CommandStatus, CommandType, Priority } from '../domain/commands/command.js'
 import { ModeType } from '../domain/shared/mode.js'
 import logger from '@adonisjs/core/services/logger'
@@ -30,12 +30,15 @@ export default class DeviceService {
   /**
    * Execute a command on a device. Mode I triggers a Connection Request.
    */
-  async executeCommand(identifier: string, commandPayload: {
-    action: CommandType
-    parameters?: Record<string, any>
-    mode?: string
-    priority?: number
-  }): Promise<void> {
+  async executeCommand(
+    identifier: string,
+    commandPayload: {
+      action: CommandType
+      parameters?: Record<string, any>
+      mode?: string
+      priority?: number
+    }
+  ): Promise<void> {
     const device = await DeviceModel.findByIdentifier(identifier)
     if (!device) {
       throw new Error(`Device not found: ${identifier}`)
@@ -101,13 +104,19 @@ export default class DeviceService {
   /**
    * Send Connection Request to CPE to wake it up for immediate command execution
    */
-  private async applyImmediateCommandForDevice(device: DeviceRecord, identifier: string): Promise<void> {
+  private async applyImmediateCommandForDevice(
+    device: DeviceRecord,
+    identifier: string
+  ): Promise<void> {
     const connectionRequestParam = (device.properties || []).find((p: any) =>
       p.name?.includes('ConnectionRequestURL')
     )
 
     if (!connectionRequestParam || !connectionRequestParam.value) {
-      logger.error({ identifier, availableProps: (device.properties || []).map((p: any) => p.name) }, 'ConnectionRequestURL not found in device properties')
+      logger.error(
+        { identifier, availableProps: (device.properties || []).map((p: any) => p.name) },
+        'ConnectionRequestURL not found in device properties'
+      )
       return
     }
 
@@ -128,16 +137,23 @@ export default class DeviceService {
    */
   private async updatePendingCommandsStatus(identifier: string, success: boolean): Promise<void> {
     const collection = CommandModel.getCollection()
-    const pendingCmds = await collection.find({
-      deviceIdentifier: identifier,
-      mode: ModeType.I,
-      status: CommandStatus.PENDING,
-    }).toArray()
+    const pendingCmds = await collection
+      .find({
+        deviceIdentifier: identifier,
+        mode: ModeType.I,
+        status: CommandStatus.PENDING,
+      })
+      .toArray()
 
     for (const cmd of pendingCmds) {
       await collection.updateOne(
         { _id: cmd._id },
-        { $set: { status: success ? CommandStatus.WAITING : CommandStatus.PENDING, updatedAt: new Date() } }
+        {
+          $set: {
+            status: success ? CommandStatus.WAITING : CommandStatus.PENDING,
+            updatedAt: new Date(),
+          },
+        }
       )
     }
   }
@@ -148,14 +164,21 @@ export default class DeviceService {
       // Fallback chain: ConnectionRequestUsername > ManagementServer.Username > OUI-ProductClass-Serial
       const allParams = [...(device.properties || []), ...(device.parameters || [])]
 
-      const connReqUsername = allParams.find((p: any) => p.name?.includes('ConnectionRequestUsername'))
-      const connReqPassword = allParams.find((p: any) => p.name?.includes('ConnectionRequestPassword'))
+      const connReqUsername = allParams.find((p: any) =>
+        p.name?.includes('ConnectionRequestUsername')
+      )
+      const connReqPassword = allParams.find((p: any) =>
+        p.name?.includes('ConnectionRequestPassword')
+      )
       const mgmtUsername = allParams.find((p: any) => p.name?.endsWith('ManagementServer.Username'))
       const mgmtPassword = allParams.find((p: any) => p.name?.endsWith('ManagementServer.Password'))
 
       // genieacs-sim uses ManagementServer.Username/Password for CR auth (non-standard)
       // Real CPEs use ConnectionRequestUsername/Password
-      const username = mgmtUsername?.value || connReqUsername?.value || `${device.deviceId.oui}-${device.deviceId.productClass}-${device.deviceId.serialNumber}`
+      const username =
+        mgmtUsername?.value ||
+        connReqUsername?.value ||
+        `${device.deviceId.oui}-${device.deviceId.productClass}-${device.deviceId.serialNumber}`
       const password = mgmtPassword?.value ?? connReqPassword?.value ?? ''
 
       logger.info({ url: connectionRequestURL.toString(), username }, 'Sending Connection Request')
@@ -169,13 +192,26 @@ export default class DeviceService {
       })
 
       if (!response.ok) {
-        logger.error({ status: response.status, statusText: response.statusText, url: connectionRequestURL.toString() }, 'Connection Request failed with non-OK status')
+        logger.error(
+          {
+            status: response.status,
+            statusText: response.statusText,
+            url: connectionRequestURL.toString(),
+          },
+          'Connection Request failed with non-OK status'
+        )
         return false
       }
-      logger.info({ status: response.status, url: connectionRequestURL.toString() }, 'Connection Request successful')
+      logger.info(
+        { status: response.status, url: connectionRequestURL.toString() },
+        'Connection Request successful'
+      )
       return true
     } catch (error: any) {
-      logger.error({ error: error?.message, code: error?.cause?.code, url: connectionRequestURL.toString() }, 'Connection Request network error')
+      logger.error(
+        { error: error?.message, code: error?.cause?.code, url: connectionRequestURL.toString() },
+        'Connection Request network error'
+      )
       return false
     }
   }
diff --git a/app/services/exchange_store_service.ts b/app/services/exchange_store_service.ts
index 505e5b6..671f34a 100644
--- a/app/services/exchange_store_service.ts
+++ b/app/services/exchange_store_service.ts
@@ -109,12 +109,30 @@ export class ExchangeStoreService {
     const events: string[] = []
     let match: RegExpExecArray | null
 
+    // Map numeric-only codes to their TR-069 labels
+    const numericLabels: Record<string, string> = {
+      '0': 'BOOTSTRAP',
+      '1': 'BOOT',
+      '2': 'PERIODIC',
+      '3': 'SCHEDULED',
+      '4': 'VALUE CHANGE',
+      '5': 'KICKED',
+      '6': 'CONNECTION REQUEST',
+      '7': 'TRANSFER COMPLETE',
+      '8': 'DIAGNOSTICS COMPLETE',
+    }
+
     while ((match = eventRegex.exec(xml)) !== null) {
       const raw = match[1].trim()
-      // Extract just the label part (e.g., "0 BOOTSTRAP" → "BOOTSTRAP", "2 PERIODIC" → "PERIODIC")
-      const label = raw.replace(/^\d+\s+/, '')
-      if (label) {
-        events.push(label)
+      // If numeric only (e.g., "0"), map to label
+      if (numericLabels[raw]) {
+        events.push(numericLabels[raw])
+      } else {
+        // Extract just the label part (e.g., "0 BOOTSTRAP" → "BOOTSTRAP")
+        const label = raw.replace(/^\d+\s+/, '')
+        if (label) {
+          events.push(label)
+        }
       }
     }
 
diff --git a/app/utils/cwmp-events.ts b/app/utils/cwmp-events.ts
new file mode 100644
index 0000000..177cfe9
--- /dev/null
+++ b/app/utils/cwmp-events.ts
@@ -0,0 +1,67 @@
+/**
+ * Shared CWMP event normalization and priority resolution utilities.
+ * Single source of truth for event code handling (fixes MINEUR-9).
+ */
+
+export const EVENT_PRIORITY: Record<string, number> = {
+  'BOOTSTRAP': 100,
+  'BOOT': 90,
+  'CONNECTION REQUEST': 80,
+  'PERIODIC': 70,
+  'VALUE CHANGE': 60,
+  'DIAGNOSTICS COMPLETE': 50,
+  'TRANSFER COMPLETE': 40,
+  'SCHEDULE': 30,
+}
+
+/**
+ * Normalize an EventCode from an Inform message.
+ * Strips numeric prefix and normalizes the label.
+ * Examples: '0 BOOTSTRAP' → 'BOOTSTRAP', '1 BOOT' → 'BOOT', '6' → 'CONNECTION REQUEST'
+ */
+export function normalizeEventCode(raw: string): string {
+  const trimmed = raw.trim().toUpperCase()
+
+  // Already a known label without numeric prefix
+  if (EVENT_PRIORITY[trimmed] !== undefined) return trimmed
+
+  // Full format like "0 BOOTSTRAP" → strip numeric prefix
+  const match = trimmed.match(/^\d+\s+(.+)$/)
+  if (match) return match[1]
+
+  // Numeric-only → expand to standard label
+  switch (trimmed) {
+    case '0': return 'BOOTSTRAP'
+    case '1': return 'BOOT'
+    case '2': return 'PERIODIC'
+    case '3': return 'SCHEDULED'
+    case '4': return 'VALUE CHANGE'
+    case '5': return 'KICKED'
+    case '6': return 'CONNECTION REQUEST'
+    case '7': return 'TRANSFER COMPLETE'
+    case '8': return 'DIAGNOSTICS COMPLETE'
+    default: return trimmed
+  }
+}
+
+/**
+ * Resolve the highest priority event from a list of raw event codes.
+ * Returns the normalized name of the highest-priority event.
+ */
+export function resolveHighestPriorityEvent(events: string[]): string {
+  if (events.length === 0) return ''
+
+  let highest = ''
+  let highestPriority = -1
+
+  for (const raw of events) {
+    const normalized = normalizeEventCode(raw)
+    const priority = EVENT_PRIORITY[normalized] ?? 0
+    if (priority > highestPriority) {
+      highestPriority = priority
+      highest = normalized
+    }
+  }
+
+  return highest
+}
diff --git a/config/tr181-catalog.json b/config/tr181-catalog.json
index d4428a7..1840161 100644
--- a/config/tr181-catalog.json
+++ b/config/tr181-catalog.json
@@ -1,4 +1,22 @@
 [
+  {
+    "path": "Device.ACLManager.Role.{i}.Name",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.ACLManager.Role.{i}.Permissions",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.ACLManager.RoleNumberOfEntries",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.ATM.Diagnostics.F5Loopback.AverageResponseTime",
     "writable": false,
@@ -39,7 +57,7 @@
     "path": "Device.ATM.Diagnostics.F5Loopback.NumberOfRepetitions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Diagnostics.F5Loopback.SuccessCount",
@@ -69,6 +87,12 @@
     "path": "Device.ATM.Link.{i}.AutoConfig",
     "writable": false,
     "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.ATM.Link.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
@@ -93,13 +117,13 @@
     "path": "Device.ATM.Link.{i}.FCSPreserved",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ATM.Link.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Link.{i}.LinkType",
@@ -111,11 +135,11 @@
     "path": "Device.ATM.Link.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ATM.Link.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -147,25 +171,25 @@
     "path": "Device.ATM.Link.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.CRCErrors",
@@ -177,25 +201,25 @@
     "path": "Device.ATM.Link.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.HECErrors",
@@ -207,31 +231,31 @@
     "path": "Device.ATM.Link.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.ReceivedBlocks",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.Reset",
@@ -243,29 +267,29 @@
     "path": "Device.ATM.Link.{i}.Stats.TransmittedBlocks",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ATM.Link.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ATM.Link.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -273,7 +297,7 @@
     "path": "Device.ATM.Link.{i}.VCSearchList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ATM.LinkNumberOfEntries",
@@ -345,7 +369,7 @@
     "path": "Device.BASAPM.MeasurementEndpoint.{i}.UseMeasurementEndpointInReports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.BASAPM.MeasurementEndpointNumberOfEntries",
@@ -395,39 +419,57 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.Bridging.Bridge.{i}.Port.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Enable",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:boolean"
   },
+  {
+    "path": "Device.Bridging.Bridge.{i}.Port.{i}.IGMP",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.IngressFiltering",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.ManagementPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Bridging.Bridge.{i}.Port.{i}.MLD",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -435,7 +477,7 @@
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PathCost",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PortState",
@@ -453,133 +495,133 @@
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PriorityCodePoint.PCPDecoding",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PriorityCodePoint.PCPEncoding",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PriorityCodePoint.PCPSelection",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PriorityCodePoint.RequireDropEncoding",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PriorityCodePoint.UseDEI",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PriorityRegeneration",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PriorityTagging",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.PVID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.ServiceAccessPrioritySelection",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.ServiceAccessPriorityTranslation",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.Reset",
@@ -591,22 +633,34 @@
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Bridging.Bridge.{i}.Port.{i}.STPAdminEdgePort",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Bridging.Bridge.{i}.Port.{i}.STPPointToPointMode",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:string"
@@ -615,7 +669,7 @@
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.TPID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.Port.{i}.Type",
@@ -657,7 +711,7 @@
     "path": "Device.Bridging.Bridge.{i}.STP.ForwardingDelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.STP.HelloTime",
@@ -669,7 +723,7 @@
     "path": "Device.Bridging.Bridge.{i}.STP.MaxAge",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.STP.Protocol",
@@ -705,7 +759,7 @@
     "path": "Device.Bridging.Bridge.{i}.VLAN.{i}.VLANID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.VLANNumberOfEntries",
@@ -729,13 +783,13 @@
     "path": "Device.Bridging.Bridge.{i}.VLANPort.{i}.Port",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.VLANPort.{i}.Untagged",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Bridge.{i}.VLANPort.{i}.VLAN",
@@ -777,43 +831,43 @@
     "path": "Device.Bridging.Filter.{i}.DestIPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACAddressFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACAddressFilterList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACFromClientIDFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACFromClientIDFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACFromUserClassIDFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACFromUserClassIDFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACFromVendorClassIDFilter",
@@ -825,13 +879,13 @@
     "path": "Device.Bridging.Filter.{i}.DestMACFromVendorClassIDFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACFromVendorClassIDFilterv6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestMACFromVendorClassIDMode",
@@ -849,19 +903,19 @@
     "path": "Device.Bridging.Filter.{i}.DestPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestPortExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DestPortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Bridging.Filter.{i}.DHCPType",
@@ -879,13 +933,13 @@
     "path": "Device.Bridging.Filter.{i}.EthertypeFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.EthertypeFilterList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Bridging.Filter.{i}.Interface",
@@ -903,13 +957,13 @@
     "path": "Device.Bridging.Filter.{i}.Protocol",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Bridging.Filter.{i}.ProtocolExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceIP",
@@ -921,43 +975,43 @@
     "path": "Device.Bridging.Filter.{i}.SourceIPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACAddressFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACAddressFilterList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACFromClientIDFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACFromClientIDFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACFromUserClassIDFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACFromUserClassIDFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACFromVendorClassIDFilter",
@@ -969,13 +1023,13 @@
     "path": "Device.Bridging.Filter.{i}.SourceMACFromVendorClassIDFilterExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACFromVendorClassIDFilterv6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourceMACFromVendorClassIDMode",
@@ -993,19 +1047,19 @@
     "path": "Device.Bridging.Filter.{i}.SourcePort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourcePortExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Bridging.Filter.{i}.SourcePortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Bridging.Filter.{i}.Status",
@@ -1017,7 +1071,7 @@
     "path": "Device.Bridging.Filter.{i}.VLANIDFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.FilterNumberOfEntries",
@@ -1029,37 +1083,37 @@
     "path": "Device.Bridging.MaxBridgeEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.MaxDBridgeEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.MaxFilterEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.MaxProviderBridgeEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.MaxQBridgeEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.MaxVLANEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Bridging.ProviderBridge.{i}.Alias",
@@ -1071,7 +1125,7 @@
     "path": "Device.Bridging.ProviderBridge.{i}.CVLANcomponents",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Bridging.ProviderBridge.{i}.Enable",
@@ -1113,19 +1167,19 @@
     "path": "Device.BulkData.EncodingTypes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.BulkData.MaxNumberOfParameterReferences",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.BulkData.MaxNumberOfProfiles",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.BulkData.MinReportingInterval",
@@ -1137,7 +1191,7 @@
     "path": "Device.BulkData.ParameterWildCardSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.BulkData.Profile.{i}.Alias",
@@ -1221,7 +1275,7 @@
     "path": "Device.BulkData.Profile.{i}.HTTP.CompressionsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.BulkData.Profile.{i}.HTTP.Method",
@@ -1233,7 +1287,7 @@
     "path": "Device.BulkData.Profile.{i}.HTTP.MethodsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.BulkData.Profile.{i}.HTTP.Password",
@@ -1245,7 +1299,7 @@
     "path": "Device.BulkData.Profile.{i}.HTTP.PersistAcrossReboot",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.BulkData.Profile.{i}.HTTP.RequestURIParameter.{i}.Name",
@@ -1275,7 +1329,7 @@
     "path": "Device.BulkData.Profile.{i}.HTTP.RetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.BulkData.Profile.{i}.HTTP.RetryMinimumWaitInterval",
@@ -1293,7 +1347,7 @@
     "path": "Device.BulkData.Profile.{i}.HTTP.UseDateHeader",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.BulkData.Profile.{i}.HTTP.Username",
@@ -1317,13 +1371,13 @@
     "path": "Device.BulkData.Profile.{i}.MQTT.PublishQoS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.BulkData.Profile.{i}.MQTT.PublishRetain",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.BulkData.Profile.{i}.MQTT.PublishTopic",
@@ -1347,13 +1401,13 @@
     "path": "Device.BulkData.Profile.{i}.NumberOfRetainedFailedReports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.BulkData.Profile.{i}.Parameter.{i}.Exclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.BulkData.Profile.{i}.Parameter.{i}.Name",
@@ -1401,13 +1455,13 @@
     "path": "Device.BulkData.Profile.{i}.StreamingSessionID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.BulkData.Profile.{i}.TimeReference",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.BulkData.ProfileNumberOfEntries",
@@ -1419,7 +1473,7 @@
     "path": "Device.BulkData.Protocols",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.BulkData.Status",
@@ -1431,7 +1485,7 @@
     "path": "Device.CaptivePortal.AllowedList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.CaptivePortal.Enable",
@@ -1479,7 +1533,7 @@
     "path": "Device.Cellular.AccessPoint.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Cellular.AccessPoint.{i}.Password",
@@ -1503,7 +1557,7 @@
     "path": "Device.Cellular.AccessPoint.{i}.Type",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Cellular.AccessPoint.{i}.Username",
@@ -1527,7 +1581,7 @@
     "path": "Device.Cellular.Interface.{i}.AvailableNetworks",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Cellular.Interface.{i}.CurrentAccessTechnology",
@@ -1535,6 +1589,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Cellular.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Cellular.Interface.{i}.DownstreamMaxBitRate",
     "writable": false,
@@ -1557,13 +1617,13 @@
     "path": "Device.Cellular.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Cellular.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Mode",
@@ -1599,13 +1659,13 @@
     "path": "Device.Cellular.Interface.{i}.RSRP",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Cellular.Interface.{i}.RSRQ",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Cellular.Interface.{i}.RSSI",
@@ -1617,13 +1677,13 @@
     "path": "Device.Cellular.Interface.{i}.SIMReferenceList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Incoming.CapacityLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Incoming.StorageRef",
@@ -1639,43 +1699,43 @@
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Message.{i}.Receiver",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Message.{i}.Sender",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Message.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Message.{i}.StorageRef",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Message.{i}.Text",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Message.{i}.TimeStamp",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Message.{i}.Type",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -1689,7 +1749,7 @@
     "path": "Device.Cellular.Interface.{i}.SMS.Outgoing.CapacityLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Outgoing.StorageRef",
@@ -1707,13 +1767,13 @@
     "path": "Device.Cellular.Interface.{i}.SMS.Storage.{i}.AvailableCapacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Storage.{i}.Capacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.Storage.{i}.Location",
@@ -1725,7 +1785,7 @@
     "path": "Device.Cellular.Interface.{i}.SMS.Storage.{i}.StorageAvailable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Cellular.Interface.{i}.SMS.StorageNumberOfEntries",
@@ -1737,73 +1797,73 @@
     "path": "Device.Cellular.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.Reset",
@@ -1815,19 +1875,19 @@
     "path": "Device.Cellular.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Status",
@@ -1839,13 +1899,13 @@
     "path": "Device.Cellular.Interface.{i}.SupportedAccessTechnologies",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Cellular.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Cellular.Interface.{i}.UpstreamMaxBitRate",
@@ -1935,7 +1995,7 @@
     "path": "Device.CollectionDevice.{i}.HostDeviceRef",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.CollectionDevice.{i}.HPNAAssociatedDeviceRef",
@@ -1953,7 +2013,7 @@
     "path": "Device.CollectionDevice.{i}.IsNativeDevice",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.CollectionDevice.{i}.LLDPDeviceRef",
@@ -1983,7 +2043,7 @@
     "path": "Device.CollectionDevice.{i}.UPnPDeviceRef",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.CollectionDevice.{i}.WiFiAssociatedDeviceRef",
@@ -2055,7 +2115,7 @@
     "path": "Device.ConnectionMonitoring.Connection.{i}.DSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ConnectionMonitoring.Connection.{i}.Enable",
@@ -2067,7 +2127,7 @@
     "path": "Device.ConnectionMonitoring.Connection.{i}.EthernetPriority",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ConnectionMonitoring.Connection.{i}.FailInterval",
@@ -2085,7 +2145,7 @@
     "path": "Device.ConnectionMonitoring.Connection.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ConnectionMonitoring.Connection.{i}.MaxResponseTimeout",
@@ -2115,19 +2175,19 @@
     "path": "Device.ConnectionMonitoring.Connection.{i}.NumberOfAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ConnectionMonitoring.Connection.{i}.Stats.TotalNumberOfAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ConnectionMonitoring.Connection.{i}.Stats.TotalTriggeredActions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ConnectionMonitoring.Connection.{i}.Status",
@@ -2153,6 +2213,36 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Cthulhu.Container.Instances.{i}.Name",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Cthulhu.Container.Instances.{i}.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Cthulhu.Information.Version",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Cthulhu.Sandbox.Instances.{i}.Name",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Cthulhu.Sandbox.Instances.{i}.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.DeviceInfo.ActiveFirmwareImage",
     "writable": false,
@@ -2163,13 +2253,13 @@
     "path": "Device.DeviceInfo.AdditionalHardwareVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DeviceInfo.AdditionalSoftwareVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DeviceInfo.BootFirmwareImage",
@@ -2177,6 +2267,18 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DeviceInfo.BootStage",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.DeviceInfo.CountryCode",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.DeviceInfo.Description",
     "writable": false,
@@ -2187,7 +2289,7 @@
     "path": "Device.DeviceInfo.DeviceCategory",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DeviceInfo.DeviceImageFile.{i}.Alias",
@@ -2199,7 +2301,7 @@
     "path": "Device.DeviceInfo.DeviceImageFile.{i}.Image",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.DeviceInfo.DeviceImageFile.{i}.Location",
@@ -2223,7 +2325,7 @@
     "path": "Device.DeviceInfo.FirmwareImage.{i}.Available",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DeviceInfo.FirmwareImage.{i}.BootFailureLog",
@@ -2231,6 +2333,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DeviceInfo.FirmwareImage.{i}.LastUpdate",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:dateTime"
+  },
   {
     "path": "Device.DeviceInfo.FirmwareImage.{i}.Name",
     "writable": false,
@@ -2259,7 +2367,7 @@
     "path": "Device.DeviceInfo.FirstUseDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.HardwareVersion",
@@ -2273,6 +2381,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DeviceInfo.KernelFaults.CurrentBootCount",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.DeviceInfo.KernelFaults.KernelFault.{i}.Alias",
     "writable": true,
@@ -2313,7 +2427,7 @@
     "path": "Device.DeviceInfo.KernelFaults.KernelFault.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.KernelFaults.KernelFaultNumberOfEntries",
@@ -2331,13 +2445,13 @@
     "path": "Device.DeviceInfo.KernelFaults.MaxKernelFaultEntries",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.KernelFaults.MinFreeSpace",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.KernelFaults.PreviousBootCount",
@@ -2349,19 +2463,61 @@
     "path": "Device.DeviceInfo.KernelFaults.RotateKernelFaultEntries",
     "writable": true,
     "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.DeviceInfo.KernelFaults.Stats.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DeviceInfo.KernelFaults.Stats.{i}.CurrentBootCount",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DeviceInfo.KernelFaults.Stats.{i}.LastUpgradeCount",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DeviceInfo.KernelFaults.Stats.{i}.PreviousBootCount",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DeviceInfo.KernelFaults.Stats.{i}.Type",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.DeviceInfo.KernelFaults.StatsNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.DeviceInfo.KernelFaults.StoragePath",
     "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DeviceInfo.LastFirmwareUpdate",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:dateTime"
+  },
   {
     "path": "Device.DeviceInfo.Location.{i}.AcquiredTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.Location.{i}.DataObject",
@@ -2421,7 +2577,7 @@
     "path": "Device.DeviceInfo.LogRotate.{i}.LogFile.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.LogRotate.{i}.LogFile.{i}.Name",
@@ -2457,19 +2613,19 @@
     "path": "Device.DeviceInfo.LogRotate.{i}.NumberOfFiles",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.LogRotate.{i}.Retention",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.LogRotate.{i}.RollOver",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.LogRotateNumberOfEntries",
@@ -2489,41 +2645,47 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DeviceInfo.MemoryStatus.Available",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.DeviceInfo.MemoryStatus.Free",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.FreePersistent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.CriticalFallThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.CriticalFallTimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.CriticalRiseThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.CriticalRiseTimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.Enable",
@@ -2535,7 +2697,7 @@
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.EnableCriticalLog",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.FilePath",
@@ -2547,7 +2709,7 @@
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.MemUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.MemoryMonitor.PollingInterval",
@@ -2565,13 +2727,13 @@
     "path": "Device.DeviceInfo.MemoryStatus.Total",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.MemoryStatus.TotalPersistent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ModelName",
@@ -2595,7 +2757,7 @@
     "path": "Device.DeviceInfo.NetworkProperties.TCPImplementation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DeviceInfo.PowerStatus.PowerSensor.{i}.Alias",
@@ -2607,7 +2769,7 @@
     "path": "Device.DeviceInfo.PowerStatus.PowerSensor.{i}.Current",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DeviceInfo.PowerStatus.PowerSensor.{i}.Enable",
@@ -2619,7 +2781,7 @@
     "path": "Device.DeviceInfo.PowerStatus.PowerSensor.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.PowerStatus.PowerSensor.{i}.Name",
@@ -2631,7 +2793,7 @@
     "path": "Device.DeviceInfo.PowerStatus.PowerSensor.{i}.Power",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DeviceInfo.PowerStatus.PowerSensor.{i}.Status",
@@ -2643,7 +2805,7 @@
     "path": "Device.DeviceInfo.PowerStatus.PowerSensor.{i}.Voltage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DeviceInfo.PowerStatus.PowerSensorNumberOfEntries",
@@ -2651,6 +2813,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.DeviceInfo.ProcessFaults.CurrentBootCount",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.DeviceInfo.ProcessFaults.LastUpgradeCount",
     "writable": false,
@@ -2661,13 +2829,13 @@
     "path": "Device.DeviceInfo.ProcessFaults.MaxProcessFaultEntries",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessFaults.MinFreeSpace",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessFaults.PreviousBootCount",
@@ -2721,7 +2889,7 @@
     "path": "Device.DeviceInfo.ProcessFaults.ProcessFault.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.ProcessFaults.ProcessFaultNumberOfEntries",
@@ -2733,8 +2901,44 @@
     "path": "Device.DeviceInfo.ProcessFaults.RotateProcessFaultEntries",
     "writable": true,
     "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.DeviceInfo.ProcessFaults.Stats.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DeviceInfo.ProcessFaults.Stats.{i}.CurrentBootCount",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DeviceInfo.ProcessFaults.Stats.{i}.LastUpgradeCount",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DeviceInfo.ProcessFaults.Stats.{i}.PreviousBootCount",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DeviceInfo.ProcessFaults.Stats.{i}.Type",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.DeviceInfo.ProcessFaults.StatsNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.DeviceInfo.ProcessFaults.StoragePath",
     "writable": false,
@@ -2769,31 +2973,31 @@
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.CPUUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.CriticalFallThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.CriticalFallTimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.CriticalRiseThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.CriticalRiseTimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.Enable",
@@ -2805,7 +3009,7 @@
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.EnableCriticalLog",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.FilePath",
@@ -2817,7 +3021,13 @@
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.IdleModeUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.InterruptRate",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.Name",
@@ -2829,7 +3039,7 @@
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.NumSamples",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.PollInterval",
@@ -2841,7 +3051,7 @@
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.SystemModeUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.UpTime",
@@ -2853,7 +3063,7 @@
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.UserModeUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.CPU.{i}.VendorLogFileRef",
@@ -2871,7 +3081,7 @@
     "path": "Device.DeviceInfo.ProcessStatus.CPUUsage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.Process.{i}.Command",
@@ -2889,7 +3099,7 @@
     "path": "Device.DeviceInfo.ProcessStatus.Process.{i}.PID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DeviceInfo.ProcessStatus.Process.{i}.Priority",
@@ -2973,7 +3183,7 @@
     "path": "Device.DeviceInfo.SupportedDataModel.{i}.Features",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DeviceInfo.SupportedDataModel.{i}.URL",
@@ -3015,55 +3225,55 @@
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.HighAlarmTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.HighAlarmValue",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.LowAlarmTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.LowAlarmValue",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.MaxTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.MaxValue",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.MinTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.MinValue",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.Name",
@@ -3087,7 +3297,7 @@
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.ResetTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.Status",
@@ -3099,7 +3309,7 @@
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensor.{i}.Value",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DeviceInfo.TemperatureStatus.TemperatureSensorNumberOfEntries",
@@ -3123,7 +3333,7 @@
     "path": "Device.DeviceInfo.VendorConfigFile.{i}.Date",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DeviceInfo.VendorConfigFile.{i}.Description",
@@ -3141,7 +3351,7 @@
     "path": "Device.DeviceInfo.VendorConfigFile.{i}.UseForBackupRestore",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DeviceInfo.VendorConfigFile.{i}.Version",
@@ -3177,7 +3387,7 @@
     "path": "Device.DeviceInfo.VendorLogFile.{i}.Persistent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DeviceInfo.VendorLogFileNumberOfEntries",
@@ -3185,6 +3395,36 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.Devices.Config.AutoDiscovery",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Devices.Device.{i}.IPAddress",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Devices.Device.{i}.Name",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Devices.Device.{i}.Role",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Devices.Device.{i}.Type",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.DHCPv4.Client.{i}.Alias",
     "writable": true,
@@ -3213,13 +3453,13 @@
     "path": "Device.DHCPv4.Client.{i}.DNSServers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.DSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Enable",
@@ -3243,13 +3483,13 @@
     "path": "Device.DHCPv4.Client.{i}.IPRouters",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.LeaseTimeRemaining",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.PassthroughDHCPPool",
@@ -3267,7 +3507,7 @@
     "path": "Device.DHCPv4.Client.{i}.Renew",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.ReqOption.{i}.Alias",
@@ -3291,13 +3531,13 @@
     "path": "Device.DHCPv4.Client.{i}.ReqOption.{i}.Tag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.ReqOption.{i}.Value",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.ReqOptionNumberOfEntries",
@@ -3345,7 +3585,7 @@
     "path": "Device.DHCPv4.Client.{i}.Retransmission.TimeoutRandomize",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.SentOption.{i}.Alias",
@@ -3363,13 +3603,13 @@
     "path": "Device.DHCPv4.Client.{i}.SentOption.{i}.Tag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.SentOption.{i}.Value",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.SentOptionNumberOfEntries",
@@ -3381,61 +3621,61 @@
     "path": "Device.DHCPv4.Client.{i}.Stats.ACK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.Decline",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.DiscardedPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.Discover",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.ForceRenew",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.Inform",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.NACK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.Offer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.Release",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.Request",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Stats.Reset",
@@ -3447,7 +3687,7 @@
     "path": "Device.DHCPv4.Client.{i}.Stats.TransmitFailure",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Client.{i}.Status",
@@ -3489,7 +3729,7 @@
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.ChaddrExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.ChaddrMask",
@@ -3501,13 +3741,13 @@
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.ClientID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.ClientIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.DHCPServerIPAddress",
@@ -3531,7 +3771,7 @@
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.LocallyServed",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.Order",
@@ -3549,13 +3789,13 @@
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.UserClassID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.UserClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.VendorClassID",
@@ -3567,7 +3807,7 @@
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.VendorClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Relay.Forwarding.{i}.VendorClassIDMode",
@@ -3615,7 +3855,7 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.ChaddrExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.ChaddrMask",
@@ -3651,7 +3891,7 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.Client.{i}.IPv4Address.{i}.LeaseTimeRemaining",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.Client.{i}.IPv4AddressNumberOfEntries",
@@ -3663,13 +3903,13 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.Client.{i}.Option.{i}.Tag",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.Client.{i}.Option.{i}.Value",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.Client.{i}.OptionNumberOfEntries",
@@ -3681,13 +3921,13 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.ClientID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.ClientIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.ClientNumberOfEntries",
@@ -3699,7 +3939,7 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.DNSServers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.DomainName",
@@ -3711,7 +3951,7 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.DSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.Enable",
@@ -3729,13 +3969,13 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.IPRouters",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.LeaseTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.MaxAddress",
@@ -3761,17 +4001,23 @@
     "deviceClass": "tr181",
     "type": "xsd:boolean"
   },
+  {
+    "path": "Device.DHCPv4.Server.Pool.{i}.Option.{i}.Force",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.Option.{i}.Tag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.Option.{i}.Value",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.OptionNumberOfEntries",
@@ -3789,7 +4035,7 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.ReservedAddresses",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.StaticAddress.{i}.Alias",
@@ -3809,6 +4055,12 @@
     "deviceClass": "tr181",
     "type": "xsd:boolean"
   },
+  {
+    "path": "Device.DHCPv4.Server.Pool.{i}.StaticAddress.{i}.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.StaticAddress.{i}.Yiaddr",
     "writable": true,
@@ -3837,13 +4089,13 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.UserClassID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.UserClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.VendorClassID",
@@ -3855,7 +4107,7 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.VendorClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv4.Server.Pool.{i}.VendorClassIDMode",
@@ -3867,7 +4119,7 @@
     "path": "Device.DHCPv4.Server.Pool.{i}.WINSServers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv4.Server.PoolNumberOfEntries",
@@ -3879,67 +4131,67 @@
     "path": "Device.DHCPv4.Server.Stats.ACK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.Decline",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.DiscardedPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.Discover",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.ForceRenew",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.Inform",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.NACK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.Offer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.RelayOptionDropped",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.Release",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.Request",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.Reset",
@@ -3951,13 +4203,13 @@
     "path": "Device.DHCPv4.Server.Stats.SecondServerDetected",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv4.Server.Stats.TransmitFailure",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Alias",
@@ -3975,13 +4227,13 @@
     "path": "Device.DHCPv6.Client.{i}.DSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.DUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Enable",
@@ -3989,6 +4241,12 @@
     "deviceClass": "tr181",
     "type": "xsd:boolean"
   },
+  {
+    "path": "Device.DHCPv6.Client.{i}.ForceSolicitPolicy",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.DHCPv6.Client.{i}.Interface",
     "writable": true,
@@ -3999,7 +4257,7 @@
     "path": "Device.DHCPv6.Client.{i}.RapidCommit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.ReceivedOption.{i}.Server",
@@ -4011,13 +4269,13 @@
     "path": "Device.DHCPv6.Client.{i}.ReceivedOption.{i}.Tag",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.ReceivedOption.{i}.Value",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.ReceivedOptionNumberOfEntries",
@@ -4029,25 +4287,25 @@
     "path": "Device.DHCPv6.Client.{i}.Renew",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.RequestAddresses",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.RequestedOptions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.RequestPrefixes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.ConfirmInitialTimeout",
@@ -4059,7 +4317,7 @@
     "path": "Device.DHCPv6.Client.{i}.Retransmission.ConfirmMaxDelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.ConfirmMaxDuration",
@@ -4083,13 +4341,13 @@
     "path": "Device.DHCPv6.Client.{i}.Retransmission.DeclineMaxAttempts",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.HopCountLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.InformationRefreshTime",
@@ -4107,7 +4365,7 @@
     "path": "Device.DHCPv6.Client.{i}.Retransmission.InformationRequestMaxDelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.InformationRequestMaxTimeout",
@@ -4149,7 +4407,7 @@
     "path": "Device.DHCPv6.Client.{i}.Retransmission.ReconfigureMaxAttempts",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.ReleaseInitialTimeout",
@@ -4161,7 +4419,7 @@
     "path": "Device.DHCPv6.Client.{i}.Retransmission.ReleaseMaxAttempts",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.RenewInitialTimeout",
@@ -4185,7 +4443,7 @@
     "path": "Device.DHCPv6.Client.{i}.Retransmission.RequestMaxRetry",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.RequestMaxTimeout",
@@ -4203,7 +4461,7 @@
     "path": "Device.DHCPv6.Client.{i}.Retransmission.SolicitMaxDelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Retransmission.SolicitMaxTimeout",
@@ -4215,7 +4473,7 @@
     "path": "Device.DHCPv6.Client.{i}.Retransmission.TimeoutRandomize",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.SentOption.{i}.Alias",
@@ -4233,13 +4491,13 @@
     "path": "Device.DHCPv6.Client.{i}.SentOption.{i}.Tag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.SentOption.{i}.Value",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.SentOptionNumberOfEntries",
@@ -4251,13 +4509,13 @@
     "path": "Device.DHCPv6.Client.{i}.Server.{i}.DUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Server.{i}.InformationRefreshTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Server.{i}.SourceAddress",
@@ -4275,67 +4533,67 @@
     "path": "Device.DHCPv6.Client.{i}.Stats.Advertise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Confirm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Decline",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.DiscardedPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.InformationRequest",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Rebind",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Reconfigure",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Release",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Renew",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Reply",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Request",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.Reset",
@@ -4347,13 +4605,13 @@
     "path": "Device.DHCPv6.Client.{i}.Stats.Solicit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Stats.TransmitFailure",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.Status",
@@ -4365,19 +4623,19 @@
     "path": "Device.DHCPv6.Client.{i}.SuggestedT1",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.SuggestedT2",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DHCPv6.Client.{i}.SupportedOptions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.DHCPv6.ClientNumberOfEntries",
@@ -4419,13 +4677,13 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.IPv6Address.{i}.PreferredLifetime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.IPv6Address.{i}.ValidLifetime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.IPv6AddressNumberOfEntries",
@@ -4437,7 +4695,7 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.IPv6Prefix.{i}.PreferredLifetime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.IPv6Prefix.{i}.Prefix",
@@ -4449,7 +4707,7 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.IPv6Prefix.{i}.ValidLifetime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.IPv6PrefixNumberOfEntries",
@@ -4461,13 +4719,13 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.Option.{i}.Tag",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.Option.{i}.Value",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Client.{i}.OptionNumberOfEntries",
@@ -4491,19 +4749,19 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.DSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.DUID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.DUIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Enable",
@@ -4521,13 +4779,13 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.IANAManualPrefixes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.IANAPrefixes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.IAPDAddLength",
@@ -4545,13 +4803,13 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.IAPDManualPrefixes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.IAPDPrefixes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Interface",
@@ -4571,6 +4829,12 @@
     "deviceClass": "tr181",
     "type": "xsd:boolean"
   },
+  {
+    "path": "Device.DHCPv6.Server.Pool.{i}.Option.{i}.Force",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Option.{i}.PassthroughClient",
     "writable": true,
@@ -4581,13 +4845,13 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.Option.{i}.Tag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.Option.{i}.Value",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.OptionNumberOfEntries",
@@ -4611,7 +4875,7 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.SourceAddressExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.SourceAddressMask",
@@ -4629,25 +4893,25 @@
     "path": "Device.DHCPv6.Server.Pool.{i}.UserClassID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.UserClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.VendorClassID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DHCPv6.Server.Pool.{i}.VendorClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DHCPv6.Server.PoolNumberOfEntries",
@@ -4659,79 +4923,79 @@
     "path": "Device.DHCPv6.Server.Stats.Advertise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Confirm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Decline",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.DiscardedPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.InformationRequest",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Rebind",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Reconfigure",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.RelayForward",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.RelayReply",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Release",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Renew",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Reply",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Request",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.Reset",
@@ -4743,61 +5007,61 @@
     "path": "Device.DHCPv6.Server.Stats.Solicit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DHCPv6.Server.Stats.TransmitFailure",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DLNA.Capabilities.AudioClassProfileID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DLNA.Capabilities.AVClassProfileID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DLNA.Capabilities.DeviceCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DLNA.Capabilities.HIDDeviceClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DLNA.Capabilities.HNDDeviceClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DLNA.Capabilities.ImageClassProfileID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DLNA.Capabilities.MediaCollectionProfileID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DLNA.Capabilities.PrinterClassProfileID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DNS.Client.Enable",
@@ -4881,7 +5145,7 @@
     "path": "Device.DNS.Diagnostics.NSLookupDiagnostics.NumberOfRepetitions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DNS.Diagnostics.NSLookupDiagnostics.Result.{i}.AnswerType",
@@ -4905,7 +5169,7 @@
     "path": "Device.DNS.Diagnostics.NSLookupDiagnostics.Result.{i}.IPAddresses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DNS.Diagnostics.NSLookupDiagnostics.Result.{i}.ResponseTime",
@@ -4941,7 +5205,7 @@
     "path": "Device.DNS.RebindProtection.DomainExceptions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DNS.RebindProtection.Enable",
@@ -4953,7 +5217,7 @@
     "path": "Device.DNS.RebindProtection.IPExceptions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DNS.Relay.Config.{i}.Alias",
@@ -4979,10 +5243,28 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.DNS.Relay.Config.{i}.FailbackMaxTimer",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DNS.Relay.Config.{i}.FailbackMinTimer",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.DNS.Relay.Config.{i}.Forwarders",
     "writable": true,
     "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.DNS.Relay.Config.{i}.ForwardingMode",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
@@ -4991,6 +5273,18 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DNS.Relay.Config.{i}.MaxRetries",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DNS.Relay.Config.{i}.ResponseTimeout",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.DNS.Relay.ConfigNumberOfEntries",
     "writable": false,
@@ -5045,6 +5339,216 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.DNS.Relay.Stats.AnswerRCodeNoData",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.AnswerRCodeNOERROR",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.AnswerRCodeNXDOMAIN",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.AnswerRCodeSERVFAIL",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.CacheHits",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.CacheMisses",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.OpcodeQUERY",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryClassIN",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryEDNSPresent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryFlagsAA",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryFlagsAD",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryFlagsCD",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryFlagsQR",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryFlagsRA",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryFlagsRD",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryFlagsTC",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryIPv6",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryTCP",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryTypeA",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryTypeAAAA",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryTypeANY",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryTypePTR",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryTypeSRV",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.QueryTypeTXT",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.RecursiveReplies",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.RequestListAvg",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.RequestListCurrentAll",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.RequestListCurrentUser",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.RequestListExceeded",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.RequestListMax",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.RequestListOverwritten",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.Reset",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.TotalQueries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.UnwantedQueries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.DNS.Relay.Stats.UnwantedReplies",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
   {
     "path": "Device.DNS.Relay.Status",
     "writable": false,
@@ -5127,7 +5631,7 @@
     "path": "Device.DNS.SD.AdvertisedInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DNS.SD.AdvertiseNumberOfEntries",
@@ -5157,7 +5661,7 @@
     "path": "Device.DNS.SD.Service.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DNS.SD.Service.{i}.InstanceName",
@@ -5169,7 +5673,7 @@
     "path": "Device.DNS.SD.Service.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DNS.SD.Service.{i}.Port",
@@ -5217,7 +5721,7 @@
     "path": "Device.DNS.SD.Service.{i}.TimeToLive",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DNS.SD.Service.{i}.TransportProtocol",
@@ -5229,7 +5733,7 @@
     "path": "Device.DNS.SD.Service.{i}.Weight",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DNS.SD.ServiceNumberOfEntries",
@@ -5247,8 +5751,44 @@
     "path": "Device.DNS.SupportedRecordTypes",
     "writable": false,
     "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.DNS.X_PRPLWARE-COM_ForwardZone.{i}.Domain",
+    "writable": true,
+    "deviceClass": "prplos",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DNS.X_PRPLWARE-COM_ForwardZone.{i}.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.DNS.X_PRPLWARE-COM_Host.{i}.IPAddress",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.DNS.X_PRPLWARE-COM_Host.{i}.Name",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.DNS.X_PRPLWARE-COM_RebindProtection.{i}.Domain",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.DNS.X_PRPLWARE-COM_RebindProtection.{i}.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.DNS.Zone.{i}.Alias",
     "writable": true,
@@ -5281,15 +5821,15 @@
   },
   {
     "path": "Device.DNS.Zone.{i}.Host.{i}.LastUpdate",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DNS.Zone.{i}.Host.{i}.Name",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DNS.Zone.{i}.Host.{i}.Origin",
@@ -5352,11 +5892,17 @@
     "type": "xsd:unsignedInt"
   },
   {
-    "path": "Device.DOCSIS.Downstream.{i}.DownstreamChannelList",
+    "path": "Device.DOCSIS.Downstream.{i}.Description",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DOCSIS.Downstream.{i}.DownstreamChannelList",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Enable",
     "writable": true,
@@ -5367,19 +5913,19 @@
     "path": "Device.DOCSIS.Downstream.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.MaxBitRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Name",
@@ -5391,73 +5937,73 @@
     "path": "Device.DOCSIS.Downstream.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.Reset",
@@ -5469,19 +6015,19 @@
     "path": "Device.DOCSIS.Downstream.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Downstream.{i}.Status",
@@ -5493,7 +6039,7 @@
     "path": "Device.DOCSIS.Downstream.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.Alias",
@@ -5511,13 +6057,13 @@
     "path": "Device.DOCSIS.DownstreamChannel.{i}.Frequency",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.ID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.Interleave",
@@ -5547,25 +6093,25 @@
     "path": "Device.DOCSIS.DownstreamChannel.{i}.SignalQuality.ExtCorrecteds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.SignalQuality.ExtUncorrectables",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.SignalQuality.ExtUnerroreds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.SignalQuality.Microreflections",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.SignalQuality.SignalNoise",
@@ -5577,7 +6123,7 @@
     "path": "Device.DOCSIS.DownstreamChannel.{i}.SignalQualityExt.FbeNormalizationCoefficient",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.SignalQualityExt.RxMER",
@@ -5589,13 +6135,13 @@
     "path": "Device.DOCSIS.DownstreamChannel.{i}.SignalQualityExt.RxMerSamples",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannel.{i}.Width",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.DownstreamChannelNumberOfEntries",
@@ -5619,7 +6165,7 @@
     "path": "Device.DOCSIS.Interface.{i}.Capabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.CMTSAddress",
@@ -5631,37 +6177,37 @@
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.InvalidMaps",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.InvalidRangingRsps",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.InvalidRegRsps",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.InvalidUcds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.LostSyncs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.Resets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.StatusCode",
@@ -5673,13 +6219,13 @@
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.T1Timeouts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.T2Timeouts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.ConnectivityStatus.Value",
@@ -5687,6 +6233,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DOCSIS.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.DOCSIS.Interface.{i}.DOCSISVersion",
     "writable": false,
@@ -5709,13 +6261,13 @@
     "path": "Device.DOCSIS.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.MACAddress",
@@ -5739,73 +6291,73 @@
     "path": "Device.DOCSIS.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.Reset",
@@ -5817,19 +6369,19 @@
     "path": "Device.DOCSIS.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Interface.{i}.Status",
@@ -5853,37 +6405,37 @@
     "path": "Device.DOCSIS.SpectrumAnalysis.EquivalentNoiseBandwidth",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.SpectrumAnalysis.FirstSegmentCenterFrequency",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.SpectrumAnalysis.InactivityTimeout",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.SpectrumAnalysis.LastSegmentCenterFrequency",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.SpectrumAnalysis.NumberOfAverages",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.SpectrumAnalysis.NumBinsPerSegment",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.SpectrumAnalysis.Result.{i}.AmplitudeData",
@@ -5895,7 +6447,7 @@
     "path": "Device.DOCSIS.SpectrumAnalysis.Result.{i}.Frequency",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.SpectrumAnalysis.Result.{i}.TotalSegmentPower",
@@ -5913,7 +6465,7 @@
     "path": "Device.DOCSIS.SpectrumAnalysis.SegmentFrequencySpan",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.SpectrumAnalysis.WindowFunction",
@@ -5933,6 +6485,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.DOCSIS.Upstream.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Enable",
     "writable": true,
@@ -5943,19 +6501,19 @@
     "path": "Device.DOCSIS.Upstream.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.MaxBitRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Name",
@@ -5967,73 +6525,73 @@
     "path": "Device.DOCSIS.Upstream.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.Reset",
@@ -6045,19 +6603,19 @@
     "path": "Device.DOCSIS.Upstream.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.Status",
@@ -6069,13 +6627,13 @@
     "path": "Device.DOCSIS.Upstream.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DOCSIS.Upstream.{i}.UpstreamChannelList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Alias",
@@ -6087,25 +6645,25 @@
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Frequency",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.ID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.RangingBackoffEnd",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.RangingBackoffStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.SlotSize",
@@ -6123,7 +6681,7 @@
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Status.IsMuted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Status.ModulationType",
@@ -6135,7 +6693,7 @@
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Status.RangingAborteds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Status.RangingStatus",
@@ -6147,19 +6705,19 @@
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Status.T3Exceededs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Status.T3Timeouts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Status.T4Timeouts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Status.TxPower",
@@ -6171,25 +6729,25 @@
     "path": "Device.DOCSIS.UpstreamChannel.{i}.TxBackoffEnd",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.TxBackoffStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.TxTimingOffset",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannel.{i}.Width",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DOCSIS.UpstreamChannelNumberOfEntries",
@@ -6225,49 +6783,49 @@
     "path": "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.Stats.AlignmentErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.Stats.CRCErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.Stats.FramesDropped",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.Stats.LongPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.Stats.OverflowErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.Stats.PauseFramesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.Stats.ShortPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.BondedChannel.{i}.Ethernet.Stats.UnderflowErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.BondedChannelNumberOfEntries",
@@ -6285,13 +6843,19 @@
     "path": "Device.DSL.BondingGroup.{i}.BondSchemesSupported",
     "writable": false,
     "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.DSL.BondingGroup.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.DownstreamDifferentialDelayTolerance",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Enable",
@@ -6303,37 +6867,37 @@
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.AlignmentErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.CRCErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.FramesDropped",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.LongPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.OverflowErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFBadFragments",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFErrors",
@@ -6345,85 +6909,85 @@
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFLargeFragments",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFLateFragments",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFLostEnds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFLostFragments",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFLostStarts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFOverflows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PAFSmallFragments",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.PauseFramesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Ethernet.Stats.ShortPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.GroupCapacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.GroupID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.GroupStatus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.LowerLayers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Name",
@@ -6441,37 +7005,37 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.DownstreamDifferentialDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.DownstreamPacketLoss",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.DownstreamRate",
@@ -6483,7 +7047,7 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.ErroredSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.FailureCount",
@@ -6495,31 +7059,31 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.FailureReasons",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.SeverelyErroredSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.UnavailableSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.UpstreamDifferentialDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.UpstreamPacketLoss",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDay.UpstreamRate",
@@ -6531,67 +7095,67 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.CurrentDayStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.DownstreamDifferentialDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.DownstreamPacketLoss",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.DownstreamRate",
@@ -6603,7 +7167,7 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.ErroredSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.FailureCount",
@@ -6615,31 +7179,31 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.FailureReasons",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.SeverelyErroredSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.UnavailableSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.UpstreamDifferentialDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.UpstreamPacketLoss",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHour.UpstreamRate",
@@ -6651,7 +7215,7 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.QuarterHourStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Reset",
@@ -6663,13 +7227,13 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.DownstreamDifferentialDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.DownstreamPacketLoss",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.DownstreamRate",
@@ -6681,7 +7245,7 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.ErroredSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.FailureCount",
@@ -6693,31 +7257,31 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.FailureReasons",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.SeverelyErroredSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.UnavailableSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.UpstreamDifferentialDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.UpstreamPacketLoss",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.Total.UpstreamRate",
@@ -6729,25 +7293,25 @@
     "path": "Device.DSL.BondingGroup.{i}.Stats.TotalStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroup.{i}.Status",
@@ -6783,7 +7347,7 @@
     "path": "Device.DSL.BondingGroup.{i}.UpstreamDifferentialDelayTolerance",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.BondingGroupNumberOfEntries",
@@ -6795,25 +7359,25 @@
     "path": "Device.DSL.Channel.{i}.ACTINP",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Channel.{i}.ACTINPREIN",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.ACTNDR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.ActualInterleavingDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Alias",
@@ -6821,6 +7385,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DSL.Channel.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.DSL.Channel.{i}.DownstreamCurrRate",
     "writable": false,
@@ -6837,31 +7407,31 @@
     "path": "Device.DSL.Channel.{i}.INPREPORT",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DSL.Channel.{i}.INTLVBLOCK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Channel.{i}.INTLVDEPTH",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.LinkEncapsulationSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Channel.{i}.LinkEncapsulationUsed",
@@ -6873,19 +7443,19 @@
     "path": "Device.DSL.Channel.{i}.LowerLayers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Channel.{i}.LPATH",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.LSYMB",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Channel.{i}.Name",
@@ -6897,25 +7467,25 @@
     "path": "Device.DSL.Channel.{i}.NFEC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Channel.{i}.RFEC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.CurrentDay.XTUCCRCErrors",
@@ -6957,31 +7527,31 @@
     "path": "Device.DSL.Channel.{i}.Stats.CurrentDayStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.LastShowtime.XTUCCRCErrors",
@@ -7023,19 +7593,19 @@
     "path": "Device.DSL.Channel.{i}.Stats.LastShowtimeStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.QuarterHour.XTUCCRCErrors",
@@ -7077,7 +7647,7 @@
     "path": "Device.DSL.Channel.{i}.Stats.QuarterHourStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.Reset",
@@ -7125,7 +7695,7 @@
     "path": "Device.DSL.Channel.{i}.Stats.ShowtimeStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Stats.Total.XTUCCRCErrors",
@@ -7167,7 +7737,7 @@
     "path": "Device.DSL.Channel.{i}.Stats.TotalStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Channel.{i}.Status",
@@ -7191,37 +7761,37 @@
     "path": "Device.DSL.Diagnostics.ADSLLineTest.ACTATPds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.ACTATPus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.ACTPSDds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.ACTPSDus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.BITSpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.BITSpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.DiagnosticsState",
@@ -7233,73 +7803,73 @@
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLINGds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLINGus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLINpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLINpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLINSCds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLINSCus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLOGGds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLOGGus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLOGMTds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLOGMTus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLOGpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.HLOGpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.Interface",
@@ -7311,133 +7881,133 @@
     "path": "Device.DSL.Diagnostics.ADSLLineTest.LATNpbds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.LATNpbus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.QLNGds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.QLNGus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.QLNMTds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.QLNMTus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.QLNpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.QLNpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.SATNds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.SATNus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.SNRGds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.SNRGus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.SNRMTds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.SNRMTus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.SNRpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.DSL.Diagnostics.ADSLLineTest.SNRpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.AttenuationCharacteristics",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.CapacityEstimate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.CapacityEstimateEnabling",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.CapacityNoisePSD",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.CapacitySignalPSD",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.CapacityTargetMargin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.DiagnosticsState",
@@ -7467,13 +8037,13 @@
     "path": "Device.DSL.Diagnostics.SELTP.LoopTopology",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.MissingFilter",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTP.TFlogGroupSize",
@@ -7491,7 +8061,7 @@
     "path": "Device.DSL.Diagnostics.SELTQLN.ExtendedBandwidthOperation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTQLN.Interface",
@@ -7503,7 +8073,7 @@
     "path": "Device.DSL.Diagnostics.SELTQLN.QLN",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTQLN.QLNGroupSize",
@@ -7527,7 +8097,7 @@
     "path": "Device.DSL.Diagnostics.SELTUER.ExtendedBandwidthOperation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTUER.Interface",
@@ -7539,7 +8109,7 @@
     "path": "Device.DSL.Diagnostics.SELTUER.UER",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTUER.UERGroupSize",
@@ -7557,55 +8127,55 @@
     "path": "Device.DSL.Diagnostics.SELTUER.UERScaleFactor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Diagnostics.SELTUER.UERVar",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.DSL.Line.{i}.ACTINPROCds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.ACTINPROCus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.ACTRAMODEds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.ACTRAMODEus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.ACTSNRMODEds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.ACTSNRMODEus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.ACTUALCE",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Alias",
@@ -7617,7 +8187,7 @@
     "path": "Device.DSL.Line.{i}.AllowedProfiles",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.CurrentProfile",
@@ -7629,7 +8199,7 @@
     "path": "Device.DSL.Line.{i}.DataGathering.ActLoggingDepthReportingR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.DataGathering.EventTraceBufferR",
@@ -7641,13 +8211,19 @@
     "path": "Device.DSL.Line.{i}.DataGathering.LoggingDepthR",
     "writable": false,
     "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.DSL.Line.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.DSL.Line.{i}.DownstreamAttenuation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.DownstreamMaxBitRate",
@@ -7659,13 +8235,13 @@
     "path": "Device.DSL.Line.{i}.DownstreamNoiseMargin",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.DownstreamPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.Enable",
@@ -7677,7 +8253,7 @@
     "path": "Device.DSL.Line.{i}.EnableDataGathering",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DSL.Line.{i}.FirmwareVersion",
@@ -7689,49 +8265,49 @@
     "path": "Device.DSL.Line.{i}.INMCCds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.INMIATOds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.INMIATSds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.INMINPEQMODEds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.LastStateTransmittedDownstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.LastStateTransmittedUpstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.LIMITMASK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.LineEncoding",
@@ -7743,7 +8319,7 @@
     "path": "Device.DSL.Line.{i}.LineNumber",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.LinkStatus",
@@ -7755,19 +8331,19 @@
     "path": "Device.DSL.Line.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.MREFPSDds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.DSL.Line.{i}.MREFPSDus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.DSL.Line.{i}.Name",
@@ -7785,37 +8361,37 @@
     "path": "Device.DSL.Line.{i}.RXTHRSHds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.SNRMpbds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.SNRMpbus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.SNRMROCds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.SNRMROCus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.StandardsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.StandardUsed",
@@ -7827,103 +8403,103 @@
     "path": "Device.DSL.Line.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.CurrentDay.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.CurrentDay.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.CurrentDayStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.LastShowtime.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.LastShowtime.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.LastShowtimeStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.QuarterHour.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.QuarterHour.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.QuarterHourStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.Reset",
@@ -7935,37 +8511,37 @@
     "path": "Device.DSL.Line.{i}.Stats.Showtime.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.Showtime.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.ShowtimeStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.Total.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.Total.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Stats.TotalStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.Status",
@@ -7977,187 +8553,187 @@
     "path": "Device.DSL.Line.{i}.SuccessFailureCause",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.HLOGGds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.HLOGGus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.HLOGMTds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.HLOGMTus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.HLOGpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.HLOGpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.LATNds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.LATNus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.QLNGds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.QLNGus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.QLNMTds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.QLNMTus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.QLNpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.QLNpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.SATNds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.SATNus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.SNRGds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.SNRGus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.SNRMTds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.SNRMTus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.SNRpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TestParams.SNRpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DSL.Line.{i}.TRELLISds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.TRELLISus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.UPBOKLE",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.UPBOKLEPb",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.DSL.Line.{i}.UPBOKLER",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.UPBOKLERPb",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.DSL.Line.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.DSL.Line.{i}.UpstreamAttenuation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.UpstreamMaxBitRate",
@@ -8169,61 +8745,61 @@
     "path": "Device.DSL.Line.{i}.UpstreamNoiseMargin",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.UpstreamPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.DSL.Line.{i}.US0MASK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.VirtualNoisePSDds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.DSL.Line.{i}.VirtualNoisePSDus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTSE",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTSUsed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCANSIRev",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCANSIStd",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCCountry",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCSerial",
@@ -8235,55 +8811,55 @@
     "path": "Device.DSL.Line.{i}.XTUCSystemCountry",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCSystemVendor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCSystemVendorSpecific",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCVendor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCVendorSpecific",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTUCVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURANSIRev",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURANSIStd",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURCountry",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURSerial",
@@ -8295,31 +8871,31 @@
     "path": "Device.DSL.Line.{i}.XTURSystemCountry",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURSystemVendor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURSystemVendorSpecific",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURVendor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURVendorSpecific",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.DSL.Line.{i}.XTURVersion",
@@ -8433,7 +9009,7 @@
     "path": "Device.DynamicDNS.Client.{i}.Hostname.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.DynamicDNS.Client.{i}.Hostname.{i}.Name",
@@ -8459,6 +9035,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.DynamicDNS.Client.{i}.IPVersion",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:int"
+  },
   {
     "path": "Device.DynamicDNS.Client.{i}.LastError",
     "writable": false,
@@ -8559,7 +9141,7 @@
     "path": "Device.DynamicDNS.Server.{i}.SupportedProtocols",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.DynamicDNS.ServerNumberOfEntries",
@@ -8571,19 +9153,19 @@
     "path": "Device.DynamicDNS.SupportedServices",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ethernet.FlowControlSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.AdvertisedLinkModes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Alias",
@@ -8609,6 +9191,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Ethernet.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Ethernet.Interface.{i}.DuplexMode",
     "writable": true,
@@ -8619,7 +9207,7 @@
     "path": "Device.Ethernet.Interface.{i}.EDPDCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.EDPDEnable",
@@ -8637,7 +9225,7 @@
     "path": "Device.Ethernet.Interface.{i}.EEECapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.EEEEnable",
@@ -8661,19 +9249,19 @@
     "path": "Device.Ethernet.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.LinkPartnerAdvertisedLinkModes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.MACAddress",
@@ -8685,7 +9273,7 @@
     "path": "Device.Ethernet.Interface.{i}.MaxBitRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.MDIX",
@@ -8703,7 +9291,7 @@
     "path": "Device.Ethernet.Interface.{i}.PowerCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.PowerStatus",
@@ -8715,85 +9303,85 @@
     "path": "Device.Ethernet.Interface.{i}.SFPReferenceList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.Collisions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.Reset",
@@ -8805,19 +9393,19 @@
     "path": "Device.Ethernet.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Status",
@@ -8829,13 +9417,13 @@
     "path": "Device.Ethernet.Interface.{i}.SupportedLinkModes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Ethernet.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.InterfaceNumberOfEntries",
@@ -8849,6 +9437,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Ethernet.LAG.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Ethernet.LAG.{i}.Enable",
     "writable": true,
@@ -8857,15 +9451,15 @@
   },
   {
     "path": "Device.Ethernet.LAG.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.MACAddress",
@@ -8875,7 +9469,7 @@
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -8883,73 +9477,73 @@
     "path": "Device.Ethernet.LAG.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.Reset",
@@ -8961,23 +9555,23 @@
     "path": "Device.Ethernet.LAG.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.LAG.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -8993,6 +9587,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Ethernet.Link.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Ethernet.Link.{i}.Enable",
     "writable": true,
@@ -9003,19 +9603,19 @@
     "path": "Device.Ethernet.Link.{i}.FlowControl",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.Link.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Link.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ethernet.Link.{i}.MACAddress",
@@ -9031,7 +9631,7 @@
   },
   {
     "path": "Device.Ethernet.Link.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -9039,97 +9639,97 @@
     "path": "Device.Ethernet.Link.{i}.NoARP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.Link.{i}.PriorityTagging",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.PausePacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.PausePacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.Reset",
@@ -9141,23 +9741,23 @@
     "path": "Device.Ethernet.Link.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.Link.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -9177,19 +9777,19 @@
     "path": "Device.Ethernet.RMONStats.{i}.AllQueues",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.BroadcastPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Bytes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.CRCErroredPackets",
@@ -9201,7 +9801,7 @@
     "path": "Device.Ethernet.RMONStats.{i}.DropEvents",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Enable",
@@ -9219,7 +9819,7 @@
     "path": "Device.Ethernet.RMONStats.{i}.MulticastPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Name",
@@ -9237,43 +9837,43 @@
     "path": "Device.Ethernet.RMONStats.{i}.Packets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Packets1024to1518Bytes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Packets128to255Bytes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Packets256to511Bytes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Packets512to1023Bytes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Packets64Bytes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Packets65to127Bytes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.RMONStats.{i}.Queue",
@@ -9311,6 +9911,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Ethernet.VLANTermination.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Enable",
     "writable": true,
@@ -9319,19 +9925,19 @@
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -9339,73 +9945,73 @@
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.Reset",
@@ -9417,23 +10023,23 @@
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -9441,7 +10047,7 @@
     "path": "Device.Ethernet.VLANTermination.{i}.TPID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ethernet.VLANTermination.{i}.VLANID",
@@ -9453,7 +10059,7 @@
     "path": "Device.Ethernet.VLANTermination.{i}.VLANPriority",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Ethernet.VLANTerminationNumberOfEntries",
@@ -9477,13 +10083,13 @@
     "path": "Device.Ethernet.WoL.SendMagicPacket",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ethernet.WoLSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.Alias",
@@ -9495,7 +10101,7 @@
     "path": "Device.ETSIM2M.SCL.{i}.AnnouncedToSCLList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.AreaNwkDeviceInfoInstance.{i}.Active",
@@ -9513,19 +10119,19 @@
     "path": "Device.ETSIM2M.SCL.{i}.AreaNwkDeviceInfoInstance.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.AreaNwkDeviceInfoInstance.{i}.ListOfDeviceApplications",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.AreaNwkDeviceInfoInstance.{i}.ListOfDeviceNeighbors",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.AreaNwkDeviceInfoInstance.{i}.Property.{i}.Name",
@@ -9585,7 +10191,7 @@
     "path": "Device.ETSIM2M.SCL.{i}.AreaNwkInstance.{i}.ListOfDevices",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.AreaNwkInstance.{i}.Property.{i}.Name",
@@ -9615,13 +10221,13 @@
     "path": "Device.ETSIM2M.SCL.{i}.Discovery.MaxNumberOfDiscovRecords",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.Discovery.MaxSizeOfDiscovAnswer",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.Enable",
@@ -9639,7 +10245,7 @@
     "path": "Device.ETSIM2M.SCL.{i}.Reregistration.ActionStatus.Progress",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.Reregistration.RegAccessRightID",
@@ -9651,25 +10257,25 @@
     "path": "Device.ETSIM2M.SCL.{i}.Reregistration.RegExpirationDuration",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.Reregistration.RegSearchStrings",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.Reregistration.RegTargetNSCLList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.Reregistration.Reregistration",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.Alias",
@@ -9699,7 +10305,7 @@
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.BlockPeriod.{i}.BlockDuration",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.BlockPeriod.{i}.Enable",
@@ -9711,7 +10317,7 @@
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.BlockPeriod.{i}.FailedAttempts",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.BlockPeriodNumberOfEntries",
@@ -9759,13 +10365,13 @@
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.RequestCategory.{i}.Schedule.{i}.AbsTimeSpan.{i}.EndTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.RequestCategory.{i}.Schedule.{i}.AbsTimeSpan.{i}.StartTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.RequestCategory.{i}.Schedule.{i}.AbsTimeSpanNumberOfEntries",
@@ -9789,7 +10395,7 @@
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.RequestCategory.{i}.Schedule.{i}.Schedules",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.ANPPolicy.{i}.RequestCategory.{i}.ScheduleNumberOfEntries",
@@ -9843,7 +10449,7 @@
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.M2MSPPolicy.RequestCategory.{i}.RankedANList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.M2MSPPolicy.RequestCategory.{i}.RCAT",
@@ -9855,13 +10461,13 @@
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.M2MSPPolicy.RequestCategory.{i}.Thresh",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.M2MSPPolicy.RequestCategory.{i}.TolerableDelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.M2MSPPolicy.RequestCategoryNumberOfEntries",
@@ -9873,7 +10479,7 @@
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySet.{i}.PolicyScope",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ETSIM2M.SCL.{i}.SAFPolicySetNumberOfEntries",
@@ -9891,79 +10497,79 @@
     "path": "Device.FAP.ApplicationPlatform.Capabilities.AccessLevelsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.AuthenticationMethodsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.FemtoAwarenessAPISupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.MMSAPISupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.PresenceApplicationSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.QueryMMSDeliveryStatusSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.QuerySMSDeliveryStatusSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.SendMMSTargetAddressType",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.SendSMSTargetAddressType",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.SMSAPISupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.SubscribeToNotificationsOfMMSSentToApplicationSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.SubscribeToNotificationsOfSMSSentToApplicationSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Capabilities.TerminalLocationAPISupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.AuthenticationMethod",
@@ -9987,19 +10593,19 @@
     "path": "Device.FAP.ApplicationPlatform.Control.FemtoAwareness.MaxAPIUsersNumber",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.FemtoAwareness.NotificationsUserIdentifierMSISDN",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.FemtoAwareness.QueryFemtocellResponseTimezone",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.FemtoAwareness.QueueEnable",
@@ -10017,7 +10623,7 @@
     "path": "Device.FAP.ApplicationPlatform.Control.FemtoAwareness.SubscribeToNotificationsResponseCallbackData",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.MMS.APIEnable",
@@ -10029,19 +10635,19 @@
     "path": "Device.FAP.ApplicationPlatform.Control.MMS.EnableQueryMMSDeliveryStatus",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.MMS.EnableSubscribeToNotificationsOfMessageSentToApplication",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.MMS.MaxAPIUsersNumber",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.MMS.MinSendMMSTimeInterval",
@@ -10071,19 +10677,19 @@
     "path": "Device.FAP.ApplicationPlatform.Control.SMS.EnableQuerySMSDeliveryStatus",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.SMS.EnableSubscribeToNotificationsOfMessageSentToApplication",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.SMS.MaxAPIUsersNumber",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.SMS.MinSendSMSTimeInterval",
@@ -10113,7 +10719,7 @@
     "path": "Device.FAP.ApplicationPlatform.Control.TerminalLocation.MaxAPIUsersNumber",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.TerminalLocation.QueryMobileLocationResponseAddress",
@@ -10125,19 +10731,19 @@
     "path": "Device.FAP.ApplicationPlatform.Control.TerminalLocation.QueryMobileLocationResponseAltitude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.TerminalLocation.QueryMobileLocationResponseLongitudeLatitude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.TerminalLocation.QueryMobileLocationResponseTimestamp",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Control.TerminalLocation.QueueEnable",
@@ -10161,7 +10767,7 @@
     "path": "Device.FAP.ApplicationPlatform.CurrentNumberofApplications",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Enable",
@@ -10173,19 +10779,19 @@
     "path": "Device.FAP.ApplicationPlatform.MaxNumberOfApplications",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.AuthenticationRequestsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.AuthenticationRequestsRejected",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.Enable",
@@ -10197,31 +10803,31 @@
     "path": "Device.FAP.ApplicationPlatform.Monitoring.FemtoAwareness.APIAvailable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.FemtoAwareness.APIUsers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.FemtoAwareness.QueueDiscarded",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.FemtoAwareness.QueueNum",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.FemtoAwareness.QueueReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.FemtoAwareness.QueueState",
@@ -10233,31 +10839,31 @@
     "path": "Device.FAP.ApplicationPlatform.Monitoring.MMS.APIAvailable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.MMS.APIUsers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.MMS.QueueDiscarded",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.MMS.QueueNum",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.MMS.QueueReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.MMS.QueueState",
@@ -10275,31 +10881,31 @@
     "path": "Device.FAP.ApplicationPlatform.Monitoring.SMS.APIAvailable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.SMS.APIUsers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.SMS.QueueDiscarded",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.SMS.QueueNum",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.SMS.QueueReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.SMS.QueueState",
@@ -10311,31 +10917,31 @@
     "path": "Device.FAP.ApplicationPlatform.Monitoring.TerminalLocation.APIAvailable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.TerminalLocation.APIUsers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.TerminalLocation.QueueDiscarded",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.TerminalLocation.QueueNum",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.TerminalLocation.QueueReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.ApplicationPlatform.Monitoring.TerminalLocation.QueueState",
@@ -10371,19 +10977,19 @@
     "path": "Device.FAP.GPS.AGPSServerConfig.ReferenceLatitude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAP.GPS.AGPSServerConfig.ReferenceLongitude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAP.GPS.AGPSServerConfig.ServerInUse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.GPS.AGPSServerConfig.ServerPort",
@@ -10407,31 +11013,31 @@
     "path": "Device.FAP.GPS.ContinuousGPS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.CurrentFix",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.Elevation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.FirstFixTimeout",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.GotFix",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.LastFixDuration",
@@ -10443,13 +11049,13 @@
     "path": "Device.FAP.GPS.ContinuousGPSStatus.LastFixTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.Latitude",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.LocationType",
@@ -10467,7 +11073,7 @@
     "path": "Device.FAP.GPS.ContinuousGPSStatus.Longitude",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.ReceiverStatus",
@@ -10479,7 +11085,7 @@
     "path": "Device.FAP.GPS.ContinuousGPSStatus.SatellitesTracked",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.GPS.ContinuousGPSStatus.SatelliteTrackingInterval",
@@ -10491,7 +11097,7 @@
     "path": "Device.FAP.GPS.ContinuousGPSStatus.TimingGood",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.GPS.ErrorDetails",
@@ -10503,37 +11109,37 @@
     "path": "Device.FAP.GPS.GPSReset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.GPS.LastScanTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FAP.GPS.LastSuccessfulScanTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FAP.GPS.LockedLatitude",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAP.GPS.LockedLongitude",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAP.GPS.NumberOfSatellites",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAP.GPS.PeriodicInterval",
@@ -10545,19 +11151,19 @@
     "path": "Device.FAP.GPS.PeriodicTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FAP.GPS.ScanOnBoot",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.GPS.ScanPeriodically",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAP.GPS.ScanStatus",
@@ -10599,7 +11205,7 @@
     "path": "Device.FAP.PerfMgmt.Config.{i}.PeriodicUploadTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FAP.PerfMgmt.Config.{i}.URL",
@@ -10629,31 +11235,31 @@
     "path": "Device.FAST.Line.{i}.AllowedProfiles",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.FAST.Line.{i}.ATTETRds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.ATTETRus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.BITSRMCpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.FAST.Line.{i}.BITSRMCpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.FAST.Line.{i}.CurrentProfile",
@@ -10661,11 +11267,17 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.FAST.Line.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.FAST.Line.{i}.DownstreamAttenuation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.DownstreamMaxBitRate",
@@ -10677,13 +11289,13 @@
     "path": "Device.FAST.Line.{i}.DownstreamNoiseMargin",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.DownstreamPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.Enable",
@@ -10695,25 +11307,25 @@
     "path": "Device.FAST.Line.{i}.ETRds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.ETRus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.FEXTCANCELds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAST.Line.{i}.FEXTCANCELus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAST.Line.{i}.FirmwareVersion",
@@ -10725,25 +11337,25 @@
     "path": "Device.FAST.Line.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.LastTransmittedDownstreamSignal",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.LastTransmittedUpstreamSignal",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.LineNumber",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.LinkStatus",
@@ -10755,13 +11367,13 @@
     "path": "Device.FAST.Line.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.FAST.Line.{i}.MINEFTR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Name",
@@ -10779,295 +11391,295 @@
     "path": "Device.FAST.Line.{i}.SNRMRMCds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.SNRMRMCus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.LORS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.LOSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.RTXTX",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.RTXUC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.SuccessBSW",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.SuccessFRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.SuccessRPA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.SuccessSRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.SuccessTIGA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDay.UAS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.CurrentDayStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.LORS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.LOSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.RTXTX",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.RTXUC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.SuccessBSW",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.SuccessFRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.SuccessRPA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.SuccessSRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.SuccessTIGA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtime.UAS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.LastShowtimeStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.LORS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.LOSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.RTXTX",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.RTXUC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.SuccessBSW",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.SuccessFRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.SuccessRPA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.SuccessSRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.SuccessTIGA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHour.UAS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.QuarterHourStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Reset",
@@ -11079,157 +11691,157 @@
     "path": "Device.FAST.Line.{i}.Stats.Showtime.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.LORS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.LOSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.RTXTX",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.RTXUC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.SuccessBSW",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.SuccessFRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.SuccessRPA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.SuccessSRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.SuccessTIGA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Showtime.UAS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.ShowtimeStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.ErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.LORS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.LOSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.RTXTX",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.RTXUC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.SeverelyErroredSecs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.SuccessBSW",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.SuccessFRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.SuccessRPA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.SuccessSRA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.SuccessTIGA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.Total.UAS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Stats.TotalStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Status",
@@ -11241,19 +11853,19 @@
     "path": "Device.FAST.Line.{i}.SuccessFailureCause",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.ACTINP",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.ACTINPREIN",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.DownstreamCurrRate",
@@ -11265,49 +11877,49 @@
     "path": "Device.FAST.Line.{i}.TestParams.NFEC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.RFEC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.SNRGds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.SNRGus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.SNRMTds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.SNRMTus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.SNRpsds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.SNRpsus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.FAST.Line.{i}.TestParams.UpstreamCurrRate",
@@ -11319,25 +11931,25 @@
     "path": "Device.FAST.Line.{i}.UPBOKLE",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.UPBOKLER",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FAST.Line.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.FAST.Line.{i}.UpstreamAttenuation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.UpstreamMaxBitRate",
@@ -11349,13 +11961,13 @@
     "path": "Device.FAST.Line.{i}.UpstreamNoiseMargin",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.Line.{i}.UpstreamPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.FAST.LineNumberOfEntries",
@@ -11379,7 +11991,7 @@
     "path": "Device.FaultMgmt.CurrentAlarm.{i}.AlarmChangedTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FaultMgmt.CurrentAlarm.{i}.AlarmIdentifier",
@@ -11391,7 +12003,7 @@
     "path": "Device.FaultMgmt.CurrentAlarm.{i}.AlarmRaisedTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FaultMgmt.CurrentAlarm.{i}.EventType",
@@ -11451,7 +12063,7 @@
     "path": "Device.FaultMgmt.ExpeditedEvent.{i}.EventTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FaultMgmt.ExpeditedEvent.{i}.EventType",
@@ -11517,7 +12129,7 @@
     "path": "Device.FaultMgmt.HistoryEvent.{i}.EventTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FaultMgmt.HistoryEvent.{i}.EventType",
@@ -11565,7 +12177,7 @@
     "path": "Device.FaultMgmt.MaxCurrentAlarmEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FaultMgmt.QueuedEvent.{i}.AdditionalInformation",
@@ -11589,7 +12201,7 @@
     "path": "Device.FaultMgmt.QueuedEvent.{i}.EventTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.FaultMgmt.QueuedEvent.{i}.EventType",
@@ -11709,19 +12321,19 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.BurstLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.ConnectionState",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.CreationDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.Description",
@@ -11733,7 +12345,7 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestAllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestInterface",
@@ -11745,7 +12357,7 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestInterfaceExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestIP",
@@ -11757,7 +12369,7 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestIPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestMask",
@@ -11781,31 +12393,31 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestPortExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DestPortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DSCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.DSCPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.Enable",
@@ -11817,31 +12429,31 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.ExpiryDate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.FloodLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.Log",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.LogRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.Order",
@@ -11853,19 +12465,19 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.Protocol",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.ProtocolExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourceAllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourceInterface",
@@ -11877,7 +12489,7 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourceInterfaceExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourceIP",
@@ -11889,7 +12501,7 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourceIPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourceMAC",
@@ -11901,7 +12513,7 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourceMACExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourceMask",
@@ -11925,19 +12537,19 @@
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourcePort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourcePortExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.SourcePortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Chain.{i}.Rule.{i}.Status",
@@ -11985,19 +12597,19 @@
     "path": "Device.Firewall.ConnectionTracking.FTP.Loose",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.FTP.Ports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.H323.CallForwardFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.H323.Enable",
@@ -12009,7 +12621,7 @@
     "path": "Device.Firewall.ConnectionTracking.H323.GKRoutedOnly",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.H323.RegistrationRequestTTL",
@@ -12033,13 +12645,13 @@
     "path": "Device.Firewall.ConnectionTracking.IRC.MAXDCCChannels",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.IRC.Ports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.PPTP.Enable",
@@ -12051,13 +12663,13 @@
     "path": "Device.Firewall.ConnectionTracking.SIP.DirectMedia",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.SIP.DirectSignaling",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.SIP.Enable",
@@ -12069,19 +12681,19 @@
     "path": "Device.Firewall.ConnectionTracking.SIP.ExternalMedia",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.SIP.Ports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.SIP.TimeOut",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Firewall.ConnectionTracking.TFTP.Enable",
@@ -12093,7 +12705,7 @@
     "path": "Device.Firewall.ConnectionTracking.TFTP.Ports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.Firewall.DMZ.{i}.Alias",
@@ -12135,13 +12747,13 @@
     "path": "Device.Firewall.DMZ.{i}.Log",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.DMZ.{i}.LogRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.DMZ.{i}.Origin",
@@ -12201,31 +12813,31 @@
     "path": "Device.Firewall.InterfaceSetting.{i}.IPv4AcceptICMPEchoRequest",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.InterfaceSetting.{i}.IPv4SpoofingProtection",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.InterfaceSetting.{i}.IPv6AcceptICMPEchoRequest",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.InterfaceSetting.{i}.IPv6PassThroughICMPEchoRequest",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.InterfaceSetting.{i}.IPv6SpoofingProtection",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.InterfaceSetting.{i}.Status",
@@ -12237,7 +12849,7 @@
     "path": "Device.Firewall.InterfaceSetting.{i}.StealthMode",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.InterfaceSettingNumberOfEntries",
@@ -12249,7 +12861,7 @@
     "path": "Device.Firewall.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Firewall.Level.{i}.Alias",
@@ -12267,7 +12879,7 @@
     "path": "Device.Firewall.Level.{i}.DefaultLogPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Level.{i}.DefaultPolicy",
@@ -12297,7 +12909,7 @@
     "path": "Device.Firewall.Level.{i}.Policies",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Level.{i}.PortMappingEnabled",
@@ -12393,13 +13005,13 @@
     "path": "Device.Firewall.Pinhole.{i}.DestPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.DestPortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.Enable",
@@ -12417,7 +13029,7 @@
     "path": "Device.Firewall.Pinhole.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.LeaseDuration",
@@ -12429,13 +13041,13 @@
     "path": "Device.Firewall.Pinhole.{i}.Log",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.LogRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.Origin",
@@ -12447,7 +13059,7 @@
     "path": "Device.Firewall.Pinhole.{i}.Protocol",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.RemainingLeaseTime",
@@ -12459,25 +13071,25 @@
     "path": "Device.Firewall.Pinhole.{i}.ScheduleRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.SourcePort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.SourcePortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.SourcePrefixes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Pinhole.{i}.Status",
@@ -12519,19 +13131,19 @@
     "path": "Device.Firewall.Policy.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Policy.{i}.Log",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Policy.{i}.LogRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Policy.{i}.ReverseChain",
@@ -12591,7 +13203,7 @@
     "path": "Device.Firewall.Service.{i}.DestPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.Firewall.Service.{i}.Enable",
@@ -12603,7 +13215,7 @@
     "path": "Device.Firewall.Service.{i}.ICMPType",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Service.{i}.Interface",
@@ -12615,31 +13227,31 @@
     "path": "Device.Firewall.Service.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Service.{i}.Log",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Service.{i}.LogRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Service.{i}.Protocol",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.Firewall.Service.{i}.SourcePrefixes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Service.{i}.Status",
@@ -12669,7 +13281,7 @@
     "path": "Device.Firewall.Set.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Firewall.Set.{i}.Name",
@@ -12693,25 +13305,25 @@
     "path": "Device.Firewall.Set.{i}.Rule.{i}.Exclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Firewall.Set.{i}.Rule.{i}.IPAddressList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Set.{i}.Rule.{i}.MACAddressList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Set.{i}.Rule.{i}.PortList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Firewall.Set.{i}.RuleNumberOfEntries",
@@ -12743,12 +13355,90 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_InterfaceSetting.{i}.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_InterfaceSetting.{i}.Interface",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_InterfaceSetting.{i}.IPv4AcceptICMPEchoRequest",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_InterfaceSetting.{i}.IPv4SpoofingProtection",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_InterfaceSetting.{i}.IPv6AcceptICMPEchoRequest",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_InterfaceSetting.{i}.IPv6SpoofingProtection",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_InterfaceSetting.{i}.StealthMode",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_InterfaceSettingNumberOfEntries",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_WANAccess.BlockList.{i}.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_WANAccess.BlockList.{i}.MACAddress",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_WANAccess.BlockListNumberOfEntries",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Firewall.X_PRPLWARE-COM_WANAccess.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.FWE.Link.{i}.Alias",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.FWE.Link.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.FWE.Link.{i}.Enable",
     "writable": true,
@@ -12759,13 +13449,13 @@
     "path": "Device.FWE.Link.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FWE.Link.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.FWE.Link.{i}.Name",
@@ -12777,73 +13467,73 @@
     "path": "Device.FWE.Link.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.Reset",
@@ -12855,19 +13545,19 @@
     "path": "Device.FWE.Link.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.FWE.Link.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.FWE.Link.{i}.Status",
@@ -12909,7 +13599,7 @@
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Channels.Channel.{i}.SNR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Channels.ChannelNumberOfEntries",
@@ -12921,7 +13611,7 @@
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Channels.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.DiagnoseMACAddress",
@@ -12945,61 +13635,61 @@
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.CurrentEnd",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.CurrentStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BlocksErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BlocksReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BlocksResent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BlocksSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.DestinationMACAddress",
@@ -13011,91 +13701,91 @@
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MgmtBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MgmtBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MgmtPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MgmtPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Diagnostics.PerformanceMonitoring.Nodes.NodeNumberOfEntries",
@@ -13137,7 +13827,7 @@
     "path": "Device.Ghn.Interface.{i}.AssociatedDevice.{i}.DeviceId",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.AssociatedDevice.{i}.MACAddress",
@@ -13170,28 +13860,34 @@
     "type": "xsd:string"
   },
   {
-    "path": "Device.Ghn.Interface.{i}.DeviceId",
-    "writable": false,
-    "deviceClass": "tr181",
-    "type": "xsd:string"
-  },
-  {
-    "path": "Device.Ghn.Interface.{i}.DMInfo.DomainId",
-    "writable": false,
-    "deviceClass": "tr181",
-    "type": "xsd:string"
-  },
-  {
-    "path": "Device.Ghn.Interface.{i}.DMInfo.DomainName",
+    "path": "Device.Ghn.Interface.{i}.Description",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Ghn.Interface.{i}.DeviceId",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Ghn.Interface.{i}.DMInfo.DomainId",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Ghn.Interface.{i}.DMInfo.DomainName",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
   {
     "path": "Device.Ghn.Interface.{i}.DMInfo.DomainNameIdentifier",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Ghn.Interface.{i}.DMInfo.MACCycleDuration",
@@ -13203,25 +13899,25 @@
     "path": "Device.Ghn.Interface.{i}.DMInfo.MaxSupportedBandplan",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.DMInfo.MinSupportedBandplan",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.DMInfo.ReregistrationTimePeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.DMInfo.SCDeviceId",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.DMInfo.SCMACAddress",
@@ -13239,13 +13935,13 @@
     "path": "Device.Ghn.Interface.{i}.DMRequested",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.DomainId",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.DomainName",
@@ -13257,7 +13953,7 @@
     "path": "Device.Ghn.Interface.{i}.DomainNameIdentifier",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Enable",
@@ -13275,25 +13971,25 @@
     "path": "Device.Ghn.Interface.{i}.IsDM",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.IsSC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ghn.Interface.{i}.MACAddress",
@@ -13305,7 +14001,7 @@
     "path": "Device.Ghn.Interface.{i}.MaxBandPlan",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.MaxBitRate",
@@ -13335,91 +14031,91 @@
     "path": "Device.Ghn.Interface.{i}.NodeTypeDMCapable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.NodeTypeDMConfig",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.NodeTypeDMStatus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.NodeTypeSCCapable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.NodeTypeSCStatus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.NotchedAmateurRadioBands",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Ghn.Interface.{i}.PerformanceMonitoringDiagnosticsEnable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Ghn.Interface.{i}.PHYThroughputDiagnosticsEnable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Ghn.Interface.{i}.PSM",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SCInfo.Location",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SCInfo.MICSize",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SCInfo.ModeEnabled",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:string"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SCInfo.ModesSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SCRequested",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SMMaskedBand.{i}.BandNumber",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SMMaskedBand.{i}.Enable",
@@ -13431,13 +14127,13 @@
     "path": "Device.Ghn.Interface.{i}.SMMaskedBand.{i}.StartSubCarrier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SMMaskedBand.{i}.StopSubCarrier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.SMMaskedBandNumberOfEntries",
@@ -13449,127 +14145,127 @@
     "path": "Device.Ghn.Interface.{i}.StandardVersions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.BlocksErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.BlocksReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.BlocksResent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.BlocksSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.MgmtBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.MgmtBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.MgmtPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.MgmtPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.Reset",
@@ -13581,19 +14277,19 @@
     "path": "Device.Ghn.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Status",
@@ -13605,19 +14301,19 @@
     "path": "Device.Ghn.Interface.{i}.TAIFG",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Ghn.Interface.{i}.TargetDomainNames",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Ghn.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Ghn.InterfaceNumberOfEntries",
@@ -13635,13 +14331,13 @@
     "path": "Device.GRE.Filter.{i}.AllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.GRE.Filter.{i}.DSCPMarkPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.GRE.Filter.{i}.Enable",
@@ -13671,13 +14367,13 @@
     "path": "Device.GRE.Filter.{i}.VLANIDCheck",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.GRE.Filter.{i}.VLANIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.GRE.FilterNumberOfEntries",
@@ -13701,7 +14397,7 @@
     "path": "Device.GRE.Tunnel.{i}.DefaultDSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.DeliveryHeaderProtocol",
@@ -13721,6 +14417,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Enable",
     "writable": true,
@@ -13731,7 +14433,7 @@
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.KeyIdentifier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.KeyIdentifierGenerationPolicy",
@@ -13741,19 +14443,19 @@
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -13761,91 +14463,91 @@
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.ProtocolIdOverride",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.DiscardChecksumReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.DiscardSequenceNumberReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.Reset",
@@ -13857,23 +14559,23 @@
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -13881,17 +14583,17 @@
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.UseChecksum",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Interface.{i}.UseSequenceNumber",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.InterfaceNumberOfEntries",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
@@ -13905,7 +14607,7 @@
     "path": "Device.GRE.Tunnel.{i}.KeepAliveThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.KeepAliveTimeout",
@@ -13917,55 +14619,55 @@
     "path": "Device.GRE.Tunnel.{i}.RemoteEndpoints",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Stats.KeepAliveReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Stats.KeepAliveSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.GRE.Tunnel.{i}.Status",
@@ -13979,6 +14681,108 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.InputFile",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.Label",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.Location",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.Name",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.Active",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.ActiveTime",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.Max",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.Min",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.Name",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.Timeout",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerCondition.{i}.Type",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hardware.Buttons.Button.{i}.TriggerConditionNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Hardware.Buttons.ButtonNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.Hardware.CPUs.CPU.{i}.Alias",
     "writable": true,
@@ -13989,7 +14793,7 @@
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.CurrentFrequency",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.Enable",
@@ -14001,25 +14805,25 @@
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.MaxFrequency",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.MinFrequency",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.ScalingAvailableFrequencies",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.ScalingAvailableGovernors",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.ScalingGovernor",
@@ -14031,13 +14835,13 @@
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.ScalingMaxFrequency",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.ScalingMinFrequency",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.Status",
@@ -14049,7 +14853,7 @@
     "path": "Device.Hardware.CPUs.CPU.{i}.DVFS.Supported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Hardware.CPUs.CPUNumberOfEntries",
@@ -14067,19 +14871,19 @@
     "path": "Device.Hardware.PowerManagement.Standby.NetworkAware",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Hardware.PowerManagement.Standby.ScheduleRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Hardware.PowerManagement.Standby.StandbyOccurred",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Hardware.PowerManagement.Standby.Status",
@@ -14091,7 +14895,7 @@
     "path": "Device.Hardware.PowerManagement.Standby.TimerAware",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Alias",
@@ -14109,13 +14913,13 @@
     "path": "Device.HomePlug.Interface.{i}.AssociatedDevice.{i}.AvgAttenuation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.AssociatedDevice.{i}.EndStationMACs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.AssociatedDevice.{i}.FirmwareVersion",
@@ -14145,7 +14949,7 @@
     "path": "Device.HomePlug.Interface.{i}.AssociatedDevice.{i}.SNRPerTone",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.AssociatedDevice.{i}.TxPhyRate",
@@ -14159,6 +14963,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.HomePlug.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.HomePlug.Interface.{i}.Enable",
     "writable": true,
@@ -14175,7 +14985,7 @@
     "path": "Device.HomePlug.Interface.{i}.ForceCCo",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Interface",
@@ -14187,7 +14997,7 @@
     "path": "Device.HomePlug.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.LogicalNetwork",
@@ -14199,7 +15009,7 @@
     "path": "Device.HomePlug.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.MACAddress",
@@ -14229,109 +15039,109 @@
     "path": "Device.HomePlug.Interface.{i}.OtherNetworksPresent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.MPDURxAck",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.MPDURxFailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.MPDUTxAck",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.MPDUTxCol",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.MPDUTxFailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.Reset",
@@ -14343,19 +15153,19 @@
     "path": "Device.HomePlug.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Status",
@@ -14373,7 +15183,7 @@
     "path": "Device.HomePlug.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.HomePlug.Interface.{i}.Version",
@@ -14439,7 +15249,7 @@
     "path": "Device.Hosts.AccessControl.{i}.Schedule.{i}.Day",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Hosts.AccessControl.{i}.Schedule.{i}.Duration",
@@ -14457,7 +15267,7 @@
     "path": "Device.Hosts.AccessControl.{i}.Schedule.{i}.StartTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.Hosts.AccessControl.{i}.ScheduleNumberOfEntries",
@@ -14469,7 +15279,7 @@
     "path": "Device.Hosts.AccessControl.{i}.ScheduleRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Hosts.AccessControlNumberOfEntries",
@@ -14481,7 +15291,7 @@
     "path": "Device.Hosts.CleanupHostsThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Hosts.Host.{i}.Active",
@@ -14493,7 +15303,7 @@
     "path": "Device.Hosts.Host.{i}.ActiveLastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Hosts.Host.{i}.AddressSource",
@@ -14517,13 +15327,13 @@
     "path": "Device.Hosts.Host.{i}.ClientID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Hosts.Host.{i}.DHCPClient",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Hosts.Host.{i}.HostName",
@@ -14583,7 +15393,7 @@
     "path": "Device.Hosts.Host.{i}.LeaseTimeRemaining",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Hosts.Host.{i}.PhysAddress",
@@ -14595,7 +15405,7 @@
     "path": "Device.Hosts.Host.{i}.UserClassID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Hosts.Host.{i}.VendorClassID",
@@ -14607,37 +15417,37 @@
     "path": "Device.Hosts.Host.{i}.WANStats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Hosts.Host.{i}.WANStats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Hosts.Host.{i}.WANStats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Hosts.Host.{i}.WANStats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Hosts.Host.{i}.WANStats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Hosts.Host.{i}.WANStats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Hosts.Host.{i}.WANStats.RetransCount",
@@ -14651,6 +15461,18 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.Hosts.X_PRPLWARE-COM_HostConfig.{i}.MACAddress",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Hosts.X_PRPLWARE-COM_HostConfig.{i}.Name",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Channels.Channel.{i}.BaudRate",
     "writable": false,
@@ -14691,19 +15513,19 @@
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Channels.Channel.{i}.LARQPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Channels.Channel.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Channels.Channel.{i}.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Channels.Channel.{i}.PHYRate",
@@ -14715,7 +15537,7 @@
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Channels.Channel.{i}.SNR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Channels.ChannelNumberOfEntries",
@@ -14727,7 +15549,7 @@
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Channels.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.DiagnosticsState",
@@ -14745,73 +15567,73 @@
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.CurrentEnd",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.CurrentStart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BroadcastPacketsInternalControl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BroadcastPacketsSentWire",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.ControlReplyLocal",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.ControlReplyRemote",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.ControlRequestLocal",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.ControlRequestRemote",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MACAddress",
@@ -14823,97 +15645,97 @@
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.MulticastPacketsSentWire",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.NodeUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsCrcErrored",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsCrcErroredHost",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsInternalControl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsReceivedForwardUnknown",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsReceivedQueued",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsSentWire",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsShortErrored",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.PacketsShortErroredHost",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.RxPacketsDropped",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.Node.{i}.TxPacketsDropped",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PerformanceMonitoring.Nodes.NodeNumberOfEntries",
@@ -14949,19 +15771,19 @@
     "path": "Device.HPNA.Diagnostics.PHYThroughput.NumPacketsInBurst",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PHYThroughput.PayloadDataGen",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PHYThroughput.PayloadEncoding",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PHYThroughput.PayloadType",
@@ -14973,13 +15795,13 @@
     "path": "Device.HPNA.Diagnostics.PHYThroughput.PriorityLevel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PHYThroughput.Result.{i}.Attenuation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PHYThroughput.Result.{i}.BaudRate",
@@ -14997,7 +15819,7 @@
     "path": "Device.HPNA.Diagnostics.PHYThroughput.Result.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PHYThroughput.Result.{i}.PHYRate",
@@ -15009,7 +15831,7 @@
     "path": "Device.HPNA.Diagnostics.PHYThroughput.Result.{i}.SNR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Diagnostics.PHYThroughput.Result.{i}.SrcMACAddress",
@@ -15045,7 +15867,7 @@
     "path": "Device.HPNA.Interface.{i}.AssociatedDevice.{i}.IsMaster",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.HPNA.Interface.{i}.AssociatedDevice.{i}.MACAddress",
@@ -15063,7 +15885,7 @@
     "path": "Device.HPNA.Interface.{i}.AssociatedDevice.{i}.NodeID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.AssociatedDevice.{i}.PHYDiagnosticsEnable",
@@ -15075,7 +15897,7 @@
     "path": "Device.HPNA.Interface.{i}.AssociatedDevice.{i}.Synced",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.HPNA.Interface.{i}.AssociatedDevice.{i}.TotalSyncTime",
@@ -15093,12 +15915,18 @@
     "path": "Device.HPNA.Interface.{i}.ConnectionType",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.HPNA.Interface.{i}.DefaultNonLARQPER",
     "writable": true,
     "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.HPNA.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
@@ -15117,7 +15945,7 @@
     "path": "Device.HPNA.Interface.{i}.IsMaster",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.HPNA.Interface.{i}.LARQEnable",
@@ -15129,13 +15957,13 @@
     "path": "Device.HPNA.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.HPNA.Interface.{i}.MACAddress",
@@ -15183,31 +16011,31 @@
     "path": "Device.HPNA.Interface.{i}.NetworkUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.NodeID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.NoiseMargin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.PossibleConnectionTypes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.HPNA.Interface.{i}.PossibleSpectralModes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.HPNA.Interface.{i}.QoS.FlowSpec.{i}.Alias",
@@ -15237,13 +16065,13 @@
     "path": "Device.HPNA.Interface.{i}.QoS.FlowSpec.{i}.Jitter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.QoS.FlowSpec.{i}.Latency",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.QoS.FlowSpec.{i}.MaxRate",
@@ -15267,7 +16095,7 @@
     "path": "Device.HPNA.Interface.{i}.QoS.FlowSpec.{i}.PER",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.QoS.FlowSpec.{i}.Priority",
@@ -15291,7 +16119,7 @@
     "path": "Device.HPNA.Interface.{i}.QoS.FlowSpec.{i}.TrafficClasses",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.HPNA.Interface.{i}.QoS.FlowSpecNumberOfEntries",
@@ -15309,73 +16137,73 @@
     "path": "Device.HPNA.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.Reset",
@@ -15387,19 +16215,19 @@
     "path": "Device.HPNA.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.HPNA.Interface.{i}.Status",
@@ -15411,7 +16239,7 @@
     "path": "Device.HPNA.Interface.{i}.Synced",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.HPNA.Interface.{i}.TotalSyncTime",
@@ -15423,7 +16251,7 @@
     "path": "Device.HPNA.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.HPNA.InterfaceNumberOfEntries",
@@ -15435,19 +16263,19 @@
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.EtherType",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.EtherTypeFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.InterfaceList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.MACDestinationAddress",
@@ -15459,7 +16287,7 @@
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.MACDestinationAddressFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.MACSourceAddress",
@@ -15471,31 +16299,31 @@
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.MACSourceAddressFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.PCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.PCPFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.Vid",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRule.{i}.VidFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IEEE1905.AL.ForwardingTable.ForwardingRuleNumberOfEntries",
@@ -15531,7 +16359,7 @@
     "path": "Device.IEEE1905.AL.Interface.{i}.GenericPhyVariant",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.InterfaceId",
@@ -15549,7 +16377,7 @@
     "path": "Device.IEEE1905.AL.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.GenericPhyOUI",
@@ -15567,7 +16395,7 @@
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.GenericPhyVariant",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.IEEE1905Id",
@@ -15591,19 +16419,19 @@
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.IEEE802dot1Bridge",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.LinkAvailability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.MACThroughputCapacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.PacketErrors",
@@ -15615,13 +16443,13 @@
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.PacketErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.PHYRate",
@@ -15633,7 +16461,7 @@
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.RSSI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:int"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.Link.{i}.Metric.TransmittedPackets",
@@ -15651,7 +16479,7 @@
     "path": "Device.IEEE1905.AL.Interface.{i}.LowerLayers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.MediaType",
@@ -15681,7 +16509,7 @@
     "path": "Device.IEEE1905.AL.Interface.{i}.VendorProperties.{i}.Information",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.Interface.{i}.VendorProperties.{i}.OUI",
@@ -15705,31 +16533,37 @@
     "path": "Device.IEEE1905.AL.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.LowerLayers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkingRegistrar.Registrar2dot4",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkingRegistrar.Registrar5",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.IEEE1905.AL.NetworkingRegistrar.Registrar6",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkingRegistrar.Registrar60",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.ChangeLog.{i}.EventType",
@@ -15765,7 +16599,7 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.ChangeLog.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.ChangeLogNumberOfEntries",
@@ -15789,7 +16623,7 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.BridgingTuple.{i}.InterfaceList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.BridgingTupleNumberOfEntries",
@@ -15825,19 +16659,19 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.IEEE802dot1Bridge",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.LinkAvailability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.MACThroughputCapacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.NeighborMACAddress",
@@ -15855,13 +16689,13 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.PacketErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.PHYRate",
@@ -15873,7 +16707,7 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.RSSI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:int"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.IEEE1905Neighbor.{i}.Metric.{i}.TransmittedPackets",
@@ -15903,19 +16737,19 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.Interface.{i}.APChannelBand",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.Interface.{i}.FrequencyIndex1",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.Interface.{i}.FrequencyIndex2",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.Interface.{i}.GenericPhyOUI",
@@ -15933,7 +16767,7 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.Interface.{i}.GenericPhyVariant",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.Interface.{i}.InterfaceId",
@@ -16035,7 +16869,7 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.L2Neighbor.{i}.BehindInterfaceIds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.L2Neighbor.{i}.LocalInterface",
@@ -16089,19 +16923,19 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.RegistrarFreqBand",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.VendorProperties.{i}.Information",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.VendorProperties.{i}.MessageType",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.IEEE1905Device.{i}.VendorProperties.{i}.OUI",
@@ -16137,7 +16971,7 @@
     "path": "Device.IEEE1905.AL.NetworkTopology.MaxChangeLogEntries",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE1905.AL.NetworkTopology.Status",
@@ -16149,7 +16983,7 @@
     "path": "Device.IEEE1905.AL.RegistrarFreqBand",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.Security.Password",
@@ -16161,7 +16995,7 @@
     "path": "Device.IEEE1905.AL.Security.SetupMethod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE1905.AL.Status",
@@ -16169,6 +17003,366 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.AssocWiFiNetworkDeviceRef",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.BridgingTuple.{i}.InterfaceList",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.BridgingTupleNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.ControlURL",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.FriendlyName",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IEEE1905Id",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.APChannelBand",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.FrequencyIndex1",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.FrequencyIndex2",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.GenericPhy.OUI",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.GenericPhy.URL",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.GenericPhy.Variant",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.IEEE1905Neighbor.{i}.IEEE1905DeviceRef",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.IEEE1905Neighbor.{i}.IEEE802dot1Bridge",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.IEEE1905Neighbor.{i}.NeighborDeviceId",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.IEEE1905NeighborNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.InterfaceId",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.L2Neighbor.{i}.BehindInterfaceIds",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.L2Neighbor.{i}.NeighborInterfaceId",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.L2NeighborNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.GenericPhy.OUI",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.GenericPhy.URL",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.GenericPhy.Variant",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.IEEE1905Id",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.InterfaceId",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.MediaType",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.IEEE802dot1Bridge",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.LinkAvailability",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.MACThroughputCapacity",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.PacketErrors",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.PacketErrorsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.PacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.PHYRate",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.RSSI",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Link.{i}.Metric.TransmittedPackets",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.LinkNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.MediaType",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.NetworkMembership",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.NonIEEE1905Neighbor.{i}.NeighborInterfaceId",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.NonIEEE1905NeighborNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.PowerState",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Interface.{i}.Role",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.InterfaceNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv4Address.{i}.DHCPServer",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv4Address.{i}.IPv4Address",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv4Address.{i}.IPv4AddressType",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv4Address.{i}.MACAddress",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv4AddressNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv6Address.{i}.IPv6Address",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv6Address.{i}.IPv6AddressOrigin",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv6Address.{i}.IPv6AddressType",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv6Address.{i}.MACAddress",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.IPv6AddressNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.ManufacturerModel",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.ManufacturerName",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.RegistrarFreqBand",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.IEEE1905.Network.AL.{i}.Version",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IEEE1905.Network.ALNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IEEE1905.Network.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.IEEE1905.Network.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.IEEE1905.Version",
     "writable": false,
@@ -16185,7 +17379,7 @@
     "path": "Device.IEEE8021x.Supplicant.{i}.AuthenticationCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.AuthenticationSuccessPolicy",
@@ -16197,13 +17391,13 @@
     "path": "Device.IEEE8021x.Supplicant.{i}.AuthPeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Disconnect",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.EAPIdentity",
@@ -16257,7 +17451,7 @@
     "path": "Device.IEEE8021x.Supplicant.{i}.HeldPeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Interface",
@@ -16269,7 +17463,7 @@
     "path": "Device.IEEE8021x.Supplicant.{i}.MaxStart",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.PAEState",
@@ -16293,7 +17487,7 @@
     "path": "Device.IEEE8021x.Supplicant.{i}.StartPeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.FailureCount",
@@ -16311,37 +17505,37 @@
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.LastFrameVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.ReceivedFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.ReceivedInvalidFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.ReceivedLengthErrorFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.ReceivedRequestFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.ReceivedRequestIdFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.Reset",
@@ -16359,31 +17553,31 @@
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.TransmittedFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.TransmittedLogoffFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.TransmittedResponseFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.TransmittedResponseIdFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Stats.TransmittedStartFrames",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IEEE8021x.Supplicant.{i}.Status",
@@ -16473,7 +17667,7 @@
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.BOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.DiagnosticsState",
@@ -16485,19 +17679,19 @@
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.DownloadDiagnosticMaxConnections",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.DownloadDiagnosticsMaxIncrementalResult",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.DownloadTransports",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.DownloadURL",
@@ -16509,19 +17703,19 @@
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.DSCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.EnablePerConnectionResults",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.EOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.EthernetPriority",
@@ -16533,31 +17727,31 @@
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.IncrementalResult.{i}.EndTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.IncrementalResult.{i}.StartTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.IncrementalResult.{i}.TestBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.IncrementalResult.{i}.TotalBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.IncrementalResult.{i}.TotalBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.IncrementalResultNumberOfEntries",
@@ -16581,55 +17775,55 @@
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.NumberOfConnections",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResult.{i}.BOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResult.{i}.EOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResult.{i}.ROMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResult.{i}.TCPOpenRequestTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResult.{i}.TCPOpenResponseTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResult.{i}.TestBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResult.{i}.TotalBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResult.{i}.TotalBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PerConnectionResultNumberOfEntries",
@@ -16641,7 +17835,7 @@
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.PeriodOfFullLoading",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.ProtocolVersion",
@@ -16653,31 +17847,31 @@
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.ROMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TCPOpenRequestTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TCPOpenResponseTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TestBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TestBytesReceivedUnderFullLoading",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TimeBasedTestDuration",
@@ -16695,37 +17889,37 @@
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TimeBasedTestMeasurementOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TotalBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TotalBytesReceivedUnderFullLoading",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TotalBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.DownloadDiagnostics.TotalBytesSentUnderFullLoading",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ActiveFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.AuthenticationAlias",
@@ -16751,11 +17945,17 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.AuthenticationKeyID",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.BOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.DiagnosticsState",
@@ -16767,13 +17967,13 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.DSCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.EOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.EthernetPriority",
@@ -16791,7 +17991,7 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.HighSpeedDelta",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.Host",
@@ -16803,61 +18003,61 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.HSpeedThresh",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.InterfaceEthMbps",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.IPLayerCapacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.LossRatio",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.MinOnewayDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.PDVRange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.ReorderedRatio",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.ReplicatedRatio",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.RTTRange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResult.{i}.TimeOfSubInterval",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IncrementalResultNumberOfEntries",
@@ -16875,13 +18075,13 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.InterfaceEthMbpsAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.InterfaceEthMbpsSummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPDVEnable",
@@ -16901,6 +18101,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPLayerCapacityAuthCode.{i}.AuthenticationKeyID",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPLayerCapacityAuthCodeNumberOfEntries",
     "writable": false,
@@ -16911,7 +18117,7 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPLayerCapacitySummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPLayerCapSupportedControlProtocolVersion",
@@ -16923,7 +18129,7 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPLayerCapSupportedMetrics",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPLayerCapSupportedSoftwareVersion",
@@ -16935,13 +18141,13 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPLayerMaxConnections",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPLayerMaxIncrementalResult",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.IPRREnable",
@@ -16953,157 +18159,157 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.JumboFramesPermitted",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.LocalInterfaceRateIncluded",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.LossRatioAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.LossRatioSummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.LowerThresh",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MaxETHCapacityNoFCS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MaxETHCapacityWithFCS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MaxETHCapacityWithFCSVLAN",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MaximumFlows",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MaximumTestBandwidth",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MaxIPLayerCapacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MinOnewayDelayAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MinOnewayDelaySummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.MinRTTSummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.InterfaceEthMbpsAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.LossRatioAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.MaxETHCapacityNoFCS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.MaxETHCapacityWithFCS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.MaxETHCapacityWithFCSVLAN",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.MaxIPLayerCapacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.MinOnewayDelayAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.PDVRangeAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.ReorderedRatioAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.ReplicatedRatioAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.RTTRangeAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResult.{i}.TimeOfMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ModalResultNumberOfEntries",
@@ -17121,31 +18327,31 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.NumberFirstModeTestSubIntervals",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.NumberOfConnections",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.NumberTestSubIntervals",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.PDVRangeAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.PDVRangeSummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.Port",
@@ -17157,25 +18363,25 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.PortMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.PortMin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.PortOptionalMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.PortOptionalMin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.PreambleDuration",
@@ -17205,31 +18411,31 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ReorderedRatioAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ReorderedRatioSummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ReplicatedRatioAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ReplicatedRatioSummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.RetryThresh",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.RIPREnable",
@@ -17247,43 +18453,43 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.RTTMaxAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.RTTMinAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.RTTRangeAtMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.RTTRangeSummary",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:decimal"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.SeqErrThresh",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.ServerList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.SlowAdjThresh",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.StartSendingRate",
@@ -17295,13 +18501,13 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.StartSendingRateIndex",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.StatusCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.StatusFeedbackInterval",
@@ -17337,61 +18543,61 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TimeOfMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TimeoutNoStatusMessage",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TimeoutNoTestTraffic",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TimeoutNoTraffic",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TimestampResolution",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TimestampResolutionUsed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.Tmax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TmaxRTT",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TmaxRTTUsed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.TmaxUsed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.UDPPayloadContent",
@@ -17403,25 +18609,25 @@
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.UDPPayloadMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.UDPPayloadMin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacityMetrics.UpperThresh",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPLayerCapacitySupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPPing.AverageResponseTime",
@@ -17433,7 +18639,7 @@
     "path": "Device.IP.Diagnostics.IPPing.AverageResponseTimeDetailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPPing.DataBlockSize",
@@ -17451,7 +18657,7 @@
     "path": "Device.IP.Diagnostics.IPPing.DSCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPPing.FailureCount",
@@ -17487,7 +18693,7 @@
     "path": "Device.IP.Diagnostics.IPPing.MaximumResponseTimeDetailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPPing.MinimumResponseTime",
@@ -17499,13 +18705,13 @@
     "path": "Device.IP.Diagnostics.IPPing.MinimumResponseTimeDetailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPPing.NumberOfRepetitions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.IPPing.ProtocolVersion",
@@ -17529,73 +18735,73 @@
     "path": "Device.IP.Diagnostics.IPv4DownloadDiagnosticsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv4PingSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv4ServerSelectionDiagnosticsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv4TraceRouteSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv4UDPEchoDiagnosticsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv4UploadDiagnosticsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv6DownloadDiagnosticsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv6PingSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv6ServerSelectionDiagnosticsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv6TraceRouteSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv6UDPEchoDiagnosticsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.IPv6UploadDiagnosticsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.ServerSelectionDiagnostics.AverageResponseTime",
@@ -17619,7 +18825,7 @@
     "path": "Device.IP.Diagnostics.ServerSelectionDiagnostics.HostList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IP.Diagnostics.ServerSelectionDiagnostics.Interface",
@@ -17649,7 +18855,7 @@
     "path": "Device.IP.Diagnostics.ServerSelectionDiagnostics.NumberOfRepetitions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.ServerSelectionDiagnostics.Protocol",
@@ -17685,7 +18891,7 @@
     "path": "Device.IP.Diagnostics.TraceRoute.DSCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.TraceRoute.Host",
@@ -17715,7 +18921,7 @@
     "path": "Device.IP.Diagnostics.TraceRoute.NumberOfTries",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.TraceRoute.ProtocolVersion",
@@ -17733,7 +18939,7 @@
     "path": "Device.IP.Diagnostics.TraceRoute.RouteHops.{i}.ErrorCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.TraceRoute.RouteHops.{i}.Host",
@@ -17751,7 +18957,7 @@
     "path": "Device.IP.Diagnostics.TraceRoute.RouteHops.{i}.RTTimes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.IP.Diagnostics.TraceRoute.RouteHopsNumberOfEntries",
@@ -17769,13 +18975,13 @@
     "path": "Device.IP.Diagnostics.UDPEchoConfig.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoConfig.BytesResponded",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoConfig.EchoPlusEnabled",
@@ -17787,7 +18993,7 @@
     "path": "Device.IP.Diagnostics.UDPEchoConfig.EchoPlusSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoConfig.Enable",
@@ -17805,13 +19011,13 @@
     "path": "Device.IP.Diagnostics.UDPEchoConfig.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoConfig.PacketsResponded",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoConfig.SourceIPAddress",
@@ -17823,13 +19029,13 @@
     "path": "Device.IP.Diagnostics.UDPEchoConfig.TimeFirstPacketReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoConfig.TimeLastPacketReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoConfig.UDPPort",
@@ -17859,13 +19065,13 @@
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.DSCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.EnableIndividualPacketResults",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.FailureCount",
@@ -17883,31 +19089,31 @@
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.PacketReceiveTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.PacketSendTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.PacketSuccess",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.TestGenSN",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.TestRespRcvTimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.TestRespReplyFailureCount",
@@ -17919,13 +19125,13 @@
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.TestRespReplyTimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResult.{i}.TestRespSN",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.IndividualPacketResultNumberOfEntries",
@@ -17967,7 +19173,7 @@
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.NumberOfRepetitions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.Port",
@@ -17997,13 +19203,13 @@
     "path": "Device.IP.Diagnostics.UDPEchoDiagnostics.UDPEchoDiagnosticsMaxResults",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.BOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.DiagnosticsState",
@@ -18015,19 +19221,19 @@
     "path": "Device.IP.Diagnostics.UploadDiagnostics.DSCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.EnablePerConnectionResults",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.EOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.EthernetPriority",
@@ -18039,31 +19245,31 @@
     "path": "Device.IP.Diagnostics.UploadDiagnostics.IncrementalResult.{i}.EndTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.IncrementalResult.{i}.StartTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.IncrementalResult.{i}.TestBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.IncrementalResult.{i}.TotalBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.IncrementalResult.{i}.TotalBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.IncrementalResultNumberOfEntries",
@@ -18087,55 +19293,55 @@
     "path": "Device.IP.Diagnostics.UploadDiagnostics.NumberOfConnections",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResult.{i}.BOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResult.{i}.EOMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResult.{i}.ROMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResult.{i}.TCPOpenRequestTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResult.{i}.TCPOpenResponseTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResult.{i}.TestBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResult.{i}.TotalBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResult.{i}.TotalBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PerConnectionResultNumberOfEntries",
@@ -18147,7 +19353,7 @@
     "path": "Device.IP.Diagnostics.UploadDiagnostics.PeriodOfFullLoading",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.ProtocolVersion",
@@ -18159,37 +19365,37 @@
     "path": "Device.IP.Diagnostics.UploadDiagnostics.ROMTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TCPOpenRequestTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TCPOpenResponseTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TestBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TestBytesSentUnderFullLoading",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TestFileLength",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TimeBasedTestDuration",
@@ -18207,49 +19413,49 @@
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TimeBasedTestMeasurementOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TotalBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TotalBytesReceivedUnderFullLoading",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TotalBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.TotalBytesSentUnderFullLoading",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.UploadDiagnosticsMaxConnections",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.UploadDiagnosticsMaxIncrementalResult",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.UploadTransports",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IP.Diagnostics.UploadDiagnostics.UploadURL",
@@ -18269,6 +19475,12 @@
     "deviceClass": "tr181",
     "type": "xsd:boolean"
   },
+  {
+    "path": "Device.IP.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.IP.Interface.{i}.Enable",
     "writable": true,
@@ -18333,7 +19545,7 @@
     "path": "Device.IP.Interface.{i}.IPv6Address.{i}.Anycast",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Interface.{i}.IPv6Address.{i}.Enable",
@@ -18363,7 +19575,7 @@
     "path": "Device.IP.Interface.{i}.IPv6Address.{i}.PreferredLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Interface.{i}.IPv6Address.{i}.Prefix",
@@ -18381,7 +19593,7 @@
     "path": "Device.IP.Interface.{i}.IPv6Address.{i}.ValidLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Interface.{i}.IPv6AddressNumberOfEntries",
@@ -18405,7 +19617,7 @@
     "path": "Device.IP.Interface.{i}.IPv6Prefix.{i}.Autonomous",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Interface.{i}.IPv6Prefix.{i}.ChildPrefixBits",
@@ -18423,7 +19635,7 @@
     "path": "Device.IP.Interface.{i}.IPv6Prefix.{i}.OnLink",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Interface.{i}.IPv6Prefix.{i}.Origin",
@@ -18441,7 +19653,7 @@
     "path": "Device.IP.Interface.{i}.IPv6Prefix.{i}.PreferredLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Interface.{i}.IPv6Prefix.{i}.Prefix",
@@ -18471,7 +19683,7 @@
     "path": "Device.IP.Interface.{i}.IPv6Prefix.{i}.ValidLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IP.Interface.{i}.IPv6PrefixNumberOfEntries",
@@ -18481,21 +19693,21 @@
   },
   {
     "path": "Device.IP.Interface.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Interface.{i}.Loopback",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IP.Interface.{i}.MaxMTUSize",
@@ -18505,7 +19717,7 @@
   },
   {
     "path": "Device.IP.Interface.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -18525,73 +19737,73 @@
     "path": "Device.IP.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.Reset",
@@ -18603,23 +19815,23 @@
     "path": "Device.IP.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IP.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IP.Interface.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -18639,7 +19851,7 @@
     "path": "Device.IP.Interface.{i}.TWAMPReflector.{i}.IPAllowedList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IP.Interface.{i}.TWAMPReflector.{i}.MaximumTTL",
@@ -18657,7 +19869,7 @@
     "path": "Device.IP.Interface.{i}.TWAMPReflector.{i}.PortAllowedList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IP.Interface.{i}.TWAMPReflector.{i}.Status",
@@ -18693,7 +19905,7 @@
     "path": "Device.IP.IPv4Capable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.IPv4Enable",
@@ -18711,7 +19923,7 @@
     "path": "Device.IP.IPv6Capable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IP.IPv6Enable",
@@ -18735,7 +19947,7 @@
     "path": "Device.IPsec.AHSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IPsec.Enable",
@@ -18747,7 +19959,7 @@
     "path": "Device.IPsec.ESPSupportedEncryptionAlgorithms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Filter.{i}.Alias",
@@ -18759,7 +19971,7 @@
     "path": "Device.IPsec.Filter.{i}.AllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IPsec.Filter.{i}.DestIP",
@@ -18771,7 +19983,7 @@
     "path": "Device.IPsec.Filter.{i}.DestIPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IPsec.Filter.{i}.DestMask",
@@ -18783,19 +19995,19 @@
     "path": "Device.IPsec.Filter.{i}.DestPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.IPsec.Filter.{i}.DestPortExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IPsec.Filter.{i}.DestPortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.IPsec.Filter.{i}.Enable",
@@ -18831,13 +20043,13 @@
     "path": "Device.IPsec.Filter.{i}.Protocol",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.IPsec.Filter.{i}.ProtocolExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IPsec.Filter.{i}.SourceIP",
@@ -18849,7 +20061,7 @@
     "path": "Device.IPsec.Filter.{i}.SourceIPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IPsec.Filter.{i}.SourceMask",
@@ -18861,19 +20073,19 @@
     "path": "Device.IPsec.Filter.{i}.SourcePort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.IPsec.Filter.{i}.SourcePortExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IPsec.Filter.{i}.SourcePortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.IPsec.Filter.{i}.Status",
@@ -18903,31 +20115,31 @@
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.CreationTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.InboundSPI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.OutboundSPI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.Stats.DecryptionErrors",
@@ -18939,7 +20151,7 @@
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.Stats.IntegrityErrors",
@@ -18957,13 +20169,13 @@
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ChildSA.{i}.Stats.PolicyErrors",
@@ -18993,7 +20205,7 @@
     "path": "Device.IPsec.IKEv2SA.{i}.CreationTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.DiffieHellmanGroupTransform",
@@ -19041,13 +20253,13 @@
     "path": "Device.IPsec.IKEv2SA.{i}.ReceivedCPAttr.{i}.Type",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ReceivedCPAttr.{i}.Value",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.ReceivedCPAttrNumberOfEntries",
@@ -19065,13 +20277,13 @@
     "path": "Device.IPsec.IKEv2SA.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.Stats.DecryptionErrors",
@@ -19083,7 +20295,7 @@
     "path": "Device.IPsec.IKEv2SA.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.Stats.IntegrityErrors",
@@ -19101,13 +20313,13 @@
     "path": "Device.IPsec.IKEv2SA.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.IKEv2SA.{i}.Status",
@@ -19131,31 +20343,37 @@
     "path": "Device.IPsec.IKEv2SupportedEncryptionAlgorithms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.IPsec.IKEv2SupportedIDTypes",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.IKEv2SupportedPseudoRandomFunctions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.MaxFilterEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.MaxProfileEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.Profile.{i}.AHAllowedIntegrityAlgorithms",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Profile.{i}.Alias",
@@ -19179,13 +20397,13 @@
     "path": "Device.IPsec.Profile.{i}.ChildSATimeLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.Profile.{i}.ChildSATrafficLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.Profile.{i}.DoNotFragment",
@@ -19197,49 +20415,55 @@
     "path": "Device.IPsec.Profile.{i}.DSCPMarkPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.IPsec.Profile.{i}.ESPAllowedEncryptionAlgorithms",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Profile.{i}.ESPAllowedIntegrityAlgorithms",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Profile.{i}.ForwardingPolicy",
     "writable": true,
     "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.IPsec.Profile.{i}.HardwareOffload",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.IPsec.Profile.{i}.IKEv2AllowedDiffieHellmanGroupTransforms",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Profile.{i}.IKEv2AllowedEncryptionAlgorithms",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Profile.{i}.IKEv2AllowedIntegrityAlgorithms",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Profile.{i}.IKEv2AllowedPseudoRandomFunctions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Profile.{i}.IKEv2AuthenticationMethod",
@@ -19253,12 +20477,42 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.IPsec.Profile.{i}.IKEv2LocalID",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IPsec.Profile.{i}.IKEv2LocalIDType",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.IPsec.Profile.{i}.IKEv2NATTKeepaliveTimeout",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.IPsec.Profile.{i}.IKEv2RemoteAuthenticationMethod",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IPsec.Profile.{i}.IKEv2RemoteID",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IPsec.Profile.{i}.IKEv2RemoteIDType",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.IPsec.Profile.{i}.IKEv2SAExpiryAction",
     "writable": true,
@@ -19269,19 +20523,19 @@
     "path": "Device.IPsec.Profile.{i}.IKEv2SATimeLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.Profile.{i}.IKEv2SATrafficLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.Profile.{i}.MaxChildSAs",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.Profile.{i}.Protocol",
@@ -19293,7 +20547,7 @@
     "path": "Device.IPsec.Profile.{i}.RemoteEndpoints",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Profile.{i}.SentCPAttr.{i}.Alias",
@@ -19311,13 +20565,13 @@
     "path": "Device.IPsec.Profile.{i}.SentCPAttr.{i}.Type",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.Profile.{i}.SentCPAttr.{i}.Value",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.IPsec.Profile.{i}.SentCPAttrNumberOfEntries",
@@ -19331,17 +20585,47 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.IPsec.Secret.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IPsec.Secret.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.IPsec.Secret.{i}.KeyPassphrase",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.IPsec.Secret.{i}.PreSharedKey",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.IPsec.SecretNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.IPsec.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.Stats.DecryptionErrors",
@@ -19353,7 +20637,7 @@
     "path": "Device.IPsec.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.Stats.IntegrityErrors",
@@ -19365,7 +20649,7 @@
     "path": "Device.IPsec.Stats.NegotiationFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.IPsec.Stats.OtherReceiveErrors",
@@ -19377,13 +20661,13 @@
     "path": "Device.IPsec.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.IPsec.Stats.PolicyErrors",
@@ -19413,13 +20697,13 @@
     "path": "Device.IPsec.SupportedDiffieHellmanGroupTransforms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.SupportedIntegrityAlgorithms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Tunnel.{i}.Alias",
@@ -19431,7 +20715,7 @@
     "path": "Device.IPsec.Tunnel.{i}.Filters",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPsec.Tunnel.{i}.Stats.DecryptionErrors",
@@ -19503,13 +20787,13 @@
     "path": "Device.IPv6rd.InterfaceSetting.{i}.AllTrafficToBorderRelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.IPv6rd.InterfaceSetting.{i}.BorderRelayIPv4Addresses",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.IPv6rd.InterfaceSetting.{i}.Enable",
@@ -19563,13 +20847,13 @@
     "path": "Device.L2TPv3.Filter.{i}.AllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.L2TPv3.Filter.{i}.DSCPMarkPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.L2TPv3.Filter.{i}.Enable",
@@ -19599,13 +20883,13 @@
     "path": "Device.L2TPv3.Filter.{i}.VLANIDCheck",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.L2TPv3.Filter.{i}.VLANIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.L2TPv3.FilterNumberOfEntries",
@@ -19629,7 +20913,7 @@
     "path": "Device.L2TPv3.Tunnel.{i}.DefaultDSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.DeliveryHeaderProtocol",
@@ -19653,7 +20937,7 @@
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Cookie",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.CookiePolicy",
@@ -19661,6 +20945,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Enable",
     "writable": true,
@@ -19669,19 +20959,19 @@
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -19689,91 +20979,91 @@
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.SessionID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.DiscardChecksumReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.DiscardSequenceNumberReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.Reset",
@@ -19785,29 +21075,29 @@
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Interface.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.InterfaceNumberOfEntries",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
@@ -19821,7 +21111,7 @@
     "path": "Device.L2TPv3.Tunnel.{i}.KeepAliveThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.KeepAliveTimeout",
@@ -19833,55 +21123,55 @@
     "path": "Device.L2TPv3.Tunnel.{i}.RemoteEndpoints",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Stats.KeepAliveReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Stats.KeepAliveSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.Status",
@@ -19899,7 +21189,7 @@
     "path": "Device.L2TPv3.Tunnel.{i}.UDP.EnableChecksum",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.L2TPv3.Tunnel.{i}.UDP.RemotePort",
@@ -19929,7 +21219,7 @@
     "path": "Device.LEDs.BrightnessLimiter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LEDs.LED.{i}.Alias",
@@ -19938,11 +21228,17 @@
     "type": "xsd:string"
   },
   {
-    "path": "Device.LEDs.LED.{i}.CurrentCycleElement.Color",
+    "path": "Device.LEDs.LED.{i}.ControllingPeripheral",
     "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.LEDs.LED.{i}.CurrentCycleElement.Color",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
   {
     "path": "Device.LEDs.LED.{i}.CurrentCycleElement.CycleElementReference",
     "writable": false,
@@ -19965,13 +21261,13 @@
     "path": "Device.LEDs.LED.{i}.CycleElement.{i}.Brightness",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LEDs.LED.{i}.CycleElement.{i}.Color",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.LEDs.LED.{i}.CycleElement.{i}.Duration",
@@ -19995,7 +21291,7 @@
     "path": "Device.LEDs.LED.{i}.CycleElement.{i}.Order",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LEDs.LED.{i}.CycleElementNumberOfEntries",
@@ -20007,7 +21303,7 @@
     "path": "Device.LEDs.LED.{i}.CyclePeriodRepetitions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LEDs.LED.{i}.Enable",
@@ -20025,7 +21321,7 @@
     "path": "Device.LEDs.LED.{i}.MaxBrightness",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LEDs.LED.{i}.Name",
@@ -20043,13 +21339,13 @@
     "path": "Device.LEDs.LED.{i}.RelativeXPosition",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LEDs.LED.{i}.RelativeYPosition",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LEDs.LED.{i}.Status",
@@ -20073,13 +21369,13 @@
     "path": "Device.LLDP.Discovery.Device.{i}.ChassisIDSubtype",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.DeviceInformation.DeviceCategory",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.DeviceInformation.ManufacturerOUI",
@@ -20109,7 +21405,7 @@
     "path": "Device.LLDP.Discovery.Device.{i}.DeviceInformation.VendorSpecific.{i}.InformationType",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.DeviceInformation.VendorSpecific.{i}.OrganizationCode",
@@ -20127,7 +21423,7 @@
     "path": "Device.LLDP.Discovery.Device.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.Interface",
@@ -20139,25 +21435,25 @@
     "path": "Device.LLDP.Discovery.Device.{i}.Port.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.Port.{i}.LinkInformation.InterfaceType",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.Port.{i}.LinkInformation.MACForwardingTable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.Port.{i}.MACAddressList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.Port.{i}.PortDescription",
@@ -20175,7 +21471,7 @@
     "path": "Device.LLDP.Discovery.Device.{i}.Port.{i}.PortIDSubtype",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LLDP.Discovery.Device.{i}.Port.{i}.TTL",
@@ -20205,13 +21501,13 @@
     "path": "Device.LMAP.Event.{i}.CalendarTimer.EnableScheduleTimezoneOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.LMAP.Event.{i}.CalendarTimer.EndTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Event.{i}.CalendarTimer.ScheduleDaysOfMonth",
@@ -20253,19 +21549,19 @@
     "path": "Device.LMAP.Event.{i}.CalendarTimer.ScheduleTimezoneOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LMAP.Event.{i}.CalendarTimer.StartTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Event.{i}.CycleInterval",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LMAP.Event.{i}.Enable",
@@ -20283,13 +21579,13 @@
     "path": "Device.LMAP.Event.{i}.OneOff.StartTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Event.{i}.PeriodicTimer.EndTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Event.{i}.PeriodicTimer.Interval",
@@ -20301,13 +21597,13 @@
     "path": "Device.LMAP.Event.{i}.PeriodicTimer.StartTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Event.{i}.RandomnessSpread",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LMAP.Event.{i}.Type",
@@ -20331,7 +21627,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.CapabilityTags",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.CommunicationChannel.{i}.Alias",
@@ -20379,7 +21675,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.CommunicationChannel.{i}.UseBulkDataProfile",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.CommunicationChannelNumberOfEntries",
@@ -20391,25 +21687,25 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Controller.ControlChannels",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Controller.ControllerTimeout",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Controller.ControlSchedules",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Controller.ControlTasks",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Enable",
@@ -20451,19 +21747,19 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.InstructionSchedules",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.InstructionTasks",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.MeasurementSuppression.{i}.Alias",
@@ -20505,13 +21801,13 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.MeasurementSuppression.{i}.StopRunning",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.MeasurementSuppression.{i}.SuppressionMatch",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.MeasurementSuppressionNumberOfEntries",
@@ -20523,7 +21819,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Instruction.{i}.ReportChannels",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.InstructionNumberOfEntries",
@@ -20535,7 +21831,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.LastStarted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.MeasurementPoint",
@@ -20571,7 +21867,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.LastFailedCompletion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.LastFailedMessage",
@@ -20583,19 +21879,19 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.LastFailedStatusCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.LastInvocation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.LastSuccessfulCompletion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.LastSuccessfulMessage",
@@ -20607,7 +21903,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.LastSuccessfulStatusCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Option.{i}.Alias",
@@ -20631,7 +21927,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Option.{i}.Order",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Option.{i}.Value",
@@ -20649,13 +21945,13 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Order",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.OutputDestination",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.State",
@@ -20667,43 +21963,43 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Stats.Failures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Stats.Invocations",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Stats.Overlaps",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Stats.Suppressions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Storage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.SuppressionTags",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Tags",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Action.{i}.Task",
@@ -20751,7 +22047,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.LastInvocation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Name",
@@ -20775,43 +22071,43 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Stats.Failures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Stats.Invocations",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Stats.Overlaps",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Stats.Suppressions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Storage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.SuppressionTags",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Schedule.{i}.Tags",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.ScheduleNumberOfEntries",
@@ -20859,7 +22155,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Task.{i}.Option.{i}.Order",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Task.{i}.Option.{i}.Value",
@@ -20895,7 +22191,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Task.{i}.Registry.{i}.Roles",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Task.{i}.RegistryNumberOfEntries",
@@ -20907,7 +22203,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.Task.{i}.Tags",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.TaskCapability.{i}.Name",
@@ -20925,7 +22221,7 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.TaskCapability.{i}.Registry.{i}.Roles",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.TaskCapability.{i}.TaskCapabilityRegistryNumberOfEntries",
@@ -20955,19 +22251,19 @@
     "path": "Device.LMAP.MeasurementAgent.{i}.UseAgentIdentifierInReports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.UseGroupIdentifierInReports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.UseMeasurementPointInReports",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.LMAP.MeasurementAgent.{i}.Version",
@@ -21003,7 +22299,7 @@
     "path": "Device.LMAP.Report.{i}.ReportDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.ActionName",
@@ -21039,25 +22335,25 @@
     "path": "Device.LMAP.Report.{i}.Result.{i}.EndTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.EventTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.Option.{i}.Name",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.Option.{i}.Order",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.Option.{i}.Value",
@@ -21075,7 +22371,7 @@
     "path": "Device.LMAP.Report.{i}.Result.{i}.ReportTable.{i}.ColumnLabels",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.ReportTable.{i}.Registry.{i}.RegistryEntry",
@@ -21087,7 +22383,7 @@
     "path": "Device.LMAP.Report.{i}.Result.{i}.ReportTable.{i}.Registry.{i}.Roles",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.ReportTable.{i}.RegistryNumberOfEntries",
@@ -21105,7 +22401,7 @@
     "path": "Device.LMAP.Report.{i}.Result.{i}.ReportTable.{i}.ResultRow.{i}.Values",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.ResultConflictNumberOfEntries",
@@ -21129,19 +22425,19 @@
     "path": "Device.LMAP.Report.{i}.Result.{i}.StartTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.Status",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.Tags",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.LMAP.Report.{i}.Result.{i}.TaskName",
@@ -21167,6 +22463,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Logical.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Logical.Interface.{i}.Enable",
     "writable": true,
@@ -21175,15 +22477,15 @@
   },
   {
     "path": "Device.Logical.Interface.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Logical.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Logical.Interface.{i}.Name",
@@ -21195,73 +22497,73 @@
     "path": "Device.Logical.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.Reset",
@@ -21273,23 +22575,23 @@
     "path": "Device.Logical.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Logical.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Logical.Interface.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -21300,28 +22602,316 @@
     "type": "xsd:unsignedInt"
   },
   {
-    "path": "Device.ManagementServer.AliasBasedAddressing",
+    "path": "Device.Logical.TAP.Interface.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.LastChange",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.LowerLayers",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Name",
     "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
-    "path": "Device.ManagementServer.AllowAllIPv4",
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.BroadcastPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.BroadcastPacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.BytesReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.BytesSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.DiscardPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.DiscardPacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.ErrorsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.ErrorsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.MulticastPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.MulticastPacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.PacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.PacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.Reset",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.UnicastPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.UnicastPacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Stats.UnknownProtoPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TAP.Interface.{i}.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Logical.TAP.InterfaceNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Alias",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.LastChange",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.LowerLayers",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Name",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.BroadcastPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.BroadcastPacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.BytesReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.BytesSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.DiscardPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.DiscardPacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.ErrorsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.ErrorsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.MulticastPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.MulticastPacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.PacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.PacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.Reset",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.UnicastPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.UnicastPacketsSent",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedLong"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Stats.UnknownProtoPacketsReceived",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.Logical.TUN.Interface.{i}.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.Logical.TUN.InterfaceNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.ManagementServer.AliasBasedAddressing",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.ManagementServer.AllowAllIPv4",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.ManagementServer.AllowAllIPv6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.AutoCreateInstances",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.AutonomousTransferCompletePolicy.Enable",
@@ -21333,7 +22923,7 @@
     "path": "Device.ManagementServer.AutonomousTransferCompletePolicy.FileTypeFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.AutonomousTransferCompletePolicy.ResultTypeFilter",
@@ -21369,7 +22959,7 @@
     "path": "Device.ManagementServer.ConnReqAllowedJabberIDs",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.ConnReqJabberID",
@@ -21387,7 +22977,7 @@
     "path": "Device.ManagementServer.CWMPRetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ManagementServer.CWMPRetryMinimumWaitInterval",
@@ -21399,19 +22989,19 @@
     "path": "Device.ManagementServer.DefaultActiveNotificationThrottle",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ManagementServer.DelayReboot",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ManagementServer.DeliveredEvents",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.DownloadAvailability.Announcement.Enable",
@@ -21489,13 +23079,13 @@
     "path": "Device.ManagementServer.DUStateChangeComplPolicy.FaultCodeFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.DUStateChangeComplPolicy.OperationTypeFilter",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.DUStateChangeComplPolicy.ResultTypeFilter",
@@ -21525,25 +23115,25 @@
     "path": "Device.ManagementServer.EmbeddedDevice.{i}.DiscoveryProtocol",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.EmbeddedDevice.{i}.DiscoveryProtocolReference",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.EmbeddedDevice.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.EmbeddedDevice.{i}.LastSyncTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.ManagementServer.EmbeddedDevice.{i}.ProxiedDeviceID",
@@ -21573,7 +23163,7 @@
     "path": "Device.ManagementServer.EmbeddedDevice.{i}.SupportedDataModel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.EmbeddedDeviceNumberOfEntries",
@@ -21585,7 +23175,7 @@
     "path": "Device.ManagementServer.EnableCWMP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.HeartbeatPolicy.Enable",
@@ -21597,7 +23187,7 @@
     "path": "Device.ManagementServer.HeartbeatPolicy.InitiationTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.ManagementServer.HeartbeatPolicy.ReportingInterval",
@@ -21615,7 +23205,7 @@
     "path": "Device.ManagementServer.HTTPCompressionSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.HTTPConnectionRequestEnable",
@@ -21639,7 +23229,7 @@
     "path": "Device.ManagementServer.InformParameter.{i}.EventList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.InformParameter.{i}.ParameterName",
@@ -21663,19 +23253,19 @@
     "path": "Device.ManagementServer.InstanceWildcardsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.IPv4AllowedSourcePrefix",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.IPv6AllowedSourcePrefix",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.KickURL",
@@ -21687,13 +23277,13 @@
     "path": "Device.ManagementServer.LightweightNotificationProtocolsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.LightweightNotificationProtocolsUsed",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.LightweightNotificationTriggerInterval",
@@ -21705,7 +23295,7 @@
     "path": "Device.ManagementServer.LightweightNotificationTriggerTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.ManagementServer.ManageableDevice.{i}.Alias",
@@ -21717,7 +23307,7 @@
     "path": "Device.ManagementServer.ManageableDevice.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.ManageableDevice.{i}.ManufacturerOUI",
@@ -21741,7 +23331,7 @@
     "path": "Device.ManagementServer.ManageableDeviceNotificationLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ManagementServer.ManageableDeviceNumberOfEntries",
@@ -21753,7 +23343,7 @@
     "path": "Device.ManagementServer.NATDetected",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.ParameterKey",
@@ -21771,7 +23361,7 @@
     "path": "Device.ManagementServer.PendingScheduleInforms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime[]"
   },
   {
     "path": "Device.ManagementServer.PeriodicInformEnable",
@@ -21789,13 +23379,13 @@
     "path": "Device.ManagementServer.PeriodicInformTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.ManagementServer.ScheduleReboot",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.ManagementServer.SessionStatus",
@@ -21807,49 +23397,49 @@
     "path": "Device.ManagementServer.StandbyPolicy.CRAwarenessRequested",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.StandbyPolicy.CRUnawarenessMaxDuration",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ManagementServer.StandbyPolicy.MaxMissedPeriodic",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ManagementServer.StandbyPolicy.NetworkAwarenessCapable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.StandbyPolicy.NotifyMissedScheduled",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.StandbyPolicy.PeriodicAwarenessRequested",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.StandbyPolicy.ScheduledAwarenessRequested",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.StandbyPolicy.SelfTimerCapable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.STUNEnable",
@@ -21861,13 +23451,13 @@
     "path": "Device.ManagementServer.STUNMaximumKeepAlivePeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.ManagementServer.STUNMinimumKeepAlivePeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ManagementServer.STUNPassword",
@@ -21897,7 +23487,7 @@
     "path": "Device.ManagementServer.SupportedConnReqMethods",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.UDPConnectionRequestAddress",
@@ -21921,13 +23511,13 @@
     "path": "Device.ManagementServer.UpgradePending",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.UpgradesManaged",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ManagementServer.URL",
@@ -21945,19 +23535,19 @@
     "path": "Device.ManagementServer.VirtualDevice.{i}.DiscoveryProtocol",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.VirtualDevice.{i}.DiscoveryProtocolReference",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.VirtualDevice.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ManagementServer.VirtualDevice.{i}.ManufacturerOUI",
@@ -22011,7 +23601,7 @@
     "path": "Device.MAP.Domain.{i}.DSCPMarkPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MAP.Domain.{i}.Enable",
@@ -22023,7 +23613,7 @@
     "path": "Device.MAP.Domain.{i}.IncludeSystemPorts",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Alias",
@@ -22031,6 +23621,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.MAP.Domain.{i}.Interface.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Enable",
     "writable": true,
@@ -22041,13 +23637,13 @@
     "path": "Device.MAP.Domain.{i}.Interface.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Name",
@@ -22059,73 +23655,73 @@
     "path": "Device.MAP.Domain.{i}.Interface.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.Reset",
@@ -22137,19 +23733,19 @@
     "path": "Device.MAP.Domain.{i}.Interface.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Interface.Status",
@@ -22167,7 +23763,7 @@
     "path": "Device.MAP.Domain.{i}.PSID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.PSIDLength",
@@ -22179,7 +23775,7 @@
     "path": "Device.MAP.Domain.{i}.PSIDOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Rule.{i}.Alias",
@@ -22203,7 +23799,7 @@
     "path": "Device.MAP.Domain.{i}.Rule.{i}.IncludeSystemPorts",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MAP.Domain.{i}.Rule.{i}.IPv4Prefix",
@@ -22221,7 +23817,7 @@
     "path": "Device.MAP.Domain.{i}.Rule.{i}.IsFMR",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MAP.Domain.{i}.Rule.{i}.Origin",
@@ -22233,7 +23829,7 @@
     "path": "Device.MAP.Domain.{i}.Rule.{i}.PSID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Rule.{i}.PSIDLength",
@@ -22245,7 +23841,7 @@
     "path": "Device.MAP.Domain.{i}.Rule.{i}.PSIDOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MAP.Domain.{i}.Rule.{i}.Status",
@@ -22293,13 +23889,13 @@
     "path": "Device.MoCA.Interface.{i}.AbovePhyThresholdTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Aca.Channel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Aca.DiagnosticsState",
@@ -22317,13 +23913,13 @@
     "path": "Device.MoCA.Interface.{i}.Aca.PowerProfile",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Aca.ReportNodeMask",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Aca.TotalRxPower",
@@ -22365,7 +23961,7 @@
     "path": "Device.MoCA.Interface.{i}.AeNumber",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AggregationSize",
@@ -22389,7 +23985,7 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.AeNumber",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.AggregationSize",
@@ -22401,19 +23997,19 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.BondingCapable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.EgressNodeNumFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.EnhancedPrivacyCapable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.HighestVersion",
@@ -22425,7 +24021,7 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.IngressNodeNumFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.LinkType",
@@ -22443,7 +24039,7 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.Moca25PhyCapable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.NodeID",
@@ -22455,13 +24051,13 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.PacketAggregationCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.PDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.PHYRxRate",
@@ -22491,13 +24087,13 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.PreferredNC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.QAM256Capable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.RxBcastPowerLevel",
@@ -22509,7 +24105,7 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.RxCorrected",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.RxErroredAndMissedPackets",
@@ -22521,13 +24117,13 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.RxPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.RxPowerLevel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.RxPwrList",
@@ -22551,31 +24147,31 @@
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.SupportedEgressPqosFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.SupportedIngressPqosFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.TxBcastRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.TxDrops",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.TxPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.AssociatedDevice.{i}.TxPowerControlReduction",
@@ -22605,7 +24201,7 @@
     "path": "Device.MoCA.Interface.{i}.AvbSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.BackupNC",
@@ -22623,7 +24219,7 @@
     "path": "Device.MoCA.Interface.{i}.BeaconPowerDistributed",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MoCA.Interface.{i}.BeaconPowerLimit",
@@ -22635,37 +24231,37 @@
     "path": "Device.MoCA.Interface.{i}.BeaconPowerLocal",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MoCA.Interface.{i}.BeaconPowerMePie",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.BeaconPowerMePieSend",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.BeaconPowerNetConfig",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.BelowPhyThresholdTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Bridge.{i}.MACAddresses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Bridge.{i}.NodeIndex",
@@ -22683,31 +24279,31 @@
     "path": "Device.MoCA.Interface.{i}.ConnectedNodesChangeTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.ConnectedNodesChangeTrapEn",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.ConnectedNodesDropReason",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.ConnectedNodesInfo",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.CurrentOperFreq",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.CurrentVersion",
@@ -22715,6 +24311,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.MoCA.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.MoCA.Interface.{i}.Enable",
     "writable": true,
@@ -22737,7 +24339,7 @@
     "path": "Device.MoCA.Interface.{i}.FirstOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MoCA.Interface.{i}.FreqCapabilityMask",
@@ -22779,13 +24381,13 @@
     "path": "Device.MoCA.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.LastOperFreq",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.LastOperFreqUpdateEnable",
@@ -22803,13 +24405,13 @@
     "path": "Device.MoCA.Interface.{i}.LinkFailureTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.LinkState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.LmoNodeID",
@@ -22821,7 +24423,7 @@
     "path": "Device.MoCA.Interface.{i}.LmoStatusTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.LmoTrapEnable",
@@ -22833,7 +24435,7 @@
     "path": "Device.MoCA.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MACAddress",
@@ -22863,7 +24465,7 @@
     "path": "Device.MoCA.Interface.{i}.MaxNodes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Mesh.{i}.LinkType",
@@ -22875,13 +24477,13 @@
     "path": "Device.MoCA.Interface.{i}.Mesh.{i}.Power",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Mesh.{i}.PowerReduction",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Mesh.{i}.RxNodeIndex",
@@ -22893,7 +24495,7 @@
     "path": "Device.MoCA.Interface.{i}.Mesh.{i}.RxSNR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Mesh.{i}.TxNodeIndex",
@@ -22905,7 +24507,7 @@
     "path": "Device.MoCA.Interface.{i}.Mesh.{i}.TxRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Mesh.{i}.TxRateNper",
@@ -22983,91 +24585,91 @@
     "path": "Device.MoCA.Interface.{i}.MgntEntityNetIePayloadRx",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MgntEntityNetIePayloadTx",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MgntEntityNetwIePayloadRecTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MgntEntityNetwIePayloadRecTrapEn",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Moca25PhyCapable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsInitScanPayload",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsInitScanRecTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsPairFailTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsPrivacyChangedTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsPrivacyDown",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsPrivacyReceive",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsReset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsTrapEn",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsTriggered",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MpsUnpairedTime",
@@ -23085,25 +24687,25 @@
     "path": "Device.MoCA.Interface.{i}.MrNetworkFailTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MrNetworkSuccessTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MrRstFailTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.MrRstSuccessTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Name",
@@ -23115,13 +24717,13 @@
     "path": "Device.MoCA.Interface.{i}.NcPrivacySupportedRecTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NcPrivSupportedRecTrapEn",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NcVersion",
@@ -23139,7 +24741,7 @@
     "path": "Device.MoCA.Interface.{i}.NetworkJoin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NetworkNameAdmissionRule",
@@ -23157,19 +24759,19 @@
     "path": "Device.MoCA.Interface.{i}.NetworkNamePayload",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NetworkNameRecTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NetworkNameRecTrapEn",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NetworkState",
@@ -23187,31 +24789,31 @@
     "path": "Device.MoCA.Interface.{i}.NodeDropAdmFailureTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NodeDropMpsTriggeredTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NodeDropNcChgTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NodeDropNcTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NodeDropTrapEn",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NodeID",
@@ -23229,13 +24831,13 @@
     "path": "Device.MoCA.Interface.{i}.NumChannels",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NumNodes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.NumNodesChangeEnable",
@@ -23247,31 +24849,31 @@
     "path": "Device.MoCA.Interface.{i}.NumNodesChangeTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PacketAggregationCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PasswordHash",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Per25Mode",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PerMode",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PhyThreshold",
@@ -23301,7 +24903,7 @@
     "path": "Device.MoCA.Interface.{i}.PowerStateBcstRecTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PowerStateCap",
@@ -23313,19 +24915,19 @@
     "path": "Device.MoCA.Interface.{i}.PowerStateM0NcTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PowerStateNc1xTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PowerStateNetVerTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PowerStateRequest",
@@ -23337,13 +24939,13 @@
     "path": "Device.MoCA.Interface.{i}.PowerStateResp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PowerStateRespTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PowerStateStatus",
@@ -23361,37 +24963,37 @@
     "path": "Device.MoCA.Interface.{i}.PowerStateTrnsReqTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PowerStateUcstPenTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PowerStateWupUrTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PreferredNC",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PrimaryChannelOffset",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PrimaryOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PrivacyEnabled",
@@ -23403,43 +25005,43 @@
     "path": "Device.MoCA.Interface.{i}.PrivacyEnabledSetting",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PrivacyNc",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MoCA.Interface.{i}.PrivacySupported",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QAM256Capable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.EgressNumFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.Dfid",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.DscpMoca",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.EgressGuid",
@@ -23463,7 +25065,7 @@
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.FlowPer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.IngressClassify",
@@ -23487,7 +25089,7 @@
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.LeaseTimeLeft",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.MaxBurstSize",
@@ -23499,7 +25101,7 @@
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.MaximumLatency",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.MaxRate",
@@ -23517,19 +25119,19 @@
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.ShortTermAvgRatio",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.Tag",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStats.{i}.VlanTag",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.QoS.FlowStatsNumberOfEntries",
@@ -23541,7 +25143,7 @@
     "path": "Device.MoCA.Interface.{i}.QoS.IngressNumFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Reset.NetworkTrapEnable",
@@ -23553,7 +25155,7 @@
     "path": "Device.MoCA.Interface.{i}.Reset.NodeMask",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Reset.StartTime",
@@ -23589,25 +25191,25 @@
     "path": "Device.MoCA.Interface.{i}.Rlapm.{i}.Frequency",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Rlapm.{i}.GlobalAggrRxPwrLevel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Rlapm.{i}.PhyMargin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Rlapm.{i}.Profile",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Rlapm.{i}.Status",
@@ -23631,13 +25233,13 @@
     "path": "Device.MoCA.Interface.{i}.RlapmProfileSelect",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Sapm.{i}.AggrRxPwrLevelThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Sapm.{i}.Enable",
@@ -23649,19 +25251,19 @@
     "path": "Device.MoCA.Interface.{i}.Sapm.{i}.Frequency",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Sapm.{i}.PhyMargin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Sapm.{i}.Profile",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Sapm.{i}.Status",
@@ -23685,97 +25287,97 @@
     "path": "Device.MoCA.Interface.{i}.SapmProfileSelect",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.SecondaryChannelOffset",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MoCA.Interface.{i}.SecondaryOffset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MoCA.Interface.{i}.SeqNumMr",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.Reset",
@@ -23787,25 +25389,25 @@
     "path": "Device.MoCA.Interface.{i}.Stats.RxCorrectedErrors",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.Status",
@@ -23823,7 +25425,7 @@
     "path": "Device.MoCA.Interface.{i}.StatusChangeTrap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.SupportedBands",
@@ -23835,25 +25437,25 @@
     "path": "Device.MoCA.Interface.{i}.SupportedEgressPqosFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.SupportedIngressPqosFlows",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.TlpMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.TlpMin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MoCA.Interface.{i}.TpcEnable",
@@ -23871,13 +25473,13 @@
     "path": "Device.MoCA.Interface.{i}.TrafficPermissionEthertype",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.TrafficPermissionLink",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.MoCA.Interface.{i}.TurboModeEnable",
@@ -23895,7 +25497,7 @@
     "path": "Device.MoCA.Interface.{i}.TxBcastRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.MoCA.Interface.{i}.TxPowerLimit",
@@ -23907,7 +25509,7 @@
     "path": "Device.MoCA.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MoCA.InterfaceNumberOfEntries",
@@ -23915,12 +25517,30 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.MQTT.Broker.{i}.ACLList",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
   {
     "path": "Device.MQTT.Broker.{i}.Alias",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.MQTT.Broker.{i}.AllowAnonymous",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.MQTT.Broker.{i}.AuthenticationMethod",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.Alias",
     "writable": true,
@@ -23939,17 +25559,23 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.MQTT.Broker.{i}.Bridge.{i}.CipherList",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
   {
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.CleanSession",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.CleanStart",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.ClientID",
@@ -23973,7 +25599,7 @@
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.ForceReconnect",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.KeepAliveTime",
@@ -24027,7 +25653,7 @@
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.Server.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.Server.{i}.Port",
@@ -24045,7 +25671,7 @@
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.Server.{i}.Weight",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:long"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.ServerConnection",
@@ -24099,7 +25725,7 @@
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.Subscription.{i}.QoS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Bridge.{i}.Subscription.{i}.RemotePrefix",
@@ -24143,6 +25769,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.MQTT.Broker.{i}.BrokerID",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.MQTT.Broker.{i}.CABundle",
     "writable": true,
@@ -24155,6 +25787,18 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.MQTT.Broker.{i}.CipherList",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.MQTT.Broker.{i}.ConfFile",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.MQTT.Broker.{i}.Enable",
     "writable": true,
@@ -24171,7 +25815,7 @@
     "path": "Device.MQTT.Broker.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Name",
@@ -24191,6 +25835,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.MQTT.Broker.{i}.Process",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.MQTT.Broker.{i}.Stats.ConnectionErrors",
     "writable": false,
@@ -24201,25 +25851,25 @@
     "path": "Device.MQTT.Broker.{i}.Stats.MQTTMessagesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Stats.MQTTMessagesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Stats.NumberOfActiveClients",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Stats.NumberOfInactiveClients",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Stats.PublishErrors",
@@ -24231,25 +25881,25 @@
     "path": "Device.MQTT.Broker.{i}.Stats.PublishReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Stats.PublishSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Stats.Subscriptions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Stats.TotalNumberOfClients",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Broker.{i}.Status",
@@ -24275,35 +25925,143 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.Access",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.AllowAnonymous",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.ClientList",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.Operations",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.Order",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACL.{i}.Topics",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ACLNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.Client.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.Client.{i}.ClientID",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.Client.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.Client.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.Client.{i}.Name",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.Client.{i}.Password",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.Client.{i}.Username",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.MQTT.BrokerSecurity.ClientNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.MQTT.Capabilities.MaxNumberOfBrokerBridges",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Capabilities.MaxNumberOfBrokerBridgeSubscriptions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Capabilities.MaxNumberOfClientSubscriptions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Capabilities.ProtocolVersionsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MQTT.Capabilities.TransportProtocolSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MQTT.Client.{i}.Alias",
@@ -24315,7 +26073,7 @@
     "path": "Device.MQTT.Client.{i}.ALPN",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MQTT.Client.{i}.AuthenticationMethod",
@@ -24347,17 +26105,23 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.MQTT.Client.{i}.CipherList",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
   {
     "path": "Device.MQTT.Client.{i}.CleanSession",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Client.{i}.CleanStart",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Client.{i}.ClientID",
@@ -24369,7 +26133,7 @@
     "path": "Device.MQTT.Client.{i}.ConnectRetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Client.{i}.ConnectRetryMaxInterval",
@@ -24393,13 +26157,13 @@
     "path": "Device.MQTT.Client.{i}.EnableEncryption",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Client.{i}.ForceReconnect",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Client.{i}.Interface",
@@ -24411,7 +26175,7 @@
     "path": "Device.MQTT.Client.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.MQTT.Client.{i}.KeepAliveTime",
@@ -24459,19 +26223,19 @@
     "path": "Device.MQTT.Client.{i}.ReceiveMaximum",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Client.{i}.RequestProblemInfo",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Client.{i}.RequestResponseInfo",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Client.{i}.ResponseInformation",
@@ -24489,7 +26253,7 @@
     "path": "Device.MQTT.Client.{i}.Stats.BrokerConnectionEstablished",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.MQTT.Client.{i}.Stats.ConnectionErrors",
@@ -24501,25 +26265,25 @@
     "path": "Device.MQTT.Client.{i}.Stats.LastPublishMessageReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.MQTT.Client.{i}.Stats.LastPublishMessageSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.MQTT.Client.{i}.Stats.MQTTMessagesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Client.{i}.Stats.MQTTMessagesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Client.{i}.Stats.PublishErrors",
@@ -24531,25 +26295,25 @@
     "path": "Device.MQTT.Client.{i}.Stats.PublishReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Client.{i}.Stats.PublishSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Client.{i}.Stats.SubscribeSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Client.{i}.Stats.UnSubscribeSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.MQTT.Client.{i}.Status",
@@ -24573,7 +26337,7 @@
     "path": "Device.MQTT.Client.{i}.Subscription.{i}.QoS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Client.{i}.Subscription.{i}.Status",
@@ -24597,7 +26361,7 @@
     "path": "Device.MQTT.Client.{i}.TopicAliasMaximum",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Client.{i}.TransportProtocol",
@@ -24633,7 +26397,7 @@
     "path": "Device.MQTT.Client.{i}.UserProperty.{i}.PacketType",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.MQTT.Client.{i}.UserProperty.{i}.Value",
@@ -24675,7 +26439,7 @@
     "path": "Device.MQTT.Client.{i}.WillQoS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.MQTT.Client.{i}.WillResponseTopic",
@@ -24687,7 +26451,7 @@
     "path": "Device.MQTT.Client.{i}.WillRetain",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.MQTT.Client.{i}.WillTopic",
@@ -24707,6 +26471,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.MQTT.LogConnectionMessages",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.NAT.InterfaceSetting.{i}.Alias",
     "writable": true,
@@ -24729,7 +26499,7 @@
     "path": "Device.NAT.InterfaceSetting.{i}.SourceNetwork",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.NAT.InterfaceSetting.{i}.Status",
@@ -24741,13 +26511,13 @@
     "path": "Device.NAT.InterfaceSetting.{i}.TCPTranslationTimeout",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.NAT.InterfaceSetting.{i}.UDPTranslationTimeout",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.NAT.InterfaceSettingNumberOfEntries",
@@ -24759,14 +26529,56 @@
     "path": "Device.NAT.MaxNumberOfPortMappings",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.NAT.MaxNumberOfPortTriggers",
     "writable": false,
     "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NAT.NPTv6.InterfaceSetting.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.NAT.NPTv6.InterfaceSetting.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.NAT.NPTv6.InterfaceSetting.{i}.ExternalPrefix",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.NAT.NPTv6.InterfaceSetting.{i}.Interface",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.NAT.NPTv6.InterfaceSetting.{i}.InternalPrefix",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.NAT.NPTv6.InterfaceSetting.{i}.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.NAT.NPTv6.InterfaceSettingNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.NAT.PortMapping.{i}.Alias",
     "writable": true,
@@ -24777,7 +26589,7 @@
     "path": "Device.NAT.PortMapping.{i}.AllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.NAT.PortMapping.{i}.Description",
@@ -24801,7 +26613,7 @@
     "path": "Device.NAT.PortMapping.{i}.ExternalPortEndRange",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.NAT.PortMapping.{i}.Interface",
@@ -24831,13 +26643,13 @@
     "path": "Device.NAT.PortMapping.{i}.Log",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.NAT.PortMapping.{i}.LogRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.NAT.PortMapping.{i}.Origin",
@@ -24867,7 +26679,7 @@
     "path": "Device.NAT.PortMapping.{i}.ScheduleRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.NAT.PortMapping.{i}.Status",
@@ -24885,7 +26697,7 @@
     "path": "Device.NAT.PortTrigger.{i}.ActivationDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.NAT.PortTrigger.{i}.Alias",
@@ -24921,13 +26733,13 @@
     "path": "Device.NAT.PortTrigger.{i}.Log",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.NAT.PortTrigger.{i}.LogRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.NAT.PortTrigger.{i}.Origin",
@@ -24945,7 +26757,7 @@
     "path": "Device.NAT.PortTrigger.{i}.PortEndRange",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.NAT.PortTrigger.{i}.Protocol",
@@ -24969,7 +26781,7 @@
     "path": "Device.NAT.PortTrigger.{i}.Rule.{i}.PortEndRange",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.NAT.PortTrigger.{i}.Rule.{i}.Protocol",
@@ -24987,7 +26799,7 @@
     "path": "Device.NAT.PortTrigger.{i}.ScheduleRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.NAT.PortTrigger.{i}.Status",
@@ -25013,11 +26825,47 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.ARP.BaseReachableTime",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.ARP.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.ARP.MaxRetries",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.ARP.ProxyARPEnable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.ARP.RetryInterval",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.ARP.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.DADTransmits",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.Enable",
@@ -25035,8 +26883,86 @@
     "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.MaxRtrSolicitations",
     "writable": true,
     "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.BaseReachableTime",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.DADTransmits",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.MaxRtrSolicitationDelay",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.MaxRtrSolicitationDuration",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.MaxRtrSolicitationInterval",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.MaxRtrSolicitations",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.NUDEnable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.RetransTimer",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.RSEnable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.RtrSolicitationInterval",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.Status",
+    "writable": false,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NDP.UnlimitedMaxRtrSolicitations",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.NUDEnable",
     "writable": true,
@@ -25047,7 +26973,7 @@
     "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.RetransTimer",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.NeighborDiscovery.InterfaceSetting.{i}.RSEnable",
@@ -25079,6 +27005,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Optical.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Optical.Interface.{i}.Enable",
     "writable": true,
@@ -25089,13 +27021,13 @@
     "path": "Device.Optical.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Optical.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Optical.Interface.{i}.LowerOpticalThreshold",
@@ -25113,7 +27045,7 @@
     "path": "Device.Optical.Interface.{i}.MaxBitRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Optical.Interface.{i}.Name",
@@ -25131,55 +27063,55 @@
     "path": "Device.Optical.Interface.{i}.SFPReferenceList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Optical.Interface.{i}.Stats.Reset",
@@ -25215,7 +27147,7 @@
     "path": "Device.Optical.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Optical.InterfaceNumberOfEntries",
@@ -25275,7 +27207,7 @@
     "path": "Device.PacketCaptureDiagnostics.PacketCaptureResult.{i}.EndTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PacketCaptureDiagnostics.PacketCaptureResult.{i}.FileLocation",
@@ -25287,7 +27219,7 @@
     "path": "Device.PacketCaptureDiagnostics.PacketCaptureResult.{i}.StartTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PacketCaptureDiagnostics.PacketCaptureResultNumberOfEntries",
@@ -25353,7 +27285,7 @@
     "path": "Device.PCP.Client.{i}.PCPProxy.HighestVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.PCPProxy.Status",
@@ -25371,7 +27303,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.AdditionalServerAddresses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.Alias",
@@ -25383,13 +27315,13 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.Capabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.CurrentVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.Enable",
@@ -25425,7 +27357,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.AssignedExternalPortEndRange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.Description",
@@ -25443,7 +27375,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.ErrorCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.Filter.{i}.Alias",
@@ -25473,7 +27405,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.Filter.{i}.RemotePortEndRange",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.FilterNumberOfEntries",
@@ -25491,7 +27423,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.Lifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.Origin",
@@ -25503,7 +27435,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.ProtocolNumber",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.Status",
@@ -25527,7 +27459,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.SuggestedExternalPortEndRange",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.InboundMapping.{i}.ThirdPartyAddress",
@@ -25545,7 +27477,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.MaximumFilters",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.Origin",
@@ -25587,7 +27519,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.OutboundMapping.{i}.ErrorCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.OutboundMapping.{i}.InternalPort",
@@ -25599,7 +27531,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.OutboundMapping.{i}.Lifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.OutboundMapping.{i}.Origin",
@@ -25611,7 +27543,7 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.OutboundMapping.{i}.ProtocolNumber",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.OutboundMapping.{i}.RemoteHostIPAddress",
@@ -25659,13 +27591,13 @@
     "path": "Device.PCP.Client.{i}.Server.{i}.PortQuota",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.PreferredLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.Client.{i}.Server.{i}.ServerAddressInUse",
@@ -25743,19 +27675,19 @@
     "path": "Device.PCP.OptionList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.PCP.PreferredVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PCP.SupportedVersions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.PDU.Session.{i}.Alias",
@@ -25767,7 +27699,7 @@
     "path": "Device.PDU.Session.{i}.AlwaysOn",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.PDU.Session.{i}.DNN",
@@ -25785,13 +27717,13 @@
     "path": "Device.PDU.Session.{i}.LastError",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.NetworkSlice.SliceDifferentiator",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.NetworkSlice.SliceServiceType",
@@ -25803,7 +27735,7 @@
     "path": "Device.PDU.Session.{i}.PCO.IPv4DNS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PDU.Session.{i}.PCO.IPv4PCSCF",
@@ -25815,7 +27747,7 @@
     "path": "Device.PDU.Session.{i}.PCO.IPv6DNS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PDU.Session.{i}.PCO.IPv6PCSCF",
@@ -25839,7 +27771,7 @@
     "path": "Device.PDU.Session.{i}.PTI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.Alias",
@@ -25851,49 +27783,49 @@
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.AveragingWindow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.EPSBearer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.FiveQI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.GFBRDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.GFBRUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.MFBRDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.MFBRUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlow.{i}.QFI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSFlowNumberOfEntries",
@@ -25911,7 +27843,7 @@
     "path": "Device.PDU.Session.{i}.QoSRule.{i}.DQR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSRule.{i}.Filter.{i}.Alias",
@@ -25929,7 +27861,7 @@
     "path": "Device.PDU.Session.{i}.QoSRule.{i}.Filter.{i}.Type",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSRule.{i}.Filter.{i}.Value",
@@ -25947,25 +27879,25 @@
     "path": "Device.PDU.Session.{i}.QoSRule.{i}.Identifier",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSRule.{i}.Precedence",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSRule.{i}.QFI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSRule.{i}.Segregation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.PDU.Session.{i}.QoSRuleNumberOfEntries",
@@ -25977,25 +27909,25 @@
     "path": "Device.PDU.Session.{i}.RQTimerValue",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.SessionAMBRDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PDU.Session.{i}.SessionAMBRUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PDU.Session.{i}.SessionID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.Session.{i}.SessionType",
@@ -26007,7 +27939,7 @@
     "path": "Device.PDU.Session.{i}.SSC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PDU.SessionNumberOfEntries",
@@ -26025,13 +27957,13 @@
     "path": "Device.PeriodicFileTransfer.HTTPCompressionsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PeriodicFileTransfer.HTTPMethodsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PeriodicFileTransfer.Profile.{i}.Alias",
@@ -26061,7 +27993,7 @@
     "path": "Device.PeriodicFileTransfer.Profile.{i}.HTTP.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.PeriodicFileTransfer.Profile.{i}.HTTP.Method",
@@ -26127,7 +28059,7 @@
     "path": "Device.PeriodicFileTransfer.Profile.{i}.HTTP.RetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PeriodicFileTransfer.Profile.{i}.HTTP.RetryMaximumWaitInterval",
@@ -26175,19 +28107,19 @@
     "path": "Device.PeriodicFileTransfer.ProtocolsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PeriodicFileTransfer.Stats.UploadFailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PeriodicFileTransfer.Stats.UploadSuccessful",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Alias",
@@ -26211,7 +28143,7 @@
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.NextTransferDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Origin",
@@ -26229,31 +28161,31 @@
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Stats.FailedCount",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Stats.LastErrorCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Stats.LastFailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Stats.LastSuccess",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Stats.SuccessCount",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Status",
@@ -26265,7 +28197,7 @@
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.TimeReference",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PeriodicFileTransfer.Transfer.{i}.Type",
@@ -26289,13 +28221,13 @@
     "path": "Device.PeriodicFileTransfer.TypesSupported",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PeriodicStatistics.MaxReportSamples",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PeriodicStatistics.MinSampleInterval",
@@ -26319,13 +28251,13 @@
     "path": "Device.PeriodicStatistics.SampleSet.{i}.FetchSamples",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.ForceSample",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Name",
@@ -26355,25 +28287,25 @@
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.Failures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.HighThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.HistogramBinBoundaries",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.LowThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.Reference",
@@ -26391,25 +28323,25 @@
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.SampleSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.SuspectData",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.Values",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Parameter.{i}.ValuesIfHistogram",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.ParameterNumberOfEntries",
@@ -26421,19 +28353,19 @@
     "path": "Device.PeriodicStatistics.SampleSet.{i}.ReportEndTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.ReportSamples",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.ReportStartTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.SampleInterval",
@@ -26445,7 +28377,7 @@
     "path": "Device.PeriodicStatistics.SampleSet.{i}.SampleSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSet.{i}.Status",
@@ -26457,7 +28389,7 @@
     "path": "Device.PeriodicStatistics.SampleSet.{i}.TimeReference",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.PeriodicStatistics.SampleSetNumberOfEntries",
@@ -26507,6 +28439,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.PPP.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.PPP.Interface.{i}.Enable",
     "writable": true,
@@ -26529,7 +28467,7 @@
     "path": "Device.PPP.Interface.{i}.IPCP.DNSServers",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PPP.Interface.{i}.IPCP.LocalIPAddress",
@@ -26581,9 +28519,9 @@
   },
   {
     "path": "Device.PPP.Interface.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.LastConnectionError",
@@ -26595,25 +28533,25 @@
     "path": "Device.PPP.Interface.{i}.LCPEcho",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.LCPEchoAdaptive",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.PPP.Interface.{i}.LCPEchoRetry",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PPP.Interface.{i}.MaxMRUSize",
@@ -26623,7 +28561,7 @@
   },
   {
     "path": "Device.PPP.Interface.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -26649,7 +28587,7 @@
     "path": "Device.PPP.Interface.{i}.PPPoE.SessionID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.Reset",
@@ -26661,73 +28599,73 @@
     "path": "Device.PPP.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.Reset",
@@ -26739,23 +28677,23 @@
     "path": "Device.PPP.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PPP.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.Interface.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -26769,7 +28707,7 @@
     "path": "Device.PPP.Interface.{i}.WarnDisconnectDelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PPP.InterfaceNumberOfEntries",
@@ -26781,7 +28719,7 @@
     "path": "Device.PPP.SupportedNCPs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PTM.Link.{i}.Alias",
@@ -26789,6 +28727,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.PTM.Link.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.PTM.Link.{i}.Enable",
     "writable": true,
@@ -26797,15 +28741,15 @@
   },
   {
     "path": "Device.PTM.Link.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PTM.Link.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.PTM.Link.{i}.MACAddress",
@@ -26815,7 +28759,7 @@
   },
   {
     "path": "Device.PTM.Link.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -26823,73 +28767,73 @@
     "path": "Device.PTM.Link.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.Reset",
@@ -26901,23 +28845,23 @@
     "path": "Device.PTM.Link.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.PTM.Link.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.PTM.Link.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -26937,25 +28881,25 @@
     "path": "Device.QoS.App.{i}.DefaultDSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.App.{i}.DefaultEthernetPriorityMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.App.{i}.DefaultForwardingPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.App.{i}.DefaultInnerEthernetPriorityMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.App.{i}.DefaultPolicer",
@@ -26967,7 +28911,7 @@
     "path": "Device.QoS.App.{i}.DefaultTrafficClass",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.App.{i}.Enable",
@@ -27003,7 +28947,7 @@
     "path": "Device.QoS.AvailableAppList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.QoS.Classification.{i}.Alias",
@@ -27015,7 +28959,7 @@
     "path": "Device.QoS.Classification.{i}.AllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.App",
@@ -27027,13 +28971,13 @@
     "path": "Device.QoS.Classification.{i}.DestClientID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestClientIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestIP",
@@ -27045,7 +28989,7 @@
     "path": "Device.QoS.Classification.{i}.DestIPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestMACAddress",
@@ -27057,7 +29001,7 @@
     "path": "Device.QoS.Classification.{i}.DestMACExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestMACMask",
@@ -27075,31 +29019,31 @@
     "path": "Device.QoS.Classification.{i}.DestPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestPortExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestPortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestUserClassID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestUserClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestVendorClassID",
@@ -27111,7 +29055,7 @@
     "path": "Device.QoS.Classification.{i}.DestVendorClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestVendorClassIDMode",
@@ -27123,31 +29067,31 @@
     "path": "Device.QoS.Classification.{i}.DestVendorClassIDv6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestVendorSpecificInfo",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestVendorSpecificInfoEnterprise",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestVendorSpecificInfoExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DestVendorSpecificInfoSubOption",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.DHCPType",
@@ -27159,31 +29103,31 @@
     "path": "Device.QoS.Classification.{i}.DSAP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.DSAPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DSCPCheck",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.DSCPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.DSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.Enable",
@@ -27195,67 +29139,73 @@
     "path": "Device.QoS.Classification.{i}.EthernetDEICheck",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.EthernetDEIExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.EthernetPriorityCheck",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.EthernetPriorityExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.EthernetPriorityMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.Ethertype",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.EthertypeExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.ForwardingPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.QoS.Classification.{i}.HardwareOffloadEnabled",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.InnerEthernetPriorityCheck",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.InnerEthernetPriorityExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.InnerEthernetPriorityMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.Interface",
@@ -27267,37 +29217,37 @@
     "path": "Device.QoS.Classification.{i}.IPLengthExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.IPLengthMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Classification.{i}.IPLengthMin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Classification.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.LLCControl",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.LLCControlExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.Order",
@@ -27309,7 +29259,7 @@
     "path": "Device.QoS.Classification.{i}.OutOfBandInfo",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.Policer",
@@ -27321,37 +29271,37 @@
     "path": "Device.QoS.Classification.{i}.Protocol",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.ProtocolExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SNAPOUI",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.SNAPOUIExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceClientID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceClientIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceIP",
@@ -27363,7 +29313,7 @@
     "path": "Device.QoS.Classification.{i}.SourceIPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceMACAddress",
@@ -27375,7 +29325,7 @@
     "path": "Device.QoS.Classification.{i}.SourceMACExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceMACMask",
@@ -27393,31 +29343,31 @@
     "path": "Device.QoS.Classification.{i}.SourcePort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourcePortExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourcePortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceUserClassID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceUserClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceVendorClassID",
@@ -27429,7 +29379,7 @@
     "path": "Device.QoS.Classification.{i}.SourceVendorClassIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceVendorClassIDMode",
@@ -27441,43 +29391,43 @@
     "path": "Device.QoS.Classification.{i}.SourceVendorClassIDv6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceVendorSpecificInfo",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceVendorSpecificInfoEnterprise",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceVendorSpecificInfoExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.SourceVendorSpecificInfoSubOption",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.SSAP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.SSAPExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.Status",
@@ -27485,35 +29435,41 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.QoS.Classification.{i}.StopProcessing",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.QoS.Classification.{i}.TCPACK",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.TCPACKExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Classification.{i}.TrafficClass",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.VLANIDCheck",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Classification.{i}.VLANIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.ClassificationNumberOfEntries",
@@ -27525,25 +29481,25 @@
     "path": "Device.QoS.DefaultDSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.DefaultEthernetPriorityMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.DefaultForwardingPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.DefaultInnerEthernetPriorityMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.DefaultPolicer",
@@ -27561,7 +29517,7 @@
     "path": "Device.QoS.DefaultTrafficClass",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Flow.{i}.Alias",
@@ -27579,7 +29535,7 @@
     "path": "Device.QoS.Flow.{i}.DSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Flow.{i}.Enable",
@@ -27591,19 +29547,19 @@
     "path": "Device.QoS.Flow.{i}.EthernetPriorityMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Flow.{i}.ForwardingPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Flow.{i}.InnerEthernetPriorityMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.QoS.Flow.{i}.Name",
@@ -27627,7 +29583,7 @@
     "path": "Device.QoS.Flow.{i}.TrafficClass",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Flow.{i}.Type",
@@ -27639,7 +29595,7 @@
     "path": "Device.QoS.Flow.{i}.TypeParameters",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.QoS.FlowNumberOfEntries",
@@ -27651,43 +29607,43 @@
     "path": "Device.QoS.MaxAppEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.MaxClassificationEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.MaxFlowEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.MaxPolicerEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.MaxQueueEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.MaxSchedulerEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.MaxShaperEntries",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Policer.{i}.Alias",
@@ -27705,7 +29661,7 @@
     "path": "Device.QoS.Policer.{i}.CommittedRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.QoS.Policer.{i}.ConformingAction",
@@ -27789,13 +29745,13 @@
     "path": "Device.QoS.Policer.{i}.PeakRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.QoS.Policer.{i}.PossibleMeterTypes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.QoS.Policer.{i}.Status",
@@ -27831,13 +29787,13 @@
     "path": "Device.QoS.Queue.{i}.AllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Queue.{i}.AssuredRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:long"
   },
   {
     "path": "Device.QoS.Queue.{i}.BufferLength",
@@ -27849,19 +29805,19 @@
     "path": "Device.QoS.Queue.{i}.Children",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.QoS.Queue.{i}.CurrentAssuredRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:long"
   },
   {
     "path": "Device.QoS.Queue.{i}.CurrentShapingRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:long"
   },
   {
     "path": "Device.QoS.Queue.{i}.DropAlgorithm",
@@ -27879,7 +29835,7 @@
     "path": "Device.QoS.Queue.{i}.HardwareAssisted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.QoS.Queue.{i}.Interface",
@@ -27891,19 +29847,19 @@
     "path": "Device.QoS.Queue.{i}.Precedence",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Queue.{i}.REDPercentage",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Queue.{i}.REDThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.Queue.{i}.SchedulerAlgorithm",
@@ -27921,7 +29877,7 @@
     "path": "Device.QoS.Queue.{i}.ShapingRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:long"
   },
   {
     "path": "Device.QoS.Queue.{i}.Status",
@@ -27933,13 +29889,13 @@
     "path": "Device.QoS.Queue.{i}.TrafficClasses",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.QoS.Queue.{i}.Weight",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.QueueNumberOfEntries",
@@ -28005,7 +29961,7 @@
     "path": "Device.QoS.QueueStats.{i}.QueueOccupancyPercentage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.QoS.QueueStats.{i}.Status",
@@ -28029,13 +29985,13 @@
     "path": "Device.QoS.Scheduler.{i}.AssuredRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:long"
   },
   {
     "path": "Device.QoS.Scheduler.{i}.Children",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.QoS.Scheduler.{i}.DefaultQueue",
@@ -28065,7 +30021,7 @@
     "path": "Device.QoS.Scheduler.{i}.ShapingRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:long"
   },
   {
     "path": "Device.QoS.Scheduler.{i}.Status",
@@ -28089,7 +30045,7 @@
     "path": "Device.QoS.Shaper.{i}.Children",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.QoS.Shaper.{i}.Enable",
@@ -28113,7 +30069,7 @@
     "path": "Device.QoS.Shaper.{i}.ShapingRate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:long"
   },
   {
     "path": "Device.QoS.Shaper.{i}.Status",
@@ -28215,7 +30171,7 @@
     "path": "Device.RadSecProxy.Realm.{i}.AccountingResponse",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.RadSecProxy.Realm.{i}.AccountingServer",
@@ -28395,19 +30351,19 @@
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvCurHopLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvDefaultLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvDNSSLLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvLinkMTU",
@@ -28419,25 +30375,25 @@
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvManagedFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvMobileAgentFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvNDProxyFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvOtherConfigFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvPreferredRouterFlag",
@@ -28449,7 +30405,7 @@
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvRDNSSLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvReachableTime",
@@ -28461,7 +30417,7 @@
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.AdvRetransTimer",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.Alias",
@@ -28473,7 +30429,7 @@
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.DNSSL",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.Enable",
@@ -28491,7 +30447,7 @@
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.ManualPrefixes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.MaxRtrAdvInterval",
@@ -28521,13 +30477,13 @@
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.Option.{i}.Tag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.Option.{i}.Value",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.OptionNumberOfEntries",
@@ -28539,13 +30495,13 @@
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.Prefixes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.RDNSS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.RouterAdvertisement.InterfaceSetting.{i}.RDNSSMode",
@@ -28587,7 +30543,7 @@
     "path": "Device.Routing.Babel.DTLSCertSet.{i}.DefaultApply",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.DTLSCertSet.{i}.DTLSCert.{i}.Alias",
@@ -28599,7 +30555,7 @@
     "path": "Device.Routing.Babel.DTLSCertSet.{i}.DTLSCert.{i}.CertPrivateKey",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.Babel.DTLSCertSet.{i}.DTLSCert.{i}.CertType",
@@ -28671,13 +30627,13 @@
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.InterfaceDTLSCertSets",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.InterfaceMACKeySets",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.InterfaceMetricAlgorithm",
@@ -28701,7 +30657,7 @@
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.MACVerify",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.McastHelloInterval",
@@ -28713,37 +30669,37 @@
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.McastHelloSeqno",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.Cost",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.ExpectedMCastHelloSeqno",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.ExpectedUCastHelloSeqno",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.HelloMCastHistory",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.HelloUCastHistory",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.NeighborAddress",
@@ -28755,13 +30711,13 @@
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.RXCost",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.TXCost",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.UnicastHelloInterval",
@@ -28773,7 +30729,7 @@
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Neighbor.{i}.UnicastHelloSeqno",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.NeighborNumberOfEntries",
@@ -28803,37 +30759,37 @@
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Stats.ReceivedPackets",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Stats.SentIHU",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Stats.SentMcastHello",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Stats.SentMcastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Stats.SentUcastHello",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Stats.SentUcastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Routing.Babel.InterfaceSetting.{i}.Status",
@@ -28863,7 +30819,7 @@
     "path": "Device.Routing.Babel.MACKeySet.{i}.DefaultApply",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKey.{i}.Alias",
@@ -28875,31 +30831,31 @@
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKey.{i}.InputMAC",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKey.{i}.InputString",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKey.{i}.KeyUseSend",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKey.{i}.KeyUseVerify",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKey.{i}.KeyValue",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKey.{i}.MACKeyAlgorithm",
@@ -28917,7 +30873,7 @@
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKey.{i}.Match",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.MACKeySet.{i}.MACKeyNumberOfEntries",
@@ -28935,7 +30891,7 @@
     "path": "Device.Routing.Babel.Route.{i}.CalculatedMetric",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Babel.Route.{i}.Neighbor",
@@ -28953,13 +30909,13 @@
     "path": "Device.Routing.Babel.Route.{i}.ReceivedMetric",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Babel.Route.{i}.RouteFeasible",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.Route.{i}.RoutePrefix",
@@ -28971,19 +30927,19 @@
     "path": "Device.Routing.Babel.Route.{i}.RouteSelected",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.Route.{i}.RouteSeqno",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.Babel.Route.{i}.SourceRouterID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.Babel.RouteNumberOfEntries",
@@ -28995,13 +30951,13 @@
     "path": "Device.Routing.Babel.SelfRouterID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.Babel.SelfSeqno",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.Babel.StatsEnable",
@@ -29013,7 +30969,7 @@
     "path": "Device.Routing.Babel.StatsReset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Babel.Status",
@@ -29025,25 +30981,25 @@
     "path": "Device.Routing.Babel.SupportedDTLSCertTypes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Routing.Babel.SupportedMACAlgorithms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Routing.Babel.SupportedMetricCompAlgorithms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Routing.Babel.SupportedSecurityMechanisms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Routing.Policy.{i}.Alias",
@@ -29067,13 +31023,13 @@
     "path": "Device.Routing.Policy.{i}.DestPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Policy.{i}.DestPortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Policy.{i}.Enable",
@@ -29085,13 +31041,13 @@
     "path": "Device.Routing.Policy.{i}.ForwardingPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Policy.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Policy.{i}.Priority",
@@ -29103,7 +31059,7 @@
     "path": "Device.Routing.Policy.{i}.Protocol",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Policy.{i}.RouterRef",
@@ -29127,13 +31083,13 @@
     "path": "Device.Routing.Policy.{i}.SourcePort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Policy.{i}.SourcePortRangeMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Policy.{i}.Status",
@@ -29157,7 +31113,7 @@
     "path": "Device.Routing.RIP.InterfaceSetting.{i}.AcceptRA",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.RIP.InterfaceSetting.{i}.Alias",
@@ -29181,7 +31137,7 @@
     "path": "Device.Routing.RIP.InterfaceSetting.{i}.SendRA",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.RIP.InterfaceSetting.{i}.Status",
@@ -29211,7 +31167,7 @@
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.HomeAgent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.Interface",
@@ -29219,11 +31175,17 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.LastChange",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.ManagedAddressConfiguration",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.Option.{i}.Alias",
@@ -29235,13 +31197,13 @@
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.Option.{i}.Tag",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.Option.{i}.Value",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.OptionNumberOfEntries",
@@ -29253,7 +31215,7 @@
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.OtherConfiguration",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.PreferredRouteFlag",
@@ -29277,13 +31239,13 @@
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.RetransTimer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.RouteLifetime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Routing.RouteInformation.InterfaceSetting.{i}.SourceRouter",
@@ -29319,7 +31281,7 @@
     "path": "Device.Routing.Router.{i}.ID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Routing.Router.{i}.IPv4Forwarding.{i}.Alias",
@@ -29349,13 +31311,13 @@
     "path": "Device.Routing.Router.{i}.IPv4Forwarding.{i}.ForwardingMetric",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Router.{i}.IPv4Forwarding.{i}.ForwardingPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Router.{i}.IPv4Forwarding.{i}.GatewayIPAddress",
@@ -29397,7 +31359,7 @@
     "path": "Device.Routing.Router.{i}.IPv4Forwarding.{i}.StaticRoute",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Routing.Router.{i}.IPv4Forwarding.{i}.Status",
@@ -29439,19 +31401,19 @@
     "path": "Device.Routing.Router.{i}.IPv6Forwarding.{i}.ExpirationTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Routing.Router.{i}.IPv6Forwarding.{i}.ForwardingMetric",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Router.{i}.IPv6Forwarding.{i}.ForwardingPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Routing.Router.{i}.IPv6Forwarding.{i}.Interface",
@@ -29535,7 +31497,7 @@
     "path": "Device.Schedules.Schedule.{i}.Day",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Schedules.Schedule.{i}.Description",
@@ -29559,13 +31521,13 @@
     "path": "Device.Schedules.Schedule.{i}.InverseMode",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Schedules.Schedule.{i}.StartTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.Schedules.Schedule.{i}.Status",
@@ -29577,7 +31539,7 @@
     "path": "Device.Schedules.Schedule.{i}.TimeLeft",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Schedules.ScheduleNumberOfEntries",
@@ -29589,7 +31551,7 @@
     "path": "Device.Security.CABundle.{i}.CACertificates",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Security.CABundle.{i}.Enable",
@@ -29609,6 +31571,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.Security.Certificate.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Security.Certificate.{i}.Enable",
     "writable": true,
@@ -29625,19 +31593,25 @@
     "path": "Device.Security.Certificate.{i}.LastModif",
     "writable": false,
     "deviceClass": "tr181",
+    "type": "xsd:dateTime"
+  },
+  {
+    "path": "Device.Security.Certificate.{i}.Name",
+    "writable": false,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.Security.Certificate.{i}.NotAfter",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Security.Certificate.{i}.NotBefore",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Security.Certificate.{i}.SerialNumber",
@@ -29661,7 +31635,7 @@
     "path": "Device.Security.Certificate.{i}.SubjectAlt",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Security.CertificateNumberOfEntries",
@@ -29691,43 +31665,43 @@
     "path": "Device.SessionManagement.PDN.{i}.DownstreamAggregateBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDN.{i}.DownstreamGuaranteedBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDN.{i}.DownstreamMaxBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDN.{i}.QCI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDN.{i}.UpstreamAggregateBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDN.{i}.UpstreamGuaranteedBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDN.{i}.UpstreamMaxBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDNNumberOfEntries",
@@ -29757,13 +31731,13 @@
     "path": "Device.SessionManagement.PDP.{i}.DownstreamGuaranteedBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDP.{i}.DownstreamMaxBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDP.{i}.MaximumSDUSize",
@@ -29793,19 +31767,19 @@
     "path": "Device.SessionManagement.PDP.{i}.TransferDelay",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDP.{i}.UpstreamGuaranteedBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDP.{i}.UpstreamMaxBitRate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDPNumberOfEntries",
@@ -29823,13 +31797,13 @@
     "path": "Device.SessionManagement.PDU.{i}.AlwaysOn",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.NetworkSlice.SliceDifferentiator",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.NetworkSlice.SliceServiceType",
@@ -29841,7 +31815,7 @@
     "path": "Device.SessionManagement.PDU.{i}.PTI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.Alias",
@@ -29853,49 +31827,49 @@
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.AveragingWindow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.EPSBearer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.FiveQI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.GFBRDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.GFBRUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.MFBRDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.MFBRUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlow.{i}.QFI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSFlowNumberOfEntries",
@@ -29913,7 +31887,7 @@
     "path": "Device.SessionManagement.PDU.{i}.QoSRule.{i}.DQR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSRule.{i}.Filter.{i}.Alias",
@@ -29931,7 +31905,7 @@
     "path": "Device.SessionManagement.PDU.{i}.QoSRule.{i}.Filter.{i}.Type",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSRule.{i}.Filter.{i}.Value",
@@ -29949,25 +31923,25 @@
     "path": "Device.SessionManagement.PDU.{i}.QoSRule.{i}.Identifier",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSRule.{i}.Precedence",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSRule.{i}.QFI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSRule.{i}.Segregation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.QoSRuleNumberOfEntries",
@@ -29979,25 +31953,25 @@
     "path": "Device.SessionManagement.PDU.{i}.RQTimerValue",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.SessionAMBRDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.SessionAMBRUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.SessionManagement.PDU.{i}.SSC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.PDUNumberOfEntries",
@@ -30017,6 +31991,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.SessionManagement.Session.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.SessionManagement.Session.{i}.Enable",
     "writable": true,
@@ -30105,13 +32085,13 @@
     "path": "Device.SessionManagement.Session.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.Session.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SessionManagement.Session.{i}.Name",
@@ -30123,7 +32103,7 @@
     "path": "Device.SessionManagement.Session.{i}.PCO.IPv4DNS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SessionManagement.Session.{i}.PCO.IPv4PCSCF",
@@ -30135,7 +32115,7 @@
     "path": "Device.SessionManagement.Session.{i}.PCO.IPv6DNS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SessionManagement.Session.{i}.PCO.IPv6PCSCF",
@@ -30153,7 +32133,7 @@
     "path": "Device.SessionManagement.Session.{i}.SessionID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SessionManagement.Session.{i}.SessionType",
@@ -30173,6 +32153,60 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowAllSFPs",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowedSFP.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowedSFP.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowedSFP.{i}.Fingerprint",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowedSFP.{i}.SFPType",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowedSFP.{i}.VendorName",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowedSFP.{i}.VendorOUI",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowedSFP.{i}.VendorPN",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SFPs.AllowedSFPs.AllowedSFPNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Alias",
     "writable": true,
@@ -30189,85 +32223,85 @@
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.RxPowerHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.RxPowerLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TemperatureHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TemperatureLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxBiasHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxBiasLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxPowerHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.TxPowerLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.VccHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Alarms.VccLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.BRMax",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.BRMin",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.BRNominal",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Connector",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.DateCode",
@@ -30279,373 +32313,373 @@
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeExternalCal",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeImplemented",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeInternalCal",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.DMCtypeRxAvgPwr",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.EMCSPowerLvlOp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.EMCSPowerLvlSelect",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Encoding",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCalarmsImplemented",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftRateSelect",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftRxLOS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftTxDisable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.EOCSoftTxFault",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM1",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM2",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthOM3",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthSMF",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.LengthSMFkm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.OptCooledTrans",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.OptInvertedLOS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.OptLinearRcvr",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.OptLOS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.OptPowerlvl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.OptRateSelect",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.OptTxDisable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.OptTxFault",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.RateIdentifier",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.SFF8079AppSelect",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.SFF8431SoftRateSelect",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.DataReadyBarState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RateSelectState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RS1State",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RxLOSState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.RxPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.SoftRateSelectSelect",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.SoftTxDisableSelect",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.Temperature",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxBias",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxDisableState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TXFaultState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.TxPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Status.Vcc",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighRxPowerAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighRxPowerWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTempAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTempWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxBiasAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxBiasWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxPowerAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighTxPowerWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighVccAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.HighVccWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowRxPowerAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowRxPowerWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTempAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTempWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxBiasAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxBiasWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxPowerAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowTxPowerWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowVccAlarm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Thresholds.LowVccWarning",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Transceiver",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorName",
@@ -30657,7 +32691,7 @@
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorOUI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.VendorPN",
@@ -30681,73 +32715,73 @@
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.VerCompliance",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.RxPowerHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.RxPowerLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TemperatureHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TemperatureLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxBiasHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxBiasLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxPowerHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.TxPowerLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.VccHigh",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Warnings.VccLow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472.{i}.Transceiver.Wavelength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.Mgmt.SFF8472NumberOfEntries",
@@ -30761,6 +32795,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.SFPs.SFPCage.{i}.IsAllowed",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.SFPs.SFPCage.{i}.MgmtInterface",
     "writable": false,
@@ -30777,13 +32817,13 @@
     "path": "Device.SFPs.SFPCage.{i}.SFF8024Identifier",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SFPs.SFPCage.{i}.SFPPresent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SFPs.SFPCage.{i}.SFPReference",
@@ -30803,6 +32843,48 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.SFPs.SFPProperties.SFP.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.SFPs.SFPProperties.SFP.{i}.SFPType",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SFPs.SFPProperties.SFP.{i}.VendorName",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SFPs.SFPProperties.SFP.{i}.VendorOUI",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.SFPs.SFPProperties.SFP.{i}.VendorPN",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SFPs.SFPProperties.SFPNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.SFPs.SupportedSFPTypes",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
   {
     "path": "Device.SmartCardReaders.SmartCardReader.{i}.Alias",
     "writable": true,
@@ -30813,13 +32895,13 @@
     "path": "Device.SmartCardReaders.SmartCardReader.{i}.DecryptionFailedCounter",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SmartCardReaders.SmartCardReader.{i}.DecryptionFailedNoKeyCounter",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SmartCardReaders.SmartCardReader.{i}.Enable",
@@ -30843,13 +32925,13 @@
     "path": "Device.SmartCardReaders.SmartCardReader.{i}.ResetTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SmartCardReaders.SmartCardReader.{i}.SmartCard.Application",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SmartCardReaders.SmartCardReader.{i}.SmartCard.ATR",
@@ -30887,6 +32969,78 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.SoftwareModules.Config.CABundle",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.Certificate",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.DUSignatureProtocols",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.Repository.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.Repository.{i}.BaseURL",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.Repository.{i}.CABundle",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.Repository.{i}.Certificate",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.Repository.{i}.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.Repository.{i}.Name",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.Repository.{i}.Type",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.RepositoryNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.SoftwareModules.Config.SupportedDUSignatureProtocols",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
   {
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.Alias",
     "writable": true,
@@ -30915,19 +33069,19 @@
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.ExecutionUnitList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.Installed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.Name",
@@ -30939,7 +33093,7 @@
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.Resolved",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.Status",
@@ -30969,13 +33123,13 @@
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.VendorConfigList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.VendorLogList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.DeploymentUnit.{i}.Version",
@@ -30993,7 +33147,7 @@
     "path": "Device.SoftwareModules.ExecEnv.{i}.ActiveExecutionUnits",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.Alias",
@@ -31005,19 +33159,19 @@
     "path": "Device.SoftwareModules.ExecEnv.{i}.AllocatedCPUPercent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.AllocatedDiskSpace",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.AllocatedMemory",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.ApplicationData.{i}.AccessPath",
@@ -31041,13 +33195,13 @@
     "path": "Device.SoftwareModules.ExecEnv.{i}.ApplicationData.{i}.Capacity",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.ApplicationData.{i}.Encrypted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.ApplicationData.{i}.Name",
@@ -31065,7 +33219,7 @@
     "path": "Device.SoftwareModules.ExecEnv.{i}.ApplicationData.{i}.Utilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.ApplicationDataNumberOfEntries",
@@ -31077,31 +33231,31 @@
     "path": "Device.SoftwareModules.ExecEnv.{i}.AvailableCPUPercent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.AvailableDiskSpace",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.AvailableMemory",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.CreatedAt",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.CurrentRunLevel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.Enable",
@@ -31119,13 +33273,13 @@
     "path": "Device.SoftwareModules.ExecEnv.{i}.InitialExecutionUnitRunLevel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.InitialRunLevel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.Name",
@@ -31143,13 +33297,13 @@
     "path": "Device.SoftwareModules.ExecEnv.{i}.ProcessorRefList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.RequestedRunLevel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecEnv.{i}.Reset",
@@ -31257,13 +33411,13 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AllocatedCPUPercent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AllocatedDiskSpace",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AllocatedEUGID",
@@ -31275,7 +33429,7 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AllocatedEUUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AllocatedHostGID",
@@ -31287,25 +33441,25 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AllocatedHostUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AllocatedMemory",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.ApplicationDataList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AssociatedProcessList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart.Enable",
@@ -31317,7 +33471,7 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart.LastRestarted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart.MaximumRetryCount",
@@ -31329,13 +33483,13 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart.NextRestart",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart.ResetPeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart.RetryCount",
@@ -31347,7 +33501,7 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart.RetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoRestart.RetryMaximumWaitInterval",
@@ -31365,19 +33519,19 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.AutoStart",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.CPUPercentInUse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.CreationTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.Description",
@@ -31389,7 +33543,7 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.DiskSpaceInUse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.EnvVariable.{i}.Alias",
@@ -31479,7 +33633,7 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.MemoryInUse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.Name",
@@ -31491,25 +33645,25 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.NetworkConfig.AccessInterfaceRefList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.NetworkConfig.PortMappingRefList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.Privileged",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.References",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.RequestedState",
@@ -31521,13 +33675,13 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.RunLevel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.ShutdownDelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.Status",
@@ -31539,13 +33693,13 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.SupportedDataModelList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.Uptime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.Vendor",
@@ -31557,13 +33711,13 @@
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.VendorConfigList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.VendorLogList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SoftwareModules.ExecutionUnit.{i}.Version",
@@ -31577,6 +33731,66 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.Action.{i}.Action",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.Action.{i}.Alias",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.Action.{i}.CurrentModuleVersion",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.Action.{i}.ExecEnvName",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.Action.{i}.FaultMessage",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.Action.{i}.PreviousModuleVersion",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.Action.{i}.Status",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.Action.{i}.UUID",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.ActionNumberOfEntries",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.SoftwareModules.LocalManagement.SystemName",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.SSH.AuthorizedKey.{i}.Alias",
     "writable": true,
@@ -31635,7 +33849,7 @@
     "path": "Device.SSH.Server.{i}.AccessLog.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SSH.Server.{i}.AccessLog.{i}.User",
@@ -31653,7 +33867,7 @@
     "path": "Device.SSH.Server.{i}.ActivationDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.SSH.Server.{i}.Alias",
@@ -31665,31 +33879,31 @@
     "path": "Device.SSH.Server.{i}.AllowAllIPv4",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SSH.Server.{i}.AllowAllIPv6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SSH.Server.{i}.AllowPasswordLogin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SSH.Server.{i}.AllowRootLogin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SSH.Server.{i}.AllowRootPasswordLogin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.SSH.Server.{i}.AutoDisableDuration",
@@ -31725,37 +33939,37 @@
     "path": "Device.SSH.Server.{i}.IPv4AllowedSourcePrefix",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SSH.Server.{i}.IPv6AllowedSourcePrefix",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.SSH.Server.{i}.KeepAlive",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SSH.Server.{i}.MaxAccessLogEntries",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.SSH.Server.{i}.MaxAuthTries",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SSH.Server.{i}.PID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SSH.Server.{i}.Port",
@@ -31797,25 +34011,25 @@
     "path": "Device.SSH.Server.{i}.Stats.NumberOfFailedAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SSH.Server.{i}.Stats.NumberOfFailedAttemptsSinceActivation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SSH.Server.{i}.Stats.NumberOfSuccessfulAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SSH.Server.{i}.Stats.NumberOfSuccessfulAttemptsSinceActivation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.SSH.Server.{i}.Status",
@@ -31857,13 +34071,13 @@
     "path": "Device.STOMP.Connection.{i}.EnableEncryption",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.STOMP.Connection.{i}.EnableHeartbeats",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.STOMP.Connection.{i}.Host",
@@ -31875,25 +34089,25 @@
     "path": "Device.STOMP.Connection.{i}.IncomingHeartbeat",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.STOMP.Connection.{i}.IsEncrypted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.STOMP.Connection.{i}.LastChangeDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.STOMP.Connection.{i}.OutgoingHeartbeat",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.STOMP.Connection.{i}.Password",
@@ -31917,7 +34131,7 @@
     "path": "Device.STOMP.Connection.{i}.ServerRetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.STOMP.Connection.{i}.ServerRetryMaxInterval",
@@ -31959,7 +34173,7 @@
     "path": "Device.Syslog.Action.{i}.FilterRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Syslog.Action.{i}.LogFile.Enable",
@@ -32007,7 +34221,7 @@
     "path": "Device.Syslog.Action.{i}.LogRemote.PeerVerify",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Syslog.Action.{i}.LogRemote.Port",
@@ -32031,13 +34245,13 @@
     "path": "Device.Syslog.Action.{i}.SourceRef",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Syslog.Action.{i}.StructuredData",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Syslog.Action.{i}.TemplateRef",
@@ -32067,7 +34281,7 @@
     "path": "Device.Syslog.Filter.{i}.FacilityLevel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Syslog.Filter.{i}.PatternMatch",
@@ -32115,7 +34329,7 @@
     "path": "Device.Syslog.Source.{i}.KernelMessages",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Syslog.Source.{i}.Network.CABundle",
@@ -32145,7 +34359,7 @@
     "path": "Device.Syslog.Source.{i}.Network.PeerVerify",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Syslog.Source.{i}.Network.Port",
@@ -32169,6 +34383,18 @@
     "path": "Device.Syslog.Source.{i}.SystemMessages",
     "writable": true,
     "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Syslog.Source.{i}.UnixDomainSocket.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.Syslog.Source.{i}.UnixDomainSocket.Path",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
@@ -32193,7 +34419,7 @@
     "path": "Device.Syslog.Template.{i}.EscapeMessage",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Syslog.Template.{i}.Expression",
@@ -32217,7 +34443,7 @@
     "path": "Device.Thread.BorderRouter.{i}.BorderAgentID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Thread.BorderRouter.{i}.Enable",
@@ -32265,7 +34491,7 @@
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.ExtendedMAC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.IPv6Address.{i}.Alias",
@@ -32295,7 +34521,7 @@
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.LastContactTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.Mode",
@@ -32307,7 +34533,7 @@
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.Neighbor.{i}.AvgRSSI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.Neighbor.{i}.NodeReference",
@@ -32325,13 +34551,13 @@
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.Rloc16",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.Route.{i}.ID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.Route.{i}.LQIn",
@@ -32349,7 +34575,7 @@
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.Route.{i}.PathCost",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.AssociatedNode.{i}.RouteNumberOfEntries",
@@ -32365,7 +34591,7 @@
   },
   {
     "path": "Device.Thread.MLE.{i}.AssociatedNodeNumberOfEntries",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
@@ -32379,25 +34605,25 @@
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.ChannelMask",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.DelayTimer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.ExtendedPanID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.MeshLocalPrefix",
@@ -32409,7 +34635,7 @@
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.NetworkKey",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.NetworkName",
@@ -32421,19 +34647,19 @@
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.PanID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.PSKc",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.SecurityPolicy.Flags",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.SecurityPolicy.RotationTime",
@@ -32451,14 +34677,20 @@
     "path": "Device.Thread.MLE.{i}.Dataset.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Thread.MLE.{i}.DatasetNumberOfEntries",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.Thread.MLE.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Thread.MLE.{i}.Enable",
     "writable": true,
@@ -32467,55 +34699,55 @@
   },
   {
     "path": "Device.Thread.MLE.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.LeaderData.DataVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.LeaderData.LeaderRouterID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.LeaderData.PartitionID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.LeaderData.StableDataVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.LeaderData.Weighting",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Thread.MLE.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.Thread.MLE.{i}.OperatingStandard",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -32523,73 +34755,73 @@
     "path": "Device.Thread.MLE.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.Reset",
@@ -32601,31 +34833,31 @@
     "path": "Device.Thread.MLE.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.MLE.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.MLE.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.Thread.MLE.{i}.SupportedStandards",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Thread.MLENumberOfEntries",
@@ -32637,13 +34869,13 @@
     "path": "Device.Thread.Node.{i}.Connected",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Thread.Node.{i}.ExtendedMAC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.Thread.Node.{i}.MLEReference",
@@ -32663,6 +34895,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.Thread.Radio.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.Thread.Radio.{i}.Enable",
     "writable": true,
@@ -32685,13 +34923,13 @@
     "path": "Device.Thread.Radio.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.Radio.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Thread.Radio.{i}.MaxBitRate",
@@ -32709,7 +34947,7 @@
     "path": "Device.Thread.Radio.{i}.PowerCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Thread.Radio.{i}.PowerStatus",
@@ -32721,49 +34959,49 @@
     "path": "Device.Thread.Radio.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.Radio.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.Radio.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.Radio.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.Radio.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.Radio.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Thread.Radio.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.Radio.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.Thread.Radio.{i}.Stats.Reset",
@@ -32781,19 +35019,19 @@
     "path": "Device.Thread.Radio.{i}.TransmitPower",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Thread.Radio.{i}.TransmitPowerSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.Thread.Radio.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Thread.RadioNumberOfEntries",
@@ -32835,7 +35073,7 @@
     "path": "Device.Time.Client.{i}.Burst",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Client.{i}.Enable",
@@ -32847,7 +35085,7 @@
     "path": "Device.Time.Client.{i}.IBurst",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Time.Client.{i}.Interface",
@@ -32859,19 +35097,19 @@
     "path": "Device.Time.Client.{i}.IPVersion",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.Time.Client.{i}.MaxPoll",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Client.{i}.MinPoll",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Client.{i}.Mode",
@@ -32883,7 +35121,7 @@
     "path": "Device.Time.Client.{i}.Peer",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Time.Client.{i}.Port",
@@ -32895,13 +35133,13 @@
     "path": "Device.Time.Client.{i}.ResolveAddresses",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Time.Client.{i}.ResolveMaxAddresses",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Client.{i}.ServerInUse",
@@ -32913,31 +35151,31 @@
     "path": "Device.Time.Client.{i}.Servers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Time.Client.{i}.Stats.PacketsDropped",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Client.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Client.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Client.{i}.Stats.PacketsSentFailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Client.{i}.Status",
@@ -32949,7 +35187,7 @@
     "path": "Device.Time.Client.{i}.Version",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.ClientNumberOfEntries",
@@ -32961,7 +35199,7 @@
     "path": "Device.Time.CurrentLocalTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Time.Enable",
@@ -33027,7 +35265,7 @@
     "path": "Device.Time.Server.{i}.Authentication.NTSNTPServer",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Time.Server.{i}.BindType",
@@ -33051,13 +35289,13 @@
     "path": "Device.Time.Server.{i}.MaxPoll",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Server.{i}.MinPoll",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Server.{i}.Mode",
@@ -33075,25 +35313,25 @@
     "path": "Device.Time.Server.{i}.Stats.PacketsDropped",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Server.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Server.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Server.{i}.Stats.PacketsSentFailed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.Server.{i}.Status",
@@ -33111,7 +35349,7 @@
     "path": "Device.Time.Server.{i}.Version",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Time.ServerNumberOfEntries",
@@ -33153,7 +35391,7 @@
     "path": "Device.TrustedElements.SIM.{i}.ESIMTestMode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.TrustedElements.SIM.{i}.GID1",
@@ -33165,7 +35403,7 @@
     "path": "Device.TrustedElements.SIM.{i}.HomeNetworkPublicKeyID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.TrustedElements.SIM.{i}.ICCID",
@@ -33249,13 +35487,13 @@
     "path": "Device.TrustedElements.SIM.{i}.ProtectionScheme",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.TrustedElements.SIM.{i}.RoutingIndicator",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.TrustedElements.SIM.{i}.SMSC",
@@ -33321,7 +35559,7 @@
     "path": "Device.UnixDomainSockets.UnixDomainSocket.{i}.AuthRequired",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UnixDomainSockets.UnixDomainSocket.{i}.Mode",
@@ -33339,7 +35577,7 @@
     "path": "Device.UnixDomainSockets.UnixDomainSocket.{i}.RegistrationRestricted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UnixDomainSockets.UnixDomainSocketNumberOfEntries",
@@ -33363,7 +35601,7 @@
     "path": "Device.UPA.Diagnostics.InterfaceMeasurement.Measurements",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.UPA.Diagnostics.InterfaceMeasurement.Port",
@@ -33375,7 +35613,7 @@
     "path": "Device.UPA.Diagnostics.InterfaceMeasurement.RxGain",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.UPA.Diagnostics.InterfaceMeasurement.Type",
@@ -33393,7 +35631,7 @@
     "path": "Device.UPA.Interface.{i}.ActiveNotch.{i}.Depth",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.ActiveNotch.{i}.Enable",
@@ -33405,13 +35643,13 @@
     "path": "Device.UPA.Interface.{i}.ActiveNotch.{i}.StartFreq",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.ActiveNotch.{i}.StopFreq",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.ActiveNotchEnable",
@@ -33441,13 +35679,13 @@
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.DirectRoute",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.EstimatedPLR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.LogicalNetwork",
@@ -33465,19 +35703,19 @@
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.MeanEstimatedAtt",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.PhyRxThroughput",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.PhyTxThroughput",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.Port",
@@ -33489,7 +35727,7 @@
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.RealPhyRxThroughput",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.AssociatedDevice.{i}.SmartRouteIntermediatePLCMAC",
@@ -33527,6 +35765,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.UPA.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.UPA.Interface.{i}.Enable",
     "writable": true,
@@ -33549,7 +35793,7 @@
     "path": "Device.UPA.Interface.{i}.EstApplicationThroughput",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.FirmwareVersion",
@@ -33561,7 +35805,7 @@
     "path": "Device.UPA.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.LogicalNetwork",
@@ -33573,7 +35817,7 @@
     "path": "Device.UPA.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UPA.Interface.{i}.MACAddress",
@@ -33609,79 +35853,79 @@
     "path": "Device.UPA.Interface.{i}.PowerBackoffMechanismActive",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.Reset",
@@ -33693,19 +35937,19 @@
     "path": "Device.UPA.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.UPA.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPA.Interface.{i}.Status",
@@ -33717,7 +35961,7 @@
     "path": "Device.UPA.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPA.InterfaceNumberOfEntries",
@@ -33729,7 +35973,7 @@
     "path": "Device.UPnP.Description.DeviceDescription.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UPnP.Description.DeviceDescription.{i}.SpecVersion",
@@ -33753,7 +35997,7 @@
     "path": "Device.UPnP.Description.DeviceInstance.{i}.DeviceCategory",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UPnP.Description.DeviceInstance.{i}.DeviceType",
@@ -33903,73 +36147,73 @@
     "path": "Device.UPnP.Device.Capabilities.UPnPArchitecture",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPArchitectureMinorVer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPBasicDevice",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPDMBasicMgmt",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPDMConfigurationMgmt",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPDMSoftwareMgmt",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPIGD",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPMediaRenderer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPMediaServer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPQoSDevice",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPQoSPolicyHolder",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Capabilities.UPnPWLANAccessPoint",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.Enable",
@@ -33981,7 +36225,7 @@
     "path": "Device.UPnP.Device.IGD.AllowReservedAddress",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.IGD.CleanupInterval",
@@ -33993,79 +36237,79 @@
     "path": "Device.UPnP.Device.IGD.EnableIPv6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.IGD.MaxLeaseLifetime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UPnP.Device.UPnPDMBasicMgmt",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.UPnPDMConfigurationMgmt",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.UPnPDMSoftwareMgmt",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.UPnPIGD",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.UPnPMediaRenderer",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.UPnPMediaServer",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.UPnPQoSDevice",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.UPnPQoSPolicyHolder",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Device.UPnPWLANAccessPoint",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UPnP.Discovery.Device.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UPnP.Discovery.Device.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.UPnP.Discovery.Device.{i}.LeaseTime",
@@ -34113,13 +36357,13 @@
     "path": "Device.UPnP.Discovery.RootDevice.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UPnP.Discovery.RootDevice.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.UPnP.Discovery.RootDevice.{i}.LeaseTime",
@@ -34167,13 +36411,13 @@
     "path": "Device.UPnP.Discovery.Service.{i}.Host",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UPnP.Discovery.Service.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.UPnP.Discovery.Service.{i}.LeaseTime",
@@ -34223,6 +36467,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.USB.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.USB.Interface.{i}.Enable",
     "writable": true,
@@ -34233,13 +36483,13 @@
     "path": "Device.USB.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USB.Interface.{i}.MACAddress",
@@ -34263,79 +36513,79 @@
     "path": "Device.USB.Interface.{i}.Port",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.Reset",
@@ -34347,19 +36597,19 @@
     "path": "Device.USB.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.USB.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.Interface.{i}.Status",
@@ -34371,7 +36621,7 @@
     "path": "Device.USB.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USB.InterfaceNumberOfEntries",
@@ -34401,7 +36651,7 @@
     "path": "Device.USB.Port.{i}.PowerCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USB.Port.{i}.PowerStatus",
@@ -34413,7 +36663,7 @@
     "path": "Device.USB.Port.{i}.Rate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.USB.Port.{i}.Receptacle",
@@ -34443,7 +36693,7 @@
     "path": "Device.USB.USBHosts.AllowAllDevices",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USB.USBHosts.AllowedDevice.{i}.Alias",
@@ -34485,7 +36735,7 @@
     "path": "Device.USB.USBHosts.AllowedDevice.{i}.Interfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USB.USBHosts.AllowedDevice.{i}.ProductID",
@@ -34515,31 +36765,31 @@
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Configuration.{i}.ConfigurationNumber",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Configuration.{i}.Interface.{i}.InterfaceClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Configuration.{i}.Interface.{i}.InterfaceNumber",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Configuration.{i}.Interface.{i}.InterfaceProtocol",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Configuration.{i}.Interface.{i}.InterfaceSubClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Configuration.{i}.InterfaceNumberOfEntries",
@@ -34557,19 +36807,19 @@
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.DeviceClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.DeviceNumber",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.DeviceProtocol",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.DeviceState",
@@ -34581,31 +36831,31 @@
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.DeviceSubClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.DeviceVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.IsAllowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.IsSelfPowered",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.IsSuspended",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Manufacturer",
@@ -34617,7 +36867,7 @@
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.MaxChildren",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Parent",
@@ -34641,13 +36891,13 @@
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.ProductID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.Rate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.SerialNumber",
@@ -34659,7 +36909,7 @@
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.USBPort",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.USBVersion",
@@ -34671,7 +36921,7 @@
     "path": "Device.USB.USBHosts.Host.{i}.Device.{i}.VendorID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USB.USBHosts.Host.{i}.DeviceNumberOfEntries",
@@ -34731,25 +36981,25 @@
     "path": "Device.UserInterface.AvailableLanguages",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UserInterface.BackgroundColor",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.UserInterface.ButtonColor",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.UserInterface.ButtonTextColor",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.UserInterface.CurrentLanguage",
@@ -34773,7 +37023,7 @@
     "path": "Device.UserInterface.HTTPAccess.{i}.ActivationDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.Alias",
@@ -34785,31 +37035,31 @@
     "path": "Device.UserInterface.HTTPAccess.{i}.AllowAllIPv4",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.AllowAllIPv6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.AllowedHosts",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.AllowedPathPrefixes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.AllowedRoles",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.AutoDisableDuration",
@@ -34851,13 +37101,13 @@
     "path": "Device.UserInterface.HTTPAccess.{i}.IPv4AllowedSourcePrefix",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.IPv6AllowedSourcePrefix",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.Order",
@@ -34905,7 +37155,7 @@
     "path": "Device.UserInterface.HTTPAccess.{i}.Session.{i}.StartDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.UserInterface.HTTPAccess.{i}.Session.{i}.User",
@@ -34929,7 +37179,7 @@
     "path": "Device.UserInterface.HTTPAccess.{i}.TimeLeft",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UserInterface.HTTPAccessNumberOfEntries",
@@ -34941,7 +37191,7 @@
     "path": "Device.UserInterface.HTTPAccessSupportedProtocols",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UserInterface.ISPHelpDesk",
@@ -34965,7 +37215,7 @@
     "path": "Device.UserInterface.ISPLogo",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.UserInterface.ISPLogoSize",
@@ -34995,55 +37245,55 @@
     "path": "Device.UserInterface.LocalDisplay.DisplayHeight",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UserInterface.LocalDisplay.DisplayWidth",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UserInterface.LocalDisplay.Height",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UserInterface.LocalDisplay.Movable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UserInterface.LocalDisplay.PosX",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.UserInterface.LocalDisplay.PosY",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.UserInterface.LocalDisplay.Resizable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UserInterface.LocalDisplay.Width",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UserInterface.Messages.BackgroundColor",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.UserInterface.Messages.Enable",
@@ -35055,7 +37305,7 @@
     "path": "Device.UserInterface.Messages.ExecutedNumberOfRepetitions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UserInterface.Messages.IconType",
@@ -35067,13 +37317,13 @@
     "path": "Device.UserInterface.Messages.MessageColor",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.UserInterface.Messages.RequestedNumberOfRepetitions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.UserInterface.Messages.SubTitle",
@@ -35085,7 +37335,7 @@
     "path": "Device.UserInterface.Messages.SubTitleColor",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.UserInterface.Messages.Text",
@@ -35103,25 +37353,25 @@
     "path": "Device.UserInterface.Messages.TitleColor",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.UserInterface.PasswordRequired",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UserInterface.PasswordReset",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UserInterface.PasswordUserSelectable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UserInterface.RemoteAccess.Enable",
@@ -35145,19 +37395,19 @@
     "path": "Device.UserInterface.RemoteAccess.SupportedProtocols",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.UserInterface.TextColor",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.UserInterface.UpgradeAvailable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.UserInterface.UserUpdateServer",
@@ -35169,7 +37419,7 @@
     "path": "Device.UserInterface.WarrantyDate",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.Users.CheckCredentialsDiagnostics.DiagnosticsState",
@@ -35205,7 +37455,7 @@
     "path": "Device.Users.Group.{i}.GroupID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Users.Group.{i}.Groupname",
@@ -35217,13 +37467,13 @@
     "path": "Device.Users.Group.{i}.RoleParticipation",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Users.Group.{i}.StaticGroup",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Users.GroupNumberOfEntries",
@@ -35247,13 +37497,13 @@
     "path": "Device.Users.Role.{i}.RequiredCapabilities",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Users.Role.{i}.RoleID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Users.Role.{i}.RoleName",
@@ -35265,7 +37515,7 @@
     "path": "Device.Users.Role.{i}.StaticRole",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Users.RoleNumberOfEntries",
@@ -35277,7 +37527,7 @@
     "path": "Device.Users.SupportedCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Users.SupportedShell.{i}.Alias",
@@ -35319,6 +37569,12 @@
     "path": "Device.Users.User.{i}.GroupParticipation",
     "writable": true,
     "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.Users.User.{i}.HomeDirectory",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
@@ -35337,13 +37593,13 @@
     "path": "Device.Users.User.{i}.RemoteAccessCapable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Users.User.{i}.RoleParticipation",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.Users.User.{i}.Shell",
@@ -35355,13 +37611,13 @@
     "path": "Device.Users.User.{i}.StaticUser",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.Users.User.{i}.UserID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.Users.User.{i}.Username",
@@ -35385,7 +37641,7 @@
     "path": "Device.USPAgent.AdvertisedDeviceSubtypes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.Certificate.{i}.Alias",
@@ -35427,7 +37683,7 @@
     "path": "Device.USPAgent.Controller.{i}.AssignedRole",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.ControllerCode",
@@ -35439,7 +37695,7 @@
     "path": "Device.USPAgent.Controller.{i}.Credential",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.Enable",
@@ -35457,7 +37713,7 @@
     "path": "Device.USPAgent.Controller.{i}.InheritedRole",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.Alias",
@@ -35469,7 +37725,7 @@
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.CoAP.EnableEncryption",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.CoAP.Host",
@@ -35505,13 +37761,13 @@
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.MQTT.PublishRetainNotify",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.MQTT.PublishRetainResponse",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.MQTT.Reference",
@@ -35535,7 +37791,7 @@
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.Order",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.Protocol",
@@ -35583,7 +37839,7 @@
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.WebSocket.EnableEncryption",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.WebSocket.Host",
@@ -35595,7 +37851,7 @@
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.WebSocket.IsEncrypted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.WebSocket.KeepAliveInterval",
@@ -35619,7 +37875,7 @@
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.WebSocket.SessionRetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.MTP.{i}.WebSocket.SessionRetryMinimumWaitInterval",
@@ -35649,7 +37905,7 @@
     "path": "Device.USPAgent.Controller.{i}.PeriodicNotifTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.ProvisioningCode",
@@ -35661,13 +37917,13 @@
     "path": "Device.USPAgent.Controller.{i}.SendOnBoardRequest",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.USPNotifRetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USPAgent.Controller.{i}.USPNotifRetryMinimumWaitInterval",
@@ -35709,7 +37965,7 @@
     "path": "Device.USPAgent.ControllerTrust.Challenge.{i}.Instruction",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.Challenge.{i}.InstructionType",
@@ -35721,7 +37977,7 @@
     "path": "Device.USPAgent.ControllerTrust.Challenge.{i}.LockoutPeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.Challenge.{i}.Retries",
@@ -35733,7 +37989,7 @@
     "path": "Device.USPAgent.ControllerTrust.Challenge.{i}.Role",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.Challenge.{i}.Type",
@@ -35745,7 +38001,7 @@
     "path": "Device.USPAgent.ControllerTrust.Challenge.{i}.Value",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.Challenge.{i}.ValueType",
@@ -35787,7 +38043,7 @@
     "path": "Device.USPAgent.ControllerTrust.Credential.{i}.Role",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.CredentialNumberOfEntries",
@@ -35847,7 +38103,7 @@
     "path": "Device.USPAgent.ControllerTrust.Role.{i}.Permission.{i}.Order",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.Role.{i}.Permission.{i}.Param",
@@ -35859,7 +38115,7 @@
     "path": "Device.USPAgent.ControllerTrust.Role.{i}.Permission.{i}.Targets",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.Role.{i}.PermissionNumberOfEntries",
@@ -35877,25 +38133,25 @@
     "path": "Device.USPAgent.ControllerTrust.SecuredRoles",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.TOFUAllowed",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.TOFUInactivityTimer",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USPAgent.ControllerTrust.UntrustedRole",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.EndpointID",
@@ -35919,19 +38175,19 @@
     "path": "Device.USPAgent.MTP.{i}.CoAP.EnableEncryption",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.MTP.{i}.CoAP.Interfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.MTP.{i}.CoAP.IsEncrypted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.MTP.{i}.CoAP.Path",
@@ -35955,13 +38211,13 @@
     "path": "Device.USPAgent.MTP.{i}.EnableMDNS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.MTP.{i}.MQTT.PublishQoS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.USPAgent.MTP.{i}.MQTT.Reference",
@@ -36021,13 +38277,13 @@
     "path": "Device.USPAgent.MTP.{i}.WebSocket.EnableEncryption",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPAgent.MTP.{i}.WebSocket.Interfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.MTP.{i}.WebSocket.KeepAliveInterval",
@@ -36063,13 +38319,13 @@
     "path": "Device.USPAgent.SupportedFingerprintAlgorithms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.SupportedProtocols",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPAgent.UpTime",
@@ -36087,7 +38343,7 @@
     "path": "Device.USPServices.Trust.{i}.TargetPaths",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPServices.TrustNumberOfEntries",
@@ -36099,13 +38355,13 @@
     "path": "Device.USPServices.USPService.{i}.DataModelPaths",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPServices.USPService.{i}.DeploymentUnitRef",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPServices.USPService.{i}.EndpointID",
@@ -36117,13 +38373,13 @@
     "path": "Device.USPServices.USPService.{i}.ExecutionUnitRef",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.USPServices.USPService.{i}.HasController",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.USPServices.USPService.{i}.Protocol",
@@ -36147,13 +38403,13 @@
     "path": "Device.VXLAN.Filter.{i}.AllInterfaces",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.VXLAN.Filter.{i}.DSCPMarkPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.VXLAN.Filter.{i}.Enable",
@@ -36183,13 +38439,13 @@
     "path": "Device.VXLAN.Filter.{i}.VLANIDCheck",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.VXLAN.Filter.{i}.VLANIDExclude",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.VXLAN.FilterNumberOfEntries",
@@ -36213,7 +38469,7 @@
     "path": "Device.VXLAN.Tunnel.{i}.DefaultDSCPMark",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.DeliveryHeaderProtocol",
@@ -36233,6 +38489,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Enable",
     "writable": true,
@@ -36241,19 +38503,19 @@
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -36261,85 +38523,85 @@
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.DiscardChecksumReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.DiscardSequenceNumberReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.Reset",
@@ -36351,23 +38613,23 @@
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -36375,11 +38637,11 @@
     "path": "Device.VXLAN.Tunnel.{i}.Interface.{i}.VNI",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.InterfaceNumberOfEntries",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
@@ -36393,7 +38655,7 @@
     "path": "Device.VXLAN.Tunnel.{i}.KeepAliveThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.KeepAliveTimeout",
@@ -36405,7 +38667,7 @@
     "path": "Device.VXLAN.Tunnel.{i}.RemoteEndpoints",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.RemotePort",
@@ -36423,49 +38685,49 @@
     "path": "Device.VXLAN.Tunnel.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Stats.KeepAliveReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Stats.KeepAliveSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.VXLAN.Tunnel.{i}.Status",
@@ -36489,13 +38751,13 @@
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.AckPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.AIFSN",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Alias",
@@ -36507,19 +38769,19 @@
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.ECWMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.ECWMin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.OutQLenHistogramIntervals",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.OutQLenHistogramSampleInterval",
@@ -36531,55 +38793,55 @@
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.OutQLenHistogram",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.Stats.RetransCount",
@@ -36591,7 +38853,7 @@
     "path": "Device.WiFi.AccessPoint.{i}.AC.{i}.TxOpMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Accounting.Enable",
@@ -36651,25 +38913,25 @@
     "path": "Device.WiFi.AccessPoint.{i}.AllowedMACAddress",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.ANQP.AdviceOfCharges",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.ANQP.Cellular3GPPNetworkInfo",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.ANQP.Domains",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.ANQP.Enable",
@@ -36693,19 +38955,19 @@
     "path": "Device.WiFi.AccessPoint.{i}.ANQP.NAIRealms",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.ANQP.NetworkAuthTypes",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.ANQP.RoamingConsortiumOIs",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.ANQP.VenueName",
@@ -36723,13 +38985,13 @@
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.AssociationTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.AuthenticationState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.LastDataDownlinkRate",
@@ -36771,7 +39033,7 @@
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.OperatingStandard",
@@ -36783,49 +39045,49 @@
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Retransmissions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.SetStaATF",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.SNR",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.FailedRetransCount",
@@ -36843,13 +39105,13 @@
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.Stats.RetransCount",
@@ -36897,13 +39159,13 @@
     "path": "Device.WiFi.AccessPoint.{i}.Interworking.ASRA",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Interworking.EmergencyServiceReachable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Interworking.Enable",
@@ -36921,13 +39183,13 @@
     "path": "Device.WiFi.AccessPoint.{i}.Interworking.InternetAvailable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Interworking.UnauthenticatedEmergencyServiceAvailable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Interworking.VenueGroup",
@@ -36957,19 +39219,19 @@
     "path": "Device.WiFi.AccessPoint.{i}.MaxAllowedAssociations",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.MaxAssociatedDevices",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Passpoint.DGAFDisable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Passpoint.Enable",
@@ -36993,31 +39255,31 @@
     "path": "Device.WiFi.AccessPoint.{i}.Passpoint.OSU.FriendlyNames",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Passpoint.OSU.Method",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Passpoint.OSU.ProviderNAIs",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Passpoint.OSU.ServerURIs",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Passpoint.OSU.ServiceDescriptions",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Passpoint.OSU.SSID",
@@ -37035,13 +39297,13 @@
     "path": "Device.WiFi.AccessPoint.{i}.RetryLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Security.EncryptionMode",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Security.KeyPassphrase",
@@ -37059,19 +39321,19 @@
     "path": "Device.WiFi.AccessPoint.{i}.Security.ModeEnabled",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:string"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Security.ModesSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Security.PreSharedKey",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Security.RadiusSecret",
@@ -37107,7 +39369,7 @@
     "path": "Device.WiFi.AccessPoint.{i}.Security.SAEGroupDependantHashEnable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:string"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Security.SAEPassphrase",
@@ -37143,13 +39405,13 @@
     "path": "Device.WiFi.AccessPoint.{i}.Security.TransitionDisableIndication",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.Security.WEPKey",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.SSIDAdvertisementEnabled",
@@ -37173,7 +39435,7 @@
     "path": "Device.WiFi.AccessPoint.{i}.UAPSDCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.UAPSDEnable",
@@ -37185,7 +39447,7 @@
     "path": "Device.WiFi.AccessPoint.{i}.WMMCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.WMMEnable",
@@ -37197,13 +39459,13 @@
     "path": "Device.WiFi.AccessPoint.{i}.WPS.ConfigMethodsEnabled",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.WPS.ConfigMethodsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.AccessPoint.{i}.WPS.Enable",
@@ -37236,17 +39498,167 @@
     "type": "xsd:unsignedInt"
   },
   {
-    "path": "Device.WiFi.CCAMeasurementDiagnostic.CCAReport",
+    "path": "Device.WiFi.AFC.CABundle",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.Certificate",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.DeviceDescriptor.CertificationID",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.DeviceDescriptor.RulesetID",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.DeviceDescriptor.SerialNumber",
     "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
-    "path": "Device.WiFi.CCAMeasurementDiagnostic.Channel",
+    "path": "Device.WiFi.AFC.Enable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.WiFi.AFC.FrequencyRange",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.WiFi.AFC.IndoorDeployment",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.Location.Barometer",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.WiFi.AFC.Location.GPS",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.MinDesiredPower",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:int"
+  },
+  {
+    "path": "Device.WiFi.AFC.MTLSEnable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.WiFi.AFC.OCSPEnable",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.WiFi.AFC.OperatingClassList",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt[]"
+  },
+  {
+    "path": "Device.WiFi.AFC.Port",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Device.WiFi.AFC.RequestVersion",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.ServerURL",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.Stats.AvailableSpectrumRequest",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.Stats.AvailableSpectrumResponse",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.Stats.GrantExpiryTime",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:dateTime"
+  },
+  {
+    "path": "Device.WiFi.AFC.Stats.GrantResponse",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.Stats.GrantStatus",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.TLSVersion",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.WiFi.AFC.UseFrequencyRange",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.WiFi.AFC.UseInquiredChannels",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.WiFi.CCAMeasurementDiagnostic.CCAReport",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:hexBinary"
+  },
+  {
+    "path": "Device.WiFi.CCAMeasurementDiagnostic.Channel",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.WiFi.CCAMeasurementDiagnostic.DiagnosticsState",
     "writable": true,
@@ -37275,25 +39687,25 @@
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.ClientCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.HECapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.HTCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.MACAddress",
@@ -37305,163 +39717,163 @@
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.StatusCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.VHTCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.AnticipatedChannelUsage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.Beamformee80orLess",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.BeamformeeAbove80",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.DLOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.HE160",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.HE8080",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MaxDLMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MaxDLOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MaxULMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MaxULOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MCSNSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MUEDCA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MultiBSSID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.MURTS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.RTS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.SpatialReuse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.SUBeamformee",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.SUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.TWTRequestor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.TWTResponder",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.ULMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.WiFi6Capabilities.ULOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.AssociationEvent.AssociationEventDataNumberOfEntries",
@@ -37479,43 +39891,43 @@
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.EstMACDataRateDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.EstMACDataRateUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.InitiatedBy",
@@ -37551,31 +39963,31 @@
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.ReasonCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.RetransCount",
@@ -37587,25 +39999,25 @@
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.UtilizationReceive",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.UtilizationTransmit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.DisassociationEvent.DisassociationEventDataNumberOfEntries",
@@ -37629,19 +40041,19 @@
     "path": "Device.WiFi.DataElements.FailedConnectionEvent.FailedConnectionEventData.{i}.ReasonCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.FailedConnectionEvent.FailedConnectionEventData.{i}.StatusCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.FailedConnectionEvent.FailedConnectionEventData.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.FailedConnectionEvent.FailedConnectionEventDataNumberOfEntries",
@@ -37677,13 +40089,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannels.{i}.ChannelList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannels.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelsNumberOfEntries",
@@ -37695,7 +40107,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.Entry.{i}.BurstInterval",
@@ -37713,7 +40125,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.Entry.{i}.BurstStartTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.Entry.{i}.ChannelUsageReason",
@@ -37725,19 +40137,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.Entry.{i}.PowerLevel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.Entry.{i}.Repetitions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.Entry.{i}.RUBitmask",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.Entry.{i}.TransmitterIdentifier",
@@ -37755,7 +40167,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AnticipatedChannelUsage.{i}.ReferenceBSSID",
@@ -37779,19 +40191,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMetricsWiFi6",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.BroadcastBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.BroadcastBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.BSSID",
@@ -37803,85 +40215,85 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.DisabledSubChannels",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.EstServiceParametersBE",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.EstServiceParametersBK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.EstServiceParametersVI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.EstServiceParametersVO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.LinkID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.MulticastBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.MulticastBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.UnicastBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAP.{i}.UnicastBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.AffiliatedAPNumberOfEntries",
@@ -37917,7 +40329,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.APMLDConfig.TIDLinkMapNegotiation",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.APMLDConfig.TIDToOpClassPolicy.{i}.Direction",
@@ -37935,13 +40347,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.APMLDConfig.TIDToOpClassPolicy.{i}.OpClass",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.APMLDConfig.TIDToOpClassPolicy.{i}.TID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.APMLDConfig.TIDToOpClassPolicyNumberOfEntries",
@@ -37959,13 +40371,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.LinkToOpClassMap.{i}.LinkID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.LinkToOpClassMap.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.LinkToOpClassMapNumberOfEntries",
@@ -37989,31 +40401,31 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.EstMACDataRateDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.EstMACDataRateUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.LastDataDownlinkRate",
@@ -38037,31 +40449,31 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.UtilizationReceive",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTA.{i}.UtilizationTransmit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.AffiliatedSTANumberOfEntries",
@@ -38073,25 +40485,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.Hostname",
@@ -38115,7 +40527,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.IsbSTA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.LastConnectTime",
@@ -38133,25 +40545,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.PairwiseAKM",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.PairwiseCipher",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.RetransCount",
@@ -38163,7 +40575,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.RSNCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STAMLDConfig.EMLMREnabled",
@@ -38193,7 +40605,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STAMLDConfig.TIDLinkMapNegotiation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STATIDLinkMap.{i}.BSSID",
@@ -38211,13 +40623,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STATIDLinkMap.{i}.LinkID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STATIDLinkMap.{i}.TID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.STATIDLinkMapNumberOfEntries",
@@ -38229,31 +40641,31 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities.EMLMRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities.EMLSRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities.NSTRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities.STRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.WiFi7Capabilities.TIDLinkMapNegotiation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLDNumberOfEntries",
@@ -38277,13 +40689,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.TIDLinkMap.{i}.LinkID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.TIDLinkMap.{i}.TID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.TIDLinkMapNumberOfEntries",
@@ -38295,7 +40707,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLDMaxLinks",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.APMLDNumberOfEntries",
@@ -38307,7 +40719,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AssociatedSTAinAPMetricsWiFi6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.AssociatedSTAReportingInterval",
@@ -38337,7 +40749,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.BackhaulDownMACAddress",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.BackhaulDownNumberOfEntries",
@@ -38367,7 +40779,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.AffiliatedbSTAList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.BSSID",
@@ -38403,7 +40815,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.bSTAMLDConfig.TIDLinkMapNegotiation",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.bSTAMLD.MLDMACAddress",
@@ -38415,31 +40827,31 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.bSTAMLDMaxLinks",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.BTMSteeringDisallowedSTAList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACActiveChannel.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACActiveChannel.{i}.Countdown",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACActiveChannel.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACActiveChannelNumberOfEntries",
@@ -38451,19 +40863,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACAvailableChannel.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACAvailableChannel.{i}.Minutes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACAvailableChannel.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACAvailableChannelNumberOfEntries",
@@ -38475,19 +40887,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACNonOccupancyChannel.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACNonOccupancyChannel.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACNonOccupancyChannel.{i}.Seconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.CACNonOccupancyChannelNumberOfEntries",
@@ -38499,7 +40911,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatus.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CACStatusNumberOfEntries",
@@ -38523,7 +40935,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CoordinatedCACAllowed",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.CountryCode",
@@ -38535,7 +40947,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Default8021Q.{i}.DefaultPCP",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Default8021Q.{i}.Enable",
@@ -38547,7 +40959,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Default8021Q.{i}.PrimaryVID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Default8021QNumberOfEntries",
@@ -38565,13 +40977,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.DSCPMap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.EasyConnectCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.ExecutionEnv",
@@ -38589,19 +41001,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.IEEE1905Security.{i}.EncryptionAlgorithm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.IEEE1905Security.{i}.IntegrityAlgorithm",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.IEEE1905Security.{i}.OnboardingProtocol",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.IEEE1905SecurityNumberOfEntries",
@@ -38613,7 +41025,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.LocalSteeringDisallowedSTAList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Manufacturer",
@@ -38631,13 +41043,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MaxNumMLDs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MaxPrioritizationRules",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MaxReportingRate",
@@ -38655,13 +41067,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MaxVIDs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.AssocIEEE1905DeviceRef",
@@ -38685,25 +41097,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.CurrentOperatingClassProfile.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.CurrentOperatingClassProfile.{i}.Class",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.CurrentOperatingClassProfile.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.CurrentOperatingClassProfile.{i}.TxPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.CurrentOperatingClassProfileNumberOfEntries",
@@ -38727,25 +41139,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.LastDataDownlinkRate",
@@ -38763,31 +41175,31 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.LinkUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.Backhaul.Stats.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.EasyMeshAgentOperationMode",
@@ -38805,7 +41217,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.LastContactTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.MultiAPDevice.ManufacturerOUI",
@@ -38817,25 +41229,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.PrioritizationSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.APMetricsWiFi6",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.AssociatedSTALinkMetricsInclusionPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.AssociatedSTATrafficStatsInclusionPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BackhaulSta.MACAddress",
@@ -38847,43 +41259,43 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.AssociationAllowanceStatus",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.BackhaulAKMsAllowed",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.BackhaulSuiteSelector",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.BackhaulUse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.BasicDataTransmitRates",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.BroadcastBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.BroadcastBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.BSSID",
@@ -38901,7 +41313,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ByteCounterUnits",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.Enabled",
@@ -38913,49 +41325,49 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.EstServiceParametersBE",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.EstServiceParametersBK",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.EstServiceParametersVI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.EstServiceParametersVO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.FronthaulAKMsAllowed",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.FronthaulSuiteSelector",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.FronthaulUse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LatencyTestResult.AverageResponseTime",
@@ -39009,25 +41421,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LatencyTestResult.TestLayer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LatencyTestResult.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LatencyTestResult.VID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.LatencyTestResult.WMMUP",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MUConfig.DLMUMIMOEnable",
@@ -39057,37 +41469,37 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiAPSteering.BlacklistAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiAPSteering.BTMAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiAPSteering.BTMQueryResponses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MultiBSSID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MulticastBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MulticastBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.MUStats.DLHEPPDUCount",
@@ -39249,13 +41661,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.Profile1bSTAsDisallowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.Profile2bSTAsDisallowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.QMDescriptor.{i}.BSSID",
@@ -39273,7 +41685,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.QMDescriptor.{i}.DescriptorElement",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.QMDescriptorNumberOfEntries",
@@ -39285,13 +41697,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.R1disallowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.R2disallowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.SecurityTemplateRef",
@@ -39339,13 +41751,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.CellularDataPreference",
@@ -39357,133 +41769,133 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.ClientCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.EstMACDataRateDownlink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.EstMACDataRateUplink",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.AMPDU",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.AMSDU",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BATSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BW16MHz",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BW16MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BW1MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BW2MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BW4MHz",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BW4MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BW8MHz",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.BW8MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.CentralizedAuthenticationControl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.DistributedAuthenticationControl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.DynamicAID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.FlowControl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.GroupAID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.IsSensorDevice",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.MaxMPDULen",
@@ -39495,97 +41907,97 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.MUBeamformee",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.MUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.NonTIMMode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.PageSlicing",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.PV1Frame",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.RAWOperation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.RxMCSNSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.S1GLong",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.SUBeamformee",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.SUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.TravelingPilot",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.TWTGrouping",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.TWTRequestor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.TWTResponder",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HaLowCapabilities.TxMCSNSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HECapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.Hostname",
@@ -39597,7 +42009,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.HTCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.IPV4Address",
@@ -39639,19 +42051,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MeasurementReport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.AssociationTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringHistory.{i}.APDestination",
@@ -39681,7 +42093,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringHistory.{i}.Time",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringHistory.{i}.TriggerEvent",
@@ -39699,43 +42111,43 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.BlacklistAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.BlacklistFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.BlacklistSuccesses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.BTMAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.BTMFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.BTMQueryResponses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.BTMSuccesses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.LastSteerTime",
@@ -39747,55 +42159,55 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.MultiAPSTA.SteeringSummaryStats.NoCandidateAPFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.NumberOfMeasureReports",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.PairwiseAKM",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.PairwiseCipher",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.ReAssociationDelay",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.RetransCount",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.RSNCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.SecurityAssociation",
@@ -39807,7 +42219,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.SleepMode",
@@ -39825,7 +42237,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.TIDQueueSizes.{i}.TID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.TIDQueueSizesNumberOfEntries",
@@ -39837,163 +42249,163 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.UtilizationReceive",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.UtilizationTransmit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.VHTCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.AnticipatedChannelUsage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.Beamformee80orLess",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.BeamformeeAbove80",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.DLOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.HE160",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.HE8080",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MaxDLMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MaxDLOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MaxULMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MaxULOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MCSNSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MUEDCA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MultiBSSID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.MURTS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.RTS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.SpatialReuse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.SUBeamformee",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.SUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.TWTRequestor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.TWTResponder",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.ULMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.WiFi6Capabilities.ULOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STANumberOfEntries",
@@ -40029,13 +42441,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ThroughputTestResult.TestLayer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ThroughputTestResult.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ThroughputTestResult.UplinkSpeed",
@@ -40047,37 +42459,37 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ThroughputTestResult.VID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.ThroughputTestResult.WMMUP",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.TransmittedBSSID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.UnicastBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.UnicastBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSSNumberOfEntries",
@@ -40089,25 +42501,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CACCapability.CACMethod.{i}.Method",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CACCapability.CACMethod.{i}.NumberOfSeconds",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CACCapability.CACMethod.{i}.OpClassChannels.{i}.ChannelList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CACCapability.CACMethod.{i}.OpClassChannels.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CACCapability.CACMethod.{i}.OpClassChannelsNumberOfEntries",
@@ -40125,13 +42537,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMBackhaul.{i}.OUI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMBackhaul.{i}.Type",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMBackhaulNumberOfEntries",
@@ -40143,13 +42555,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMFrontHaul.{i}.OUI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMFrontHaul.{i}.Type",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.AKMFrontHaulNumberOfEntries",
@@ -40161,25 +42573,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.CapableOperatingClassProfile.{i}.Class",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.CapableOperatingClassProfile.{i}.MaxTxPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.CapableOperatingClassProfile.{i}.NonOperable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.CapableOperatingClassProfile.{i}.NumberOfNonOperChan",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.CapableOperatingClassProfileNumberOfEntries",
@@ -40191,115 +42603,115 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.DSCPPolicyCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.AcceptNonSensorDevices",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.AcceptSensorDevices",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.AMPDU",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.AMSDU",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BATSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BW16MHz",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BW16MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BW1MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BW2MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BW4MHz",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BW4MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BW8MHz",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.BW8MHzShortGI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.CentralizedAuthenticationControl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.DistributedAuthenticationControl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.DynamicAID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.FlowControl",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.GroupAID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.MaxMPDULen",
@@ -40311,421 +42723,421 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.MUBeamformee",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.MUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.NonTIMMode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.PageSlicing",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.PV1Frame",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.RAWOperation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.RxMCSNSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.S1GLong",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.SUBeamformee",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.SUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.TravelingPilot",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.TWTGrouping",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.TWTRequestor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.TWTResponder",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HaLowCapabilities.TxMCSNSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HECapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.HTCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.MSCSCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.QoSMapCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.SCSCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.SCSTrafficDescriptionCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.VHTCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.AnticipatedChannelUsage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.Beamformee80orLess",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.BeamformeeAbove80",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.DLOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.HE160",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.HE8080",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MaxDLMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MaxDLOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MaxULMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MaxULOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MCSNSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MUEDCA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MultiBSSID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.MURTS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.RTS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.SpatialReuse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.SUBeamformee",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.SUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.TWTRequestor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.TWTResponder",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.ULMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6APRole.ULOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.AnticipatedChannelUsage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.Beamformee80orLess",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.BeamformeeAbove80",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.DLOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.HE160",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.HE8080",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MaxDLMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MaxDLOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MaxULMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MaxULOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MCSNSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MUEDCA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MultiBSSID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.MURTS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.RTS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.SpatialReuse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.SUBeamformee",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.SUBeamformer",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.TWTRequestor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.TWTResponder",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.ULMUMIMO",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi6bSTARole.ULOFDMA",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparationNumberOfEntries",
@@ -40737,19 +43149,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLMRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparationNumberOfEntries",
@@ -40761,19 +43173,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.EMLSRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparationNumberOfEntries",
@@ -40785,19 +43197,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.NSTRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparationNumberOfEntries",
@@ -40809,25 +43221,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.STRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7APRole.TIDLinkMapNegotiation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLMRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLMRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLMRFreqSeparationNumberOfEntries",
@@ -40839,19 +43251,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLMRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLSRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLSRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLSRFreqSeparationNumberOfEntries",
@@ -40863,19 +43275,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.EMLSRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.NSTRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.NSTRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.NSTRFreqSeparationNumberOfEntries",
@@ -40887,19 +43299,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.NSTRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.STRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.STRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.STRFreqSeparationNumberOfEntries",
@@ -40911,25 +43323,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.STRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Capabilities.WiFi7bSTARole.TIDLinkMapNegotiation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ChannelUtilizationReportingThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ChannelUtilizationThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ChipsetVendor",
@@ -40941,31 +43353,31 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.Class",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.TransmitPowerLimit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfile.{i}.TxPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.CurrentOperatingClassProfileNumberOfEntries",
@@ -40977,7 +43389,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.DisAllowedOpClassChannels.{i}.ChannelList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.DisAllowedOpClassChannels.{i}.Enable",
@@ -40989,7 +43401,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.DisAllowedOpClassChannels.{i}.OpClass",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.DisAllowedOpClassChannelsNumberOfEntries",
@@ -41007,49 +43419,49 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.MaxBSS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.MultiAPRadio.RadarDetections",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.OpClassPreference.{i}.ChannelList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.OpClassPreference.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.OpClassPreference.{i}.Preference",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.OpClassPreference.{i}.ReasonCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.OpClassPreferenceNumberOfEntries",
@@ -41067,25 +43479,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.RCPISteeringThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ReceiveOther",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ReceiveSelf",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanCapability.Impact",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanCapability.MinimumInterval",
@@ -41097,19 +43509,19 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanCapability.OnBootOnly",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanCapability.OpClassChannels.{i}.ChannelList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanCapability.OpClassChannels.{i}.OpClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanCapability.OpClassChannelsNumberOfEntries",
@@ -41123,17 +43535,23 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.AggregateScanDuration",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.BSSColor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.BSSID",
@@ -41145,7 +43563,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.BSSLoadElementPresent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.ChannelBandwidth",
@@ -41157,7 +43575,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.ChannelUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.MLDMACAddress",
@@ -41169,7 +43587,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.MultiBSSID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.ReportingBSSID",
@@ -41181,7 +43599,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.NeighborBSS.{i}.SSID",
@@ -41205,7 +43623,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.ScanStatus",
@@ -41213,17 +43631,23 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.ScanType",
+    "writable": false,
+    "deviceClass": "tr181",
+    "type": "xsd:boolean"
+  },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScan.{i}.Utilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.ChannelScanNumberOfEntries",
@@ -41235,7 +43659,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScan.{i}.OperatingClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.OpClassScanNumberOfEntries",
@@ -41247,13 +43671,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.ScanType",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResult.{i}.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.ScanResultNumberOfEntries",
@@ -41265,115 +43689,115 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.BSSColor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.HESIGASpatialReuseValue15Allowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.NeighborBSSColorInUseBitmap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.NonSRGOBSSPDMaxOffset",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.NonSRGOffsetValid",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.PartialBSSColor",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.PSRDisallowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.SRGBSSColorBitmap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.SRGInformationValid",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.SRGOBSSPDMaxOffset",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.SRGOBSSPDMinOffset",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SpatialReuse.SRGPartialBSSIDBitmap",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.STAReportingRCPIHysteresisMarginOverride",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.STAReportingRCPIThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.SteeringPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.TrafficSeparationCombinedBackhaul",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.TrafficSeparationCombinedFronthaul",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Transmit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.UnassociatedSTA.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.UnassociatedSTA.{i}.MACAddress",
@@ -41385,13 +43809,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.UnassociatedSTA.{i}.OperatingClass",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.UnassociatedSTA.{i}.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.UnassociatedSTANumberOfEntries",
@@ -41403,7 +43827,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.Utilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.RadioNumberOfEntries",
@@ -41415,13 +43839,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.ReportIndependentScans",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.ReportUnsuccessfulAssociations",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SerialNumber",
@@ -41433,7 +43857,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.ServicePrioritizationAllowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SoftwareVersion",
@@ -41445,25 +43869,25 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SPRule.{i}.AlwaysMatch",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SPRule.{i}.ID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SPRule.{i}.Output",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SPRule.{i}.Precedence",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SPRuleNumberOfEntries",
@@ -41481,7 +43905,7 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SSIDtoVIDMapping.{i}.VID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.SSIDtoVIDMappingNumberOfEntries",
@@ -41493,13 +43917,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.STASteeringState",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.TestCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.TIDLinkMapCapability",
@@ -41511,13 +43935,13 @@
     "path": "Device.WiFi.DataElements.Network.Device.{i}.TrafficSeparationAllowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.TrafficSeparationCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.DataElements.Network.Device.{i}.WPS.Enable",
@@ -41547,55 +43971,55 @@
     "path": "Device.WiFi.DataElements.Network.MSCSDisallowedStaList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BlacklistAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BlacklistFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BlacklistSuccesses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BTMAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BTMFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BTMQueryResponses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.BTMSuccesses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.MultiAPSteeringSummaryStats.NoCandidateAPFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.ProvisionedDPP.{i}.Alias",
@@ -41619,7 +44043,7 @@
     "path": "Device.WiFi.DataElements.Network.SCSDisallowedStaList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.AdvertisementEnabled",
@@ -41631,7 +44055,7 @@
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.AKMsAllowed",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.Alias",
@@ -41643,7 +44067,7 @@
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.Band",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.Enable",
@@ -41655,7 +44079,7 @@
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.HaulType",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.MFPConfig",
@@ -41679,7 +44103,7 @@
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.SuiteSelector",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.DataElements.Network.SSID.{i}.Type",
@@ -41703,7 +44127,7 @@
     "path": "Device.WiFi.DataElements.Network.STABlock.{i}.BSSID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.STABlock.{i}.Schedule.{i}.Alias",
@@ -41715,7 +44139,7 @@
     "path": "Device.WiFi.DataElements.Network.STABlock.{i}.Schedule.{i}.Day",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.DataElements.Network.STABlock.{i}.Schedule.{i}.Duration",
@@ -41727,7 +44151,7 @@
     "path": "Device.WiFi.DataElements.Network.STABlock.{i}.Schedule.{i}.StartTime",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.WiFi.DataElements.Network.STABlock.{i}.ScheduleNumberOfEntries",
@@ -41745,19 +44169,19 @@
     "path": "Device.WiFi.DataElements.Network.SteeringMandates",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.SteeringOpportunities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.DataElements.Network.TimeStamp",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.AccessCategory",
@@ -41769,13 +44193,13 @@
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.AckPolicy",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.AIFSN",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Alias",
@@ -41787,19 +44211,19 @@
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.ECWMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.ECWMin",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.OutQLenHistogramIntervals",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.OutQLenHistogramSampleInterval",
@@ -41811,55 +44235,55 @@
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.OutQLenHistogram",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.Stats.RetransCount",
@@ -41871,7 +44295,7 @@
     "path": "Device.WiFi.EndPoint.{i}.AC.{i}.TxOpMax",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.Alias",
@@ -41925,19 +44349,19 @@
     "path": "Device.WiFi.EndPoint.{i}.Profile.{i}.Security.ModeEnabled",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:string"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.Profile.{i}.Security.PreSharedKey",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.Profile.{i}.Security.SAEGroupDependantHashEnable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:string"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.Profile.{i}.Security.SAEPassphrase",
@@ -41949,7 +44373,7 @@
     "path": "Device.WiFi.EndPoint.{i}.Profile.{i}.Security.WEPKey",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.Profile.{i}.SSID",
@@ -41979,7 +44403,7 @@
     "path": "Device.WiFi.EndPoint.{i}.Security.ModesSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.SSIDReference",
@@ -42003,13 +44427,13 @@
     "path": "Device.WiFi.EndPoint.{i}.Stats.Retransmissions",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.Stats.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.Status",
@@ -42021,13 +44445,13 @@
     "path": "Device.WiFi.EndPoint.{i}.WPS.ConfigMethodsEnabled",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.WPS.ConfigMethodsSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.EndPoint.{i}.WPS.Enable",
@@ -42069,13 +44493,13 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.BackhaulBytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.BackhaulBytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.BackhaulLinkType",
@@ -42087,7 +44511,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.BackhaulLinkUtilization",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.BackhaulMACAddress",
@@ -42099,7 +44523,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.BackhaulSignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.DFSEnable",
@@ -42111,7 +44535,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.LastContactTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.MACAddress",
@@ -42141,7 +44565,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.RadarDetections",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Active",
@@ -42153,7 +44577,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.AssociationTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.LastDataDownlinkRate",
@@ -42177,7 +44601,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.OperatingStandard",
@@ -42189,49 +44613,49 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.Stats.RetransCount",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}.APDestination",
@@ -42261,7 +44685,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}.Time",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringHistory.{i}.TriggerEvent",
@@ -42279,43 +44703,43 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.BlacklistAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.BlacklistFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.BlacklistSuccesses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.BTMAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.BTMFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.BTMQueryResponses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.BTMSuccesses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.LastSteerTime",
@@ -42327,7 +44751,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDevice.{i}.SteeringSummaryStats.NoCandidateAPFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.AssociatedDeviceNumberOfEntries",
@@ -42339,7 +44763,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.BlacklistAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.BSSID",
@@ -42351,13 +44775,13 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.BTMAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.BTMQueryResponses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.AP.{i}.SSID",
@@ -42375,7 +44799,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.Channel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.CurrentOperatingChannelBandwidth",
@@ -42399,7 +44823,7 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.MCS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.OperatingFrequencyBand",
@@ -42411,25 +44835,25 @@
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.OperatingStandards",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.PossibleChannels",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.TransmitPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.Radio.{i}.TransmitPowerLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.MultiAP.APDevice.{i}.RadioNumberOfEntries",
@@ -42459,49 +44883,49 @@
     "path": "Device.WiFi.MultiAP.SteeringSummaryStats.BlacklistAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.SteeringSummaryStats.BlacklistFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.SteeringSummaryStats.BlacklistSuccesses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.SteeringSummaryStats.BTMAttempts",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.SteeringSummaryStats.BTMFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.SteeringSummaryStats.BTMQueryResponses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.SteeringSummaryStats.BTMSuccesses",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.MultiAP.SteeringSummaryStats.NoCandidateAPFailures",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.DiagnosticsState",
@@ -42513,13 +44937,13 @@
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.BasicDataTransferRates",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.BeaconPeriod",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.BSSID",
@@ -42531,19 +44955,19 @@
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.Channel",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.DTIMPeriod",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.EncryptionMode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.Mode",
@@ -42555,7 +44979,7 @@
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.OperatingChannelBandwidth",
@@ -42573,7 +44997,7 @@
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.OperatingStandards",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.Radio",
@@ -42585,13 +45009,13 @@
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.SecurityModeEnabled",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:boolean"
+    "type": "xsd:string"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.SSID",
@@ -42603,13 +45027,13 @@
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.SupportedDataTransferRates",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.Result.{i}.SupportedStandards",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.NeighboringWiFiDiagnostic.ResultNumberOfEntries",
@@ -42621,13 +45045,13 @@
     "path": "Device.WiFi.Radio.{i}.ActiveReceiveAntennas",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.ActiveTransmitAntennas",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Alias",
@@ -42635,6 +45059,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.WiFi.Radio.{i}.AllowedChannels",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
   {
     "path": "Device.WiFi.Radio.{i}.AutoChannelEnable",
     "writable": true,
@@ -42645,37 +45075,37 @@
     "path": "Device.WiFi.Radio.{i}.AutoChannelRefreshPeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.AutoChannelSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.BasicDataTransmitRates",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.BeaconPeriod",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.EMLMRFreqSeparationNumberOfEntries",
@@ -42687,19 +45117,19 @@
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.EMLMRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.EMLSRFreqSeparationNumberOfEntries",
@@ -42711,19 +45141,19 @@
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.EMLSRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.NSTRFreqSeparationNumberOfEntries",
@@ -42735,19 +45165,19 @@
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.NSTRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.STRFreqSeparationNumberOfEntries",
@@ -42759,25 +45189,25 @@
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.STRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7APRole.TIDLinkMapNegotiation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.EMLMRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.EMLMRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.EMLMRFreqSeparationNumberOfEntries",
@@ -42789,19 +45219,19 @@
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.EMLMRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.EMLSRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.EMLSRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.EMLSRFreqSeparationNumberOfEntries",
@@ -42813,19 +45243,19 @@
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.EMLSRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.NSTRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.NSTRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.NSTRFreqSeparationNumberOfEntries",
@@ -42837,19 +45267,19 @@
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.NSTRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.STRFreqSeparation.{i}.FreqSeparation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.STRFreqSeparation.{i}.RUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.STRFreqSeparationNumberOfEntries",
@@ -42861,61 +45291,61 @@
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.STRSupport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Capabilities.WiFi7STARole.TIDLinkMapNegotiation",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.CCAReport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.CCARequest",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.CenterFrequencySegement0",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.CenterFrequencySegement1",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.CenterFrequencySegment0",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.CenterFrequencySegment1",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Channel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.ChannelLastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.ChannelLastSelectionReason",
@@ -42927,19 +45357,19 @@
     "path": "Device.WiFi.Radio.{i}.ChannelsInUse",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.ConfiguredReceiveAntennas",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.ConfiguredTransmitAntennas",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.CurrentOperatingChannelBandwidth",
@@ -42948,11 +45378,17 @@
     "type": "xsd:string"
   },
   {
-    "path": "Device.WiFi.Radio.{i}.DTIMPeriod",
+    "path": "Device.WiFi.Radio.{i}.Description",
     "writable": true,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.WiFi.Radio.{i}.DTIMPeriod",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:unsignedInt"
+  },
   {
     "path": "Device.WiFi.Radio.{i}.Enable",
     "writable": true,
@@ -42963,7 +45399,7 @@
     "path": "Device.WiFi.Radio.{i}.EnableRRM",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.ExtensionChannel",
@@ -42981,13 +45417,13 @@
     "path": "Device.WiFi.Radio.{i}.FragmentationThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.GuardInterval",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:string"
   },
   {
     "path": "Device.WiFi.Radio.{i}.IEEE80211hEnabled",
@@ -42999,25 +45435,25 @@
     "path": "Device.WiFi.Radio.{i}.IEEE80211hSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Radio.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.LongRetryLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.ManagementPacketRate",
@@ -43035,19 +45471,19 @@
     "path": "Device.WiFi.Radio.{i}.MaxSupportedAssociations",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.MaxSupportedSSIDs",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.MCS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Name",
@@ -43071,13 +45507,13 @@
     "path": "Device.WiFi.Radio.{i}.OperatingStandards",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.OperationalDataTransmitRates",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.PacketAggregationEnable",
@@ -43089,13 +45525,13 @@
     "path": "Device.WiFi.Radio.{i}.PossibleChannels",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.PowerCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.PowerStatus",
@@ -43103,6 +45539,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.WiFi.Radio.{i}.PowerType",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.WiFi.Radio.{i}.PreambleType",
     "writable": true,
@@ -43119,25 +45561,25 @@
     "path": "Device.WiFi.Radio.{i}.RetryLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.RPIHistogramReport",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.RPIHistogramRequest",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.Radio.{i}.RTSThreshold",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.AutoDFSChannelChangeCount",
@@ -43173,61 +45615,61 @@
     "path": "Device.WiFi.Radio.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.CPacketOtherMACReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.CtsOtherMACReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.CtsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.DPacketOtherMACReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.FCSErrorCount",
@@ -43239,13 +45681,13 @@
     "path": "Device.WiFi.Radio.{i}.Stats.FrameHeaderError",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.GoodPLCPReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.InvalidMACCount",
@@ -43263,37 +45705,37 @@
     "path": "Device.WiFi.Radio.{i}.Stats.MPacketOtherMACReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.NoCtsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.PacketsOtherReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.PLCPErrorCount",
@@ -43311,7 +45753,7 @@
     "path": "Device.WiFi.Radio.{i}.Stats.RtsOtherMACReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Stats.TotalChannelChangeCount",
@@ -43329,55 +45771,55 @@
     "path": "Device.WiFi.Radio.{i}.SupportedDataTransmitRates",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.SupportedFrequencyBands",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.SupportedOperatingChannelBandwidths",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.SupportedReceiveAntennas",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.SupportedStandards",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.SupportedTransmitAntennas",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.TransmitPower",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Radio.{i}.TransmitPowerSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int[]"
   },
   {
     "path": "Device.WiFi.Radio.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.RadioNumberOfEntries",
@@ -43389,7 +45831,7 @@
     "path": "Device.WiFi.RemoteMeasurementDiagnostic.Channel",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.RemoteMeasurementDiagnostic.DiagnosticsState",
@@ -43401,19 +45843,19 @@
     "path": "Device.WiFi.RemoteMeasurementDiagnostic.Noise",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.RemoteMeasurementDiagnostic.OperatingClass",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.RemoteMeasurementDiagnostic.SignalStrength",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.RemoteMeasurementDiagnostic.TargetBSS",
@@ -43443,7 +45885,7 @@
     "path": "Device.WiFi.ResetCounter",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Alias",
@@ -43463,6 +45905,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.WiFi.SSID.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.WiFi.SSID.{i}.Enable",
     "writable": true,
@@ -43473,19 +45921,19 @@
     "path": "Device.WiFi.SSID.{i}.FlushATFTable",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.SSID.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.SSID.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.SSID.{i}.MACAddress",
@@ -43497,7 +45945,7 @@
     "path": "Device.WiFi.SSID.{i}.MLDUnit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.SSID.{i}.MTU",
@@ -43507,7 +45955,7 @@
   },
   {
     "path": "Device.WiFi.SSID.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -43515,7 +45963,7 @@
     "path": "Device.WiFi.SSID.{i}.SetATF",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.SSID.{i}.SSID",
@@ -43533,7 +45981,7 @@
     "path": "Device.WiFi.SSID.{i}.Stats.AckUcastReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.AggregatedPacketCount",
@@ -43545,67 +45993,67 @@
     "path": "Device.WiFi.SSID.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.DiscardPacketsSentBufOverflow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.DiscardPacketsSentNoAssoc",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.DupReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.FailedRetransCount",
@@ -43617,19 +46065,19 @@
     "path": "Device.WiFi.SSID.{i}.Stats.FragSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.MultipleRetryCount",
@@ -43641,13 +46089,13 @@
     "path": "Device.WiFi.SSID.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.Reset",
@@ -43671,41 +46119,41 @@
     "path": "Device.WiFi.SSID.{i}.Stats.SentNoAck",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.TooLongReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.TooShortReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.SSID.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -43713,7 +46161,7 @@
     "path": "Device.WiFi.SSID.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.SSIDNumberOfEntries",
@@ -43767,7 +46215,7 @@
     "path": "Device.WiFi.Templates.APMLDTemplate.{i}.TIDToLinkMapNegotiation",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Templates.APMLDTemplateNumberOfEntries",
@@ -43809,7 +46257,7 @@
     "path": "Device.WiFi.Templates.BSSTemplate.{i}.IEEE1905ALID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.BSSTemplate.{i}.KeyPassphrase",
@@ -43845,7 +46293,7 @@
     "path": "Device.WiFi.Templates.BSSTemplate.{i}.MaxWLANHopLimitFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Templates.BSSTemplate.{i}.Priority",
@@ -43887,7 +46335,7 @@
     "path": "Device.WiFi.Templates.BSSTemplate.{i}.TopologyFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.BSSTemplateNumberOfEntries",
@@ -43905,7 +46353,7 @@
     "path": "Device.WiFi.Templates.Network.IEEE1905ALID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.Network.PrimarySSCTemplateID",
@@ -43923,7 +46371,7 @@
     "path": "Device.WiFi.Templates.Network.TopologyFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.RadioTemplate.{i}.AFCSupportFlag",
@@ -43941,7 +46389,7 @@
     "path": "Device.WiFi.Templates.RadioTemplate.{i}.BandFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.RadioTemplate.{i}.DFSSupportFlag",
@@ -43959,13 +46407,13 @@
     "path": "Device.WiFi.Templates.RadioTemplate.{i}.OpClassFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.Templates.RadioTemplate.{i}.OperatingGeneration",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.RadioTemplate.{i}.Priority",
@@ -43983,13 +46431,13 @@
     "path": "Device.WiFi.Templates.RadioTemplate.{i}.SupportedGenerationFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.Templates.RadioTemplate.{i}.TransmitPowerLimit",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WiFi.Templates.RadioTemplateNumberOfEntries",
@@ -44001,7 +46449,7 @@
     "path": "Device.WiFi.Templates.SecurityGroup.{i}.LinkedSecurityTemplateID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityGroup.{i}.SecurityGroupID",
@@ -44013,7 +46461,7 @@
     "path": "Device.WiFi.Templates.SecurityGroup.{i}.SecurityTemplateReferences",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityGroupNumberOfEntries",
@@ -44037,7 +46485,7 @@
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.OperatingGenerationFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.Priority",
@@ -44049,13 +46497,13 @@
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNE.AKMSuite",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNE.AKMSuiteSelector",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNE.GroupDataCipherSuite",
@@ -44079,19 +46527,19 @@
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNE.PairwiseCipherSuite",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNO2E.AKMSuite",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNO2E.AKMSuiteSelector",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNO2E.GroupDataCipherSuite",
@@ -44115,19 +46563,19 @@
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNO2E.PairwiseCipherSuite",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNOE.AKMSuite",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNOE.AKMSuiteSelector",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNOE.GroupDataCipherSuite",
@@ -44151,7 +46599,7 @@
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNOE.PairwiseCipherSuite",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNOSupportFlag",
@@ -44163,19 +46611,19 @@
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNXE.SAEH2E",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.RSNXOE.SAEH2E",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.SecurityIEs",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.SecurityTemplateID",
@@ -44187,13 +46635,13 @@
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.SupportedAKMSuiteFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplate.{i}.SupportedAKMSuiteSelectorFlag",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary[]"
   },
   {
     "path": "Device.WiFi.Templates.SecurityTemplateNumberOfEntries",
@@ -44211,7 +46659,7 @@
     "path": "Device.WiFi.Templates.SSCTemplate.{i}.HaulType",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WiFi.Templates.SSCTemplate.{i}.SSCEnable",
@@ -44229,7 +46677,7 @@
     "path": "Device.WiFi.Templates.SSCTemplate.{i}.VID",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WiFi.Templates.SSCTemplateNumberOfEntries",
@@ -44247,7 +46695,7 @@
     "path": "Device.WireGuard.Peer.{i}.AllowedIPs",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WireGuard.Peer.{i}.Enable",
@@ -44265,7 +46713,7 @@
     "path": "Device.WireGuard.Peer.{i}.EndpointPort",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:int"
   },
   {
     "path": "Device.WireGuard.Peer.{i}.LastHandshakeTime",
@@ -44277,7 +46725,7 @@
     "path": "Device.WireGuard.Peer.{i}.PersistentKeepalive",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WireGuard.Peer.{i}.PresharedKey",
@@ -44315,6 +46763,12 @@
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
+  {
+    "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Enable",
     "writable": true,
@@ -44323,19 +46777,19 @@
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.LastChange",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Name",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
@@ -44343,73 +46797,73 @@
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.Reset",
@@ -44421,29 +46875,29 @@
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Interface.{i}.Status",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.InterfaceNumberOfEntries",
-    "writable": true,
+    "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
@@ -44457,55 +46911,55 @@
     "path": "Device.WireGuard.Tunnel.{i}.PeerReferences",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.PrivateKey",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.PublicKey",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:base64Binary"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.WireGuard.Tunnel.{i}.Status",
@@ -44541,19 +46995,19 @@
     "path": "Device.WWC.AccessNetwork.{i}.GUTI.AMFId",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.AccessNetwork.{i}.GUTI.PLMN",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.AccessNetwork.{i}.GUTI.TMSI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.AccessNetwork.{i}.Interface",
@@ -44565,7 +47019,7 @@
     "path": "Device.WWC.AccessNetwork.{i}.LastError",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.AccessNetwork.{i}.Name",
@@ -44589,7 +47043,7 @@
     "path": "Device.WWC.HwCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WWC.Mode",
@@ -44607,7 +47061,7 @@
     "path": "Device.WWC.SwCapabilities",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.WWC.URSP.{i}.Alias",
@@ -44619,7 +47073,7 @@
     "path": "Device.WWC.URSP.{i}.Precedence",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.URSP.{i}.TrafficDescriptor.{i}.Alias",
@@ -44649,7 +47103,7 @@
     "path": "Device.WWC.URSP.{i}.TrafficDescriptor.{i}.RouteSelectionDescriptor.{i}.NetworkSlice.SliceDifferentiator",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.URSP.{i}.TrafficDescriptor.{i}.RouteSelectionDescriptor.{i}.NetworkSlice.SliceServiceType",
@@ -44667,13 +47121,13 @@
     "path": "Device.WWC.URSP.{i}.TrafficDescriptor.{i}.RouteSelectionDescriptor.{i}.Precedence",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.URSP.{i}.TrafficDescriptor.{i}.RouteSelectionDescriptor.{i}.SSC",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.URSP.{i}.TrafficDescriptor.{i}.RouteSelectionDescriptorNumberOfEntries",
@@ -44685,7 +47139,7 @@
     "path": "Device.WWC.URSP.{i}.TrafficDescriptor.{i}.Type",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.WWC.URSP.{i}.TrafficDescriptor.{i}.Value",
@@ -44705,6 +47159,150 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.X_PRPLWARE-COM_Agent.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_Agent.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_Buttons.Button.{i}.Action",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_Buttons.Button.{i}.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_Buttons.Button.{i}.Name",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_Controller.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_Controller.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_MultiSettings.CurrentProfile",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_MultiSettings.Profile.{i}.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_MultiSettings.Profile.{i}.Name",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_PacketInterception.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_PacketInterception.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_PersistentConfiguration.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WANManager.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WANManager.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WANManager.WANInterface.{i}.ExternalIP",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WANManager.WANInterface.{i}.Mode",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WANManager.WANInterface.{i}.Name",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WANManager.WANInterface.{i}.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WANManager.WANMode",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WiFiController.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WiFiController.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WiFiSensing.Enable",
+    "writable": true,
+    "deviceClass": "prplos",
+    "type": "xsd:boolean"
+  },
+  {
+    "path": "Device.X_PRPLWARE-COM_WiFiSensing.Status",
+    "writable": false,
+    "deviceClass": "prplos",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.XMPP.Connection.{i}.Alias",
     "writable": true,
@@ -44733,13 +47331,13 @@
     "path": "Device.XMPP.Connection.{i}.KeepAliveInterval",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:long"
   },
   {
     "path": "Device.XMPP.Connection.{i}.LastChangeDate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.XMPP.Connection.{i}.Password",
@@ -44787,7 +47385,7 @@
     "path": "Device.XMPP.Connection.{i}.Server.{i}.Weight",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:long"
   },
   {
     "path": "Device.XMPP.Connection.{i}.ServerConnectAlgorithm",
@@ -44799,7 +47397,7 @@
     "path": "Device.XMPP.Connection.{i}.ServerConnectAttempts",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XMPP.Connection.{i}.ServerNumberOfEntries",
@@ -44817,7 +47415,7 @@
     "path": "Device.XMPP.Connection.{i}.ServerRetryIntervalMultiplier",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XMPP.Connection.{i}.ServerRetryMaxInterval",
@@ -44829,25 +47427,25 @@
     "path": "Device.XMPP.Connection.{i}.Stats.ReceivedErrorMessages",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XMPP.Connection.{i}.Stats.ReceivedMessages",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XMPP.Connection.{i}.Stats.TransmittedErrorMessages",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XMPP.Connection.{i}.Stats.TransmittedMessages",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XMPP.Connection.{i}.Status",
@@ -44859,7 +47457,7 @@
     "path": "Device.XMPP.Connection.{i}.TLSEstablished",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XMPP.Connection.{i}.Username",
@@ -44871,7 +47469,7 @@
     "path": "Device.XMPP.Connection.{i}.UseTLS",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XMPP.ConnectionNumberOfEntries",
@@ -44883,7 +47481,7 @@
     "path": "Device.XMPP.SupportedServerConnectAlgorithms",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Alias",
@@ -44901,7 +47499,7 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Name",
@@ -44919,97 +47517,97 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.SFPReferenceList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Status",
@@ -45021,97 +47619,97 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.DACT",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.DIS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.LCDG",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.LODS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.LOF",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.LOS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.MEM",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.MIS",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.PEE",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.RDI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.ROGUE",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.SD",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.SF",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.SUF",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Alarms.TF",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Authentication.HexadecimalPassword",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.Authentication.Password",
@@ -45129,19 +47727,19 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.GEM.Port.{i}.PM.FramesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.GEM.Port.{i}.PM.FramesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.GEM.Port.{i}.PortID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.GEM.Port.{i}.PortType",
@@ -45159,7 +47757,7 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.ONUActivation.ONUID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.ONUActivation.ONUState",
@@ -45183,13 +47781,13 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PerformanceThresholds.SignalDegrade",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PerformanceThresholds.SignalFail",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.GEM.FrameHeaderHECErrors",
@@ -45201,13 +47799,13 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.GEM.FramesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.GEM.FramesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.GEM.KeyErrors",
@@ -45219,13 +47817,13 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.OMCI.BaselineMessagesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.OMCI.ExtendedMessagesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.OMCI.MICErrors",
@@ -45237,13 +47835,13 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PHY.CorrectedFECBytes",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PHY.CorrectedFECCodewords",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PHY.HeaderHECErrorCount",
@@ -45261,25 +47859,25 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PHY.TotalFECCodewords",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PHY.UncorrectableFECCodewords",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PHY.UnknownProfile",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PLOAM.DownstreamMessageCount",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PLOAM.MICErrors",
@@ -45291,19 +47889,19 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PLOAM.RangingTime",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TC.PM.PLOAM.UpstreamMessageCount",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:unsignedInt"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.Bias",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.Connector",
@@ -45315,25 +47913,25 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.ID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.Identifier",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.NominalBitRateDownstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.NominalBitRateUpstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.PONMode",
@@ -45345,19 +47943,19 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.RxPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.Temperature",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.TxPower",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:int"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.VendorName",
@@ -45381,7 +47979,7 @@
     "path": "Device.XPON.ONU.{i}.ANI.{i}.Transceiver.{i}.Voltage",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.ANI.{i}.TransceiverNumberOfEntries",
@@ -45417,6 +48015,12 @@
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.ANIs",
     "writable": false,
     "deviceClass": "tr181",
+    "type": "xsd:string[]"
+  },
+  {
+    "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
     "type": "xsd:string"
   },
   {
@@ -45441,13 +48045,13 @@
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Name",
@@ -45459,73 +48063,73 @@
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.Reset",
@@ -45537,19 +48141,19 @@
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Status",
@@ -45561,7 +48165,7 @@
     "path": "Device.XPON.ONU.{i}.EthernetUNI.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.EthernetUNINumberOfEntries",
@@ -45579,19 +48183,19 @@
     "path": "Device.XPON.ONU.{i}.PowerCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.XPON.ONU.{i}.PowerManagement.ITransInit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.PowerManagement.ITxInit",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.PowerManagement.MaxSleepInterval",
@@ -45603,7 +48207,7 @@
     "path": "Device.XPON.ONU.{i}.PowerManagement.MaxSleepIntervalExtension",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.XPON.ONU.{i}.PowerManagement.MinActiveHeldInterval",
@@ -45621,13 +48225,13 @@
     "path": "Device.XPON.ONU.{i}.PowerManagement.OLTSleepAllow",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.PowerManagement.PowerReductionManagementCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.XPON.ONU.{i}.PowerManagement.PowerReductionManagementStatus",
@@ -45645,25 +48249,25 @@
     "path": "Device.XPON.ONU.{i}.SoftwareImage.{i}.ID",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.XPON.ONU.{i}.SoftwareImage.{i}.IsActive",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.SoftwareImage.{i}.IsCommitted",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.SoftwareImage.{i}.IsValid",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.XPON.ONU.{i}.SoftwareImage.{i}.Version",
@@ -45711,7 +48315,7 @@
     "path": "Device.ZigBee.Discovery.AreaNetwork.{i}.LastUpdate",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:dateTime"
   },
   {
     "path": "Device.ZigBee.Discovery.AreaNetwork.{i}.Status",
@@ -45723,7 +48327,7 @@
     "path": "Device.ZigBee.Discovery.AreaNetwork.{i}.ZDOList",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ZigBee.Discovery.AreaNetwork.{i}.ZDOReference",
@@ -45773,6 +48377,12 @@
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
   },
+  {
+    "path": "Device.ZigBee.Interface.{i}.Description",
+    "writable": true,
+    "deviceClass": "tr181",
+    "type": "xsd:string"
+  },
   {
     "path": "Device.ZigBee.Interface.{i}.Enable",
     "writable": true,
@@ -45789,13 +48399,13 @@
     "path": "Device.ZigBee.Interface.{i}.LastChange",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.LowerLayers",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.MaxBitRate",
@@ -45819,73 +48429,73 @@
     "path": "Device.ZigBee.Interface.{i}.Stats.BroadcastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.BroadcastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.BytesReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.BytesSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.DiscardPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.DiscardPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.ErrorsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.ErrorsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.MulticastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.MulticastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.PacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.PacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.Reset",
@@ -45897,25 +48507,25 @@
     "path": "Device.ZigBee.Interface.{i}.Stats.UnicastPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.UnicastPacketsSent",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedLong"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.UnknownPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Stats.UnknownProtoPacketsReceived",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.Status",
@@ -45927,7 +48537,7 @@
     "path": "Device.ZigBee.Interface.{i}.Upstream",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ZigBee.Interface.{i}.ZDOReference",
@@ -45963,37 +48573,37 @@
     "path": "Device.ZigBee.ZDO.{i}.ApplicationEndpoint.{i}.EndpointId",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.ApplicationEndpoint.{i}.SimpleDescriptor.DeviceId",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.ApplicationEndpoint.{i}.SimpleDescriptor.DeviceVersion",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.ApplicationEndpoint.{i}.SimpleDescriptor.InputClusterList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.ApplicationEndpoint.{i}.SimpleDescriptor.OutputClusterList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt[]"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.ApplicationEndpoint.{i}.SimpleDescriptor.ProfileId",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.ApplicationEndpointNumberOfEntries",
@@ -46011,7 +48621,7 @@
     "path": "Device.ZigBee.ZDO.{i}.Binding.{i}.ClusterId",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.Binding.{i}.DestinationAddressMode",
@@ -46023,7 +48633,7 @@
     "path": "Device.ZigBee.ZDO.{i}.Binding.{i}.DestinationEndpoint",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.Binding.{i}.Enable",
@@ -46053,7 +48663,7 @@
     "path": "Device.ZigBee.ZDO.{i}.Binding.{i}.SourceEndpoint",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.BindingTableNumberOfEntries",
@@ -46071,7 +48681,7 @@
     "path": "Device.ZigBee.ZDO.{i}.ComplexDescriptor.DescriptorAvailable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.ComplexDescriptor.DeviceURL",
@@ -46083,7 +48693,7 @@
     "path": "Device.ZigBee.ZDO.{i}.ComplexDescriptor.Icon",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:hexBinary"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.ComplexDescriptor.IconURL",
@@ -46131,7 +48741,7 @@
     "path": "Device.ZigBee.ZDO.{i}.Group.{i}.EndpointList",
     "writable": true,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.Group.{i}.GroupId",
@@ -46155,13 +48765,13 @@
     "path": "Device.ZigBee.ZDO.{i}.Network.Neighbor.{i}.Depth",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.Network.Neighbor.{i}.LQI",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.Network.Neighbor.{i}.Neighbor",
@@ -46197,19 +48807,19 @@
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.ComplexDescriptorSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.DescriptorCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.FrequencyBand",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.LogicalType",
@@ -46221,13 +48831,13 @@
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.MACCapability",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.ManufactureCode",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.MaximumBufferSize",
@@ -46251,13 +48861,13 @@
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.ServerMask",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeDescriptor.UserDescriptorSupported",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeManager.RoutingTable.{i}.DestinationAddress",
@@ -46269,13 +48879,13 @@
     "path": "Device.ZigBee.ZDO.{i}.NodeManager.RoutingTable.{i}.ManyToOne",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeManager.RoutingTable.{i}.MemoryConstrained",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeManager.RoutingTable.{i}.NextHopAddress",
@@ -46287,7 +48897,7 @@
     "path": "Device.ZigBee.ZDO.{i}.NodeManager.RoutingTable.{i}.RouteRecordRequired",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.NodeManager.RoutingTable.{i}.Status",
@@ -46305,7 +48915,7 @@
     "path": "Device.ZigBee.ZDO.{i}.PowerDescriptor.AvailablePowerSource",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:string[]"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.PowerDescriptor.CurrentPowerMode",
@@ -46335,7 +48945,7 @@
     "path": "Device.ZigBee.ZDO.{i}.Security.TimeOutPeriod",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:unsignedInt"
   },
   {
     "path": "Device.ZigBee.ZDO.{i}.Security.TrustCenterAddress",
@@ -46353,12 +48963,18 @@
     "path": "Device.ZigBee.ZDO.{i}.UserDescriptor.DescriptorAvailable",
     "writable": false,
     "deviceClass": "tr181",
-    "type": "xsd:string"
+    "type": "xsd:boolean"
   },
   {
     "path": "Device.ZigBee.ZDONumberOfEntries",
     "writable": false,
     "deviceClass": "tr181",
     "type": "xsd:unsignedInt"
+  },
+  {
+    "path": "Services.X_ORANGE-COM_PnP.State",
+    "writable": false,
+    "deviceClass": "orange",
+    "type": "xsd:string"
   }
-]
\ No newline at end of file
+]
diff --git a/inertia/components/SequenceViewer.vue b/inertia/components/SequenceViewer.vue
index e27f3f5..290f144 100644
--- a/inertia/components/SequenceViewer.vue
+++ b/inertia/components/SequenceViewer.vue
@@ -297,6 +297,31 @@ async function confirmClear() {
 // --- Computed ---
 const hasMessages = computed(() => messages.value.length > 0)
 
+// Group messages by sessionId for visual session boundaries
+const sessionGroups = computed(() => {
+  const groups: Array<{ sessionId: string; messages: CwmpExchange[]; firstMethod: string }> = []
+  let currentGroup: { sessionId: string; messages: CwmpExchange[]; firstMethod: string } | null = null
+
+  for (const msg of messages.value) {
+    if (!currentGroup || currentGroup.sessionId !== msg.sessionId) {
+      currentGroup = { sessionId: msg.sessionId, messages: [], firstMethod: msg.cwmpMethod }
+      groups.push(currentGroup)
+    }
+    currentGroup.messages.push(msg)
+  }
+  return groups
+})
+
+// Scroll to a specific session group
+function scrollToSession(groupIndex: number) {
+  const el = document.getElementById(`session-group-${groupIndex}`)
+  if (el && scrollContainer.value) {
+    const containerTop = scrollContainer.value.getBoundingClientRect().top
+    const elTop = el.getBoundingClientRect().top
+    scrollContainer.value.scrollTop += (elTop - containerTop)
+  }
+}
+
 const connectionBadgeClass = computed(() => {
   switch (connectionState.value) {
     case 'connected':
@@ -444,11 +469,31 @@ watch(
         </button>
       </div>
 
+      <!-- Session dropdown (clickable to jump) -->
+      <div v-if="sessionGroups.length > 1" class="d-flex align-items-center gap-2 px-3 py-2 border-bottom bg-light">
+        <label class="text-muted small fw-semibold text-nowrap mb-0" style="font-size: 0.7rem">Session :</label>
+        <select
+          class="form-select form-select-sm"
+          style="font-size: 0.72rem; max-width: 320px"
+          @change="scrollToSession(Number(($event.target as HTMLSelectElement).value))"
+        >
+          <option value="" disabled selected>Aller à…</option>
+          <option
+            v-for="(group, idx) in sessionGroups"
+            :key="'nav-' + idx"
+            :value="idx"
+          >
+            S{{ idx + 1 }} — {{ group.firstMethod }} ({{ group.messages.length }} msg)
+          </option>
+        </select>
+        <span class="text-muted small text-nowrap" style="font-size: 0.7rem">{{ sessionGroups.length }} sessions</span>
+      </div>
+
       <!-- Lifeline headers -->
       <div class="d-flex align-items-center border-bottom px-3 py-2 bg-light">
-        <div class="text-center fw-bold small" style="width: 24px">CPE</div>
+        <div class="text-center fw-bold small text-nowrap" style="width: 36px">CPE</div>
         <div class="flex-grow-1"></div>
-        <div class="text-center fw-bold small" style="width: 24px">ACS</div>
+        <div class="text-center fw-bold small text-nowrap" style="width: 36px">ACS</div>
       </div>
 
       <!-- Messages container with scroll -->
@@ -472,60 +517,73 @@ watch(
         </div>
 
         <div
-          v-for="message in messages"
-          :key="message.sequenceNumber"
-          class="sequence-row d-flex align-items-center px-3 py-2 border-bottom"
-          :class="{
-            'sequence-row--selected': selectedMessage?.sequenceNumber === message.sequenceNumber,
-            'sequence-row--cpe-to-acs': message.direction === 'CPE→ACS',
-            'sequence-row--acs-to-cpe': message.direction === 'ACS→CPE',
-          }"
-          role="button"
-          tabindex="0"
-          @click="selectMessage(message)"
-          @keydown.enter="selectMessage(message)"
-          @keydown.space.prevent="selectMessage(message)"
+          v-for="(group, groupIndex) in sessionGroups"
+          :key="group.sessionId + '-' + groupIndex"
+          :id="'session-group-' + groupIndex"
+          class="session-group"
         >
-          <!-- CPE lifeline -->
-          <div class="lifeline-column text-center" style="width: 24px">
-            <div class="lifeline-bar"></div>
+          <!-- Session label -->
+          <div class="session-label d-flex align-items-center px-3 py-1">
+            <span class="session-badge font-monospace">Session {{ groupIndex + 1 }}</span>
+            <span class="session-id text-muted font-monospace ms-2">{{ group.sessionId.split('->')[0]?.split(':').pop() || '' }}</span>
           </div>
 
-          <!-- Arrow area -->
-          <div class="flex-grow-1 d-flex flex-column align-items-center position-relative">
-            <!-- Method label -->
-            <span
-              v-if="message.cwmpMethod === 'Empty'"
-              class="small text-muted fst-italic mb-1"
-            >
-              POST vide
-            </span>
-            <span
-              v-else
-              class="small fw-medium mb-1"
-              :title="needsTruncation(message.cwmpMethod) ? message.cwmpMethod : undefined"
-            >
-              {{ truncateMethod(message.cwmpMethod) }}
-            </span>
-
-            <!-- Arrow -->
-            <div class="sequence-arrow w-100 position-relative" :class="[
-              message.direction === 'CPE→ACS' ? 'arrow-right' : 'arrow-left',
-              message.cwmpMethod === 'Empty' ? 'arrow-empty' : ''
-            ]">
-              <div class="arrow-line"></div>
-              <div class="arrow-head"></div>
+          <div
+            v-for="message in group.messages"
+            :key="message.sequenceNumber"
+            class="sequence-row d-flex align-items-center px-3 py-2"
+            :class="{
+              'sequence-row--selected': selectedMessage?.sequenceNumber === message.sequenceNumber,
+              'sequence-row--cpe-to-acs': message.direction === 'CPE→ACS',
+              'sequence-row--acs-to-cpe': message.direction === 'ACS→CPE',
+            }"
+            role="button"
+            tabindex="0"
+            @click="selectMessage(message)"
+            @keydown.enter="selectMessage(message)"
+            @keydown.space.prevent="selectMessage(message)"
+          >
+            <!-- CPE lifeline -->
+            <div class="lifeline-column text-center" style="width: 36px">
+              <div class="lifeline-bar"></div>
             </div>
 
-            <!-- Timestamp -->
-            <span class="font-monospace text-muted mt-1" style="font-size: 0.7rem">
-              {{ formatTimestamp(message.timestamp) }}
-            </span>
-          </div>
+            <!-- Arrow area -->
+            <div class="flex-grow-1 d-flex flex-column align-items-center position-relative">
+              <!-- Method label -->
+              <span
+                v-if="message.cwmpMethod === 'Empty'"
+                class="small text-muted fst-italic mb-1"
+              >
+                POST vide
+              </span>
+              <span
+                v-else
+                class="small fw-medium mb-1"
+                :title="needsTruncation(message.cwmpMethod) ? message.cwmpMethod : undefined"
+              >
+                {{ truncateMethod(message.cwmpMethod) }}
+              </span>
 
-          <!-- ACS lifeline -->
-          <div class="lifeline-column text-center" style="width: 24px">
-            <div class="lifeline-bar"></div>
+              <!-- Arrow -->
+              <div class="sequence-arrow w-100 position-relative" :class="[
+                message.direction === 'CPE→ACS' ? 'arrow-right' : 'arrow-left',
+                message.cwmpMethod === 'Empty' ? 'arrow-empty' : ''
+              ]">
+                <div class="arrow-line"></div>
+                <div class="arrow-head"></div>
+              </div>
+
+              <!-- Timestamp -->
+              <span class="font-monospace text-muted mt-1" style="font-size: 0.7rem">
+                {{ formatTimestamp(message.timestamp) }}
+              </span>
+            </div>
+
+            <!-- ACS lifeline -->
+            <div class="lifeline-column text-center" style="width: 36px">
+              <div class="lifeline-bar"></div>
+            </div>
           </div>
         </div>
       </div>
@@ -586,16 +644,25 @@ watch(
 }
 
 .sequence-row--selected {
-  background-color: var(--bs-primary-bg-subtle, #e7f1ff) !important;
-  border-left: 3px solid var(--bs-primary, #ff7900) !important;
+  background-color: #e7f1ff !important;
+  outline: 2px solid #0d6efd;
+  outline-offset: -2px;
 }
 
 .sequence-row--cpe-to-acs .arrow-line {
-  background-color: var(--bs-primary, #ff7900);
+  background-color: #ff7900;
 }
 
 .sequence-row--cpe-to-acs .arrow-head {
-  border-left-color: var(--bs-primary, #ff7900);
+  border-left-color: #ff7900;
+}
+
+.sequence-row--selected.sequence-row--cpe-to-acs .arrow-line {
+  background-color: #ff7900;
+}
+
+.sequence-row--selected.sequence-row--cpe-to-acs .arrow-head {
+  border-left-color: #ff7900;
 }
 
 .sequence-row--acs-to-cpe .arrow-line {
@@ -676,4 +743,39 @@ watch(
 .top-sentinel {
   min-height: 1px;
 }
+
+.session-group {
+  border-left: 3px solid #e9ecef;
+  margin: 8px 4px;
+  border-radius: 6px;
+  background: #fcfcfd;
+  box-shadow: 0 0 0 1px #e9ecef;
+  overflow: hidden;
+}
+
+.session-group:nth-child(odd) {
+  border-left-color: #ff7900;
+}
+
+.session-group:nth-child(even) {
+  border-left-color: #527edb;
+}
+
+.session-label {
+  background: #f1f3f5;
+  border-bottom: 1px solid #e9ecef;
+}
+
+.session-badge {
+  font-size: 0.62rem;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  color: #495057;
+}
+
+.session-id {
+  font-size: 0.6rem;
+}
+
 </style>
diff --git a/inertia/pages/DeviceDetail.vue b/inertia/pages/DeviceDetail.vue
index 051df23..a769fb1 100644
--- a/inertia/pages/DeviceDetail.vue
+++ b/inertia/pages/DeviceDetail.vue
@@ -3,9 +3,6 @@ import { ref } from 'vue'
 import { router, Link } from '@inertiajs/vue3'
 import { useI18n } from 'vue-i18n'
 import TitleBar from '../components/TitleBar.vue'
-import SequenceViewer from '../components/SequenceViewer.vue'
-import InspectorPanel from '../components/InspectorPanel.vue'
-import type { CwmpExchange } from '../composables/useExchangeStream'
 
 const { t } = useI18n()
 
@@ -19,68 +16,40 @@ const isLoading = ref(false)
 const showDeleteConfirm = ref(false)
 const isTraced = ref(false)
 const tracingAction = ref(false)
-const traceStartedAt = ref<string | null>(null)
-const selectedMessage = ref<CwmpExchange | null>(null)
 
-// Check if device is already traced
 async function checkTraceStatus() {
   try {
     const response = await fetch('/api/v1/tr069-trace')
     if (response.ok) {
       const data = await response.json()
-      const entries = data.entries || []
-      const entry = entries.find((e: any) => e.deviceId === device.identifier)
-      isTraced.value = !!entry
-      if (entry) {
-        traceStartedAt.value = entry.startedAt || new Date().toISOString()
-      }
+      isTraced.value = (data.entries || []).some((e: any) => e.deviceId === device.identifier)
     }
-  } catch {
-    // Silently ignore
-  }
+  } catch { /* ignore */ }
 }
 
 async function toggleTrace() {
   tracingAction.value = true
   try {
     if (isTraced.value) {
-      const response = await fetch(`/api/v1/tr069-trace/${encodeURIComponent(device.identifier)}`, {
-        method: 'DELETE',
-      })
-      if (response.ok || response.status === 204) {
-        isTraced.value = false
-        traceStartedAt.value = null
-        selectedMessage.value = null
-      }
+      await fetch(`/api/v1/tr069-trace/${encodeURIComponent(device.identifier)}`, { method: 'DELETE' })
+      isTraced.value = false
     } else {
       const response = await fetch('/api/v1/tr069-trace', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ deviceId: device.identifier }),
       })
-      if (response.ok) {
-        const data = await response.json()
-        isTraced.value = true
-        traceStartedAt.value = data.entry?.startedAt || new Date().toISOString()
-      }
+      if (response.ok) isTraced.value = true
     }
-  } catch {
-    // Silently ignore
-  } finally {
-    tracingAction.value = false
-  }
+  } catch { /* ignore */ }
+  finally { tracingAction.value = false }
 }
 
 checkTraceStatus()
 
-function onMessageSelect(message: CwmpExchange | null) {
-  selectedMessage.value = message
-}
-
-function deleteDevice() {
-  router.delete(`/devices/${encodeURIComponent(device.identifier)}`, {
-    onSuccess: () => router.visit('/devices'),
-  })
+async function deleteDevice() {
+  await fetch(`/api/v1/devices/${encodeURIComponent(device.identifier)}`, { method: 'DELETE' })
+  router.visit('/')
 }
 const showGetModelPopup = ref(false)
 const getModelInput = ref('')
@@ -147,8 +116,8 @@ function submitGetModel() {
 const estimatedNextConnection = (() => {
   const lastPeriodic = device.lastPeriodicInformAt
   if (!lastPeriodic) return null
-  const allParams = [...(device.properties || []), ...(device.parameters || [])]
-  const intervalParam = allParams.find((p: any) => p.name?.includes('PeriodicInformInterval'))
+  const allParams = [...(device.properties || []), ...(device.parameters || [])].filter((p: any) => p && typeof p.name === 'string')
+  const intervalParam = allParams.find((p: any) => p.name.includes('PeriodicInformInterval'))
   const intervalSeconds = intervalParam?.value ? parseInt(intervalParam.value, 10) : 0
   if (!intervalSeconds || intervalSeconds <= 0) return null
   const next = new Date(new Date(lastPeriodic).getTime() + intervalSeconds * 1000)
@@ -157,12 +126,11 @@ const estimatedNextConnection = (() => {
 
 // Check if the device has a ConnectionRequestURL (needed for immediate mode / Refresh)
 const hasConnectionRequestUrl = (() => {
-  const allParams = [...(device.properties || []), ...(device.parameters || [])]
+  const allParams = [...(device.properties || []), ...(device.parameters || [])].filter((p: any) => p && typeof p.name === 'string')
   const crUrl = allParams.find(
     (p: any) =>
-      p.name &&
-      (p.name.endsWith('ManagementServer.ConnectionRequestURL') ||
-        p.name.endsWith('.ConnectionRequestURL'))
+      p.name.endsWith('ManagementServer.ConnectionRequestURL') ||
+        p.name.endsWith('.ConnectionRequestURL')
   )
   return crUrl && crUrl.value && crUrl.value.trim() !== ''
 })()
@@ -232,11 +200,6 @@ async function resolveAllProviders() {
                 Actions
               </a>
             </li>
-            <li v-if="isTraced" class="nav-item">
-              <a class="nav-link" :class="{ active: activeSection === 'exchanges' }" href="javascript:void(0);" @click="scrollTo('exchanges')">
-                Échanges TR-069
-              </a>
-            </li>
             <li class="nav-item">
               <a class="nav-link" :class="{ active: activeSection === 'commands' }" href="javascript:void(0);" @click="scrollTo('commands')">
                 {{ t('titles.commands') }}
@@ -426,7 +389,7 @@ async function resolveAllProviders() {
         <!-- Section: Properties (collapsible) -->
         <div class="accordion-section mb-3" id="properties">
           <div class="section-header" @click="toggleSection('properties')">
-            <h2 class="h6 mb-0">{{ t('labels.properties') }} ({{ device.properties?.filter((p: any) => p.value != null).length || 0 }})</h2>
+            <h2 class="h6 mb-0">{{ t('labels.properties') }} ({{ device.properties?.filter((p: any) => typeof p.name === 'string' && p.value != null).length || 0 }})</h2>
             <span class="chevron" :class="{ open: isSectionOpen('properties') }">▾</span>
           </div>
           <div v-if="isSectionOpen('properties')" class="section-body">
@@ -440,7 +403,7 @@ async function resolveAllProviders() {
                   </tr>
                 </thead>
                 <tbody>
-                  <tr v-for="prop in device.properties?.filter((p: any) => p.name != null && p.value != null)" :key="prop.name">
+                  <tr v-for="prop in device.properties?.filter((p: any) => p && typeof p.name === 'string' && p.value != null)" :key="prop.name">
                     <td class="multi-line small" v-html="formatName(prop.name)"></td>
                     <td class="multi-line small font-monospace" v-html="formatName(prop.value)"></td>
                     <td class="small">{{ prop.type }}</td>
@@ -454,7 +417,7 @@ async function resolveAllProviders() {
         <!-- Section: Parameters (collapsible) -->
         <div class="accordion-section mb-3" id="parameters">
           <div class="section-header" @click="toggleSection('parameters')">
-            <h2 class="h6 mb-0">{{ t('labels.parameters') }} ({{ device.parameters?.filter((p: any) => p.value != null).length || 0 }})</h2>
+            <h2 class="h6 mb-0">{{ t('labels.parameters') }} ({{ device.parameters?.filter((p: any) => p && typeof p.name === 'string' && p.value != null).length || 0 }})</h2>
             <span class="chevron" :class="{ open: isSectionOpen('parameters') }">▾</span>
           </div>
           <div v-if="isSectionOpen('parameters')" class="section-body">
@@ -468,7 +431,7 @@ async function resolveAllProviders() {
                   </tr>
                 </thead>
                 <tbody>
-                  <tr v-for="param in device.parameters?.filter((p: any) => p.name != null && p.value != null)" :key="param.name">
+                  <tr v-for="param in device.parameters?.filter((p: any) => p && typeof p.name === 'string' && p.value != null)" :key="param.name">
                     <td class="multi-line small" v-html="formatName(param.name)"></td>
                     <td class="multi-line small font-monospace" v-html="formatName(param.value)"></td>
                     <td class="small">{{ param.type }}</td>
@@ -506,44 +469,28 @@ async function resolveAllProviders() {
               <button class="btn btn-outline-dark btn-sm" @click="openGetModelPopup" :disabled="isLoading">
                 {{ t('button.getModel') }}
               </button>
-              <span
-                v-if="isTraced"
-                class="d-inline-block"
-                tabindex="0"
-                data-bs-toggle="tooltip"
-                title="Tracing already active. Click 'Disable Tracing' to stop."
-              >
-                <button class="btn btn-outline-primary btn-sm" disabled>
-                  <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                    <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"/>
-                    <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/>
-                  </svg>
-                  Add to TR-069 monitoring
-                </button>
-              </span>
               <button
-                v-if="isTraced"
-                class="btn btn-warning btn-sm"
+                class="btn btn-sm"
+                :class="isTraced ? 'btn-warning' : 'btn-outline-secondary'"
                 :disabled="tracingAction"
                 @click="toggleTrace"
               >
                 <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                  <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0M5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293z"/>
+                  <path d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3M11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.499 2.499 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5"/>
                 </svg>
-                {{ tracingAction ? '…' : 'Disable Tracing' }}
+                {{ tracingAction ? '…' : isTraced ? 'Tracing actif' : 'Activer le tracing' }}
               </button>
-              <button
-                v-if="!isTraced"
+              <Link
+                :href="`/tr069-trace?device=${encodeURIComponent(device.identifier)}`"
                 class="btn btn-outline-primary btn-sm"
-                :disabled="tracingAction"
-                @click="toggleTrace"
               >
                 <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" class="me-1" viewBox="0 0 16 16">
-                  <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"/>
-                  <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/>
+                  <path d="M10.5 8a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0"/>
+                  <path d="M0 8s3-5.5 8-5.5S16 8 16 8s-3 5.5-8 5.5S0 8 0 8m8 3.5a3.5 3.5 0 1 0 0-7 3.5 3.5 0 0 0 0 7"/>
                 </svg>
-                {{ tracingAction ? '…' : 'Add to TR-069 monitoring' }}
-              </button>
+                Échanges TR-069
+              </Link>
+
               <button class="btn btn-outline-danger btn-sm ms-auto" @click="showDeleteConfirm = true">
                 Supprimer l'équipement
               </button>
@@ -558,32 +505,6 @@ async function resolveAllProviders() {
           </div>
         </div>
 
-        <!-- Section: Échanges TR-069 (collapsible, only when traced) -->
-        <div v-if="isTraced" class="accordion-section mb-3" id="exchanges">
-          <div class="section-header" @click="toggleSection('exchanges')">
-            <h2 class="h6 mb-0">Échanges TR-069</h2>
-            <span class="chevron" :class="{ open: isSectionOpen('exchanges') }">▾</span>
-          </div>
-          <div v-if="isSectionOpen('exchanges')" class="section-body">
-            <div class="d-flex gap-3" style="min-height: 400px">
-              <div class="flex-grow-1" style="overflow: hidden">
-                <SequenceViewer
-                  :device-id="device.identifier"
-                  :device="{
-                    identifier: device.identifier,
-                    manufacturer: device.deviceId?.manufacturer || '',
-                    productClass: device.deviceId?.productClass || '',
-                    serialNumber: device.deviceId?.serialNumber || '',
-                  }"
-                  :trace-started-at="traceStartedAt || ''"
-                  @select="onMessageSelect"
-                />
-              </div>
-              <InspectorPanel :selected-message="selectedMessage" />
-            </div>
-          </div>
-        </div>
-
         <!-- Section: Commands for this device -->
         <div class="accordion-section mb-3" id="commands">
           <div class="section-header" @click="toggleSection('commands')">
diff --git a/inertia/pages/Tr069Trace.vue b/inertia/pages/Tr069Trace.vue
index 828fe08..50c6fcc 100644
--- a/inertia/pages/Tr069Trace.vue
+++ b/inertia/pages/Tr069Trace.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import TitleBar from '~/components/TitleBar.vue'
 import SequenceViewer from '~/components/SequenceViewer.vue'
 import InspectorPanel from '~/components/InspectorPanel.vue'
@@ -20,21 +20,28 @@ const removingDeviceId = ref<string | null>(null)
 const entriesError = ref('')
 const actionError = ref('')
 
-// Log viewer state
+// Trace modal state
+const showTraceModal = ref(false)
 const selectedDeviceId = ref<string | null>(null)
-const logContent = ref('')
-const logLines = ref(0)
-const loadingLog = ref(false)
-const logError = ref('')
-let autoRefreshTimer: ReturnType<typeof setInterval> | null = null
-
-// Inspector panel state (new exchange viewer)
 const inspectorMessage = ref<CwmpExchange | null>(null)
+const pendingDeviceId = ref<string | null>(null)
 
 function onMessageSelect(message: CwmpExchange | null) {
   inspectorMessage.value = message
 }
 
+function openTraceModal(deviceId: string) {
+  selectedDeviceId.value = deviceId
+  inspectorMessage.value = null
+  showTraceModal.value = true
+}
+
+function closeTraceModal() {
+  showTraceModal.value = false
+  selectedDeviceId.value = null
+  inspectorMessage.value = null
+}
+
 // JSON editor modal state
 const showJsonModal = ref(false)
 const jsonContent = ref('')
@@ -49,26 +56,19 @@ const selectedEntry = computed(() =>
 
 onMounted(async () => {
   await loadEntries()
-})
-
-watch(selectedDeviceId, async (id) => {
-  stopAutoRefresh()
-  logContent.value = ''
-  logLines.value = 0
-  logError.value = ''
-  inspectorMessage.value = null
-})
-
-function startAutoRefresh(deviceId: string) {
-  autoRefreshTimer = setInterval(() => { void loadLog(deviceId) }, 3000)
-}
-
-function stopAutoRefresh() {
-  if (autoRefreshTimer !== null) {
-    clearInterval(autoRefreshTimer)
-    autoRefreshTimer = null
+  // Ouvrir directement la modale si ?device= est présent dans l'URL
+  const params = new URLSearchParams(window.location.search)
+  const deviceParam = params.get('device')
+  if (deviceParam) {
+    // Si le device est déjà tracé, ouvrir la modale
+    if (tracedDeviceIds.value.has(deviceParam)) {
+      openTraceModal(deviceParam)
+    } else {
+      // Sinon proposer de l'activer (on stocke juste l'id pour highlight)
+      pendingDeviceId.value = deviceParam
+    }
   }
-}
+})
 
 async function loadEntries() {
   loadingEntries.value = true
@@ -79,7 +79,7 @@ async function loadEntries() {
     const data = await response.json()
     tracedDevices.value = data.entries || []
     if (selectedDeviceId.value && !tracedDeviceIds.value.has(selectedDeviceId.value)) {
-      selectedDeviceId.value = null
+      closeTraceModal()
     }
   } catch (error) {
     entriesError.value = error instanceof Error ? error.message : 'Failed to load trace entries'
@@ -99,7 +99,7 @@ async function removeDevice(deviceId: string) {
       const payload = await response.json().catch(() => ({}))
       throw new Error(payload.error || 'Failed to disable tracing')
     }
-    if (selectedDeviceId.value === deviceId) selectedDeviceId.value = null
+    if (selectedDeviceId.value === deviceId) closeTraceModal()
     await loadEntries()
   } catch (error) {
     actionError.value = error instanceof Error ? error.message : 'Failed to disable tracing'
@@ -108,29 +108,28 @@ async function removeDevice(deviceId: string) {
   }
 }
 
-async function loadLog(deviceId: string) {
-  loadingLog.value = true
-  logError.value = ''
+async function enableTrace(deviceId: string) {
+  actionError.value = ''
+  pendingDeviceId.value = deviceId
   try {
-    const response = await fetch(`/api/v1/tr069-trace/${encodeURIComponent(deviceId)}/log?lines=500`)
+    const response = await fetch('/api/v1/tr069-trace', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ deviceId }),
+    })
     if (!response.ok) {
       const payload = await response.json().catch(() => ({}))
-      throw new Error(payload.error || 'Failed to load log')
+      throw new Error(payload.error || 'Failed to enable tracing')
     }
-    const data = await response.json()
-    logContent.value = data.content ?? ''
-    logLines.value = data.lines ?? 0
+    await loadEntries()
+    openTraceModal(deviceId)
   } catch (error) {
-    logError.value = error instanceof Error ? error.message : 'Failed to load log'
+    actionError.value = error instanceof Error ? error.message : 'Unknown error'
   } finally {
-    loadingLog.value = false
+    pendingDeviceId.value = null
   }
 }
 
-function clearLog() {
-  logContent.value = ''
-}
-
 // JSON editor modal functions
 async function openJsonEditor() {
   showJsonModal.value = true
@@ -206,7 +205,7 @@ function formatJson() {
         <div class="d-flex justify-content-between align-items-center mb-3">
           <div>
             <h2 class="h4 mb-1">Traced devices</h2>
-            <p class="text-muted small mb-0">Click a row to view its live SOAP log.</p>
+            <p class="text-muted small mb-0">Activez le tracing sur un équipement puis cliquez sur "Voir" pour visualiser les échanges en direct.</p>
           </div>
           <div class="d-flex align-items-center gap-2">
             <span class="badge bg-dark">{{ tracedDevices.length }}</span>
@@ -221,6 +220,16 @@ function formatJson() {
 
         <div v-if="entriesError" class="alert alert-danger" role="alert">{{ entriesError }}</div>
         <div v-if="actionError" class="alert alert-warning" role="alert">{{ actionError }}</div>
+        <div v-if="pendingDeviceId && !tracedDeviceIds.has(pendingDeviceId)" class="alert alert-info d-flex align-items-center gap-3 mb-3">
+          <span>L'équipement <strong class="font-monospace">{{ pendingDeviceId }}</strong> n'est pas encore tracé.</span>
+          <button
+            class="btn btn-sm btn-primary ms-auto"
+            @click="enableTrace(pendingDeviceId)"
+          >
+            Activer le tracing
+          </button>
+          <button class="btn btn-sm btn-outline-secondary" @click="pendingDeviceId = null">✕</button>
+        </div>
 
         <p v-if="loadingEntries" class="text-muted small mb-0">Loading traced devices&hellip;</p>
 
@@ -241,9 +250,9 @@ function formatJson() {
               <tr
                 v-for="entry in tracedDevices"
                 :key="entry.deviceId"
-                :class="{ 'table-active': selectedDeviceId === entry.deviceId }"
+                :class="{ 'table-warning': pendingDeviceId === entry.deviceId }"
                 style="cursor: pointer"
-                @click="selectedDeviceId = entry.deviceId"
+                @click="openTraceModal(entry.deviceId)"
               >
                 <td class="font-monospace small">{{ entry.deviceId }}</td>
                 <td>{{ entry.manufacturer || '—' }}</td>
@@ -257,13 +266,13 @@ function formatJson() {
                     :disabled="removingDeviceId === entry.deviceId"
                     @click.stop="removeDevice(entry.deviceId)"
                   >
-                    {{ removingDeviceId === entry.deviceId ? 'Removing…' : 'Remove' }}
+                    {{ removingDeviceId === entry.deviceId ? '…' : 'Supprimer' }}
                   </button>
                 </td>
               </tr>
               <tr v-if="tracedDevices.length === 0">
                 <td colspan="7" class="text-center text-muted py-4">
-                  No traced devices configured. Click "Edit JSON" to add devices.
+                  Aucun équipement tracé. Utilisez "Edit JSON" pour en ajouter ou activez le tracing depuis la fiche d'équipement.
                 </td>
               </tr>
             </tbody>
@@ -272,33 +281,51 @@ function formatJson() {
       </div>
     </div>
 
-    <!-- Exchange Viewer panel (full width) — new sequence diagram viewer -->
-    <div v-if="selectedDeviceId && selectedEntry" class="mt-4">
-      <div class="d-flex justify-content-between align-items-center mb-2">
-        <h3 class="h5 mb-0">Échanges TR-069</h3>
-        <button class="btn btn-sm btn-outline-secondary" @click="selectedDeviceId = null">&#x2715; Fermer</button>
-      </div>
-      <div class="row g-0" style="min-height: 550px">
-        <div class="col-6 border-end overflow-hidden">
-          <SequenceViewer
-            :device-id="selectedEntry.deviceId"
-            :device="{
-              identifier: selectedEntry.deviceId,
-              manufacturer: selectedEntry.manufacturer || '',
-              productClass: selectedEntry.productClass || '',
-              serialNumber: selectedEntry.serialNumber || '',
-            }"
-            :trace-started-at="selectedEntry.startedAt || ''"
-            :compact="true"
-            @select="onMessageSelect"
-          />
-        </div>
-        <div class="col-6">
-          <InspectorPanel :selected-message="inspectorMessage" />
+  </div>
+
+  <!-- Trace Modal -->
+  <Teleport to="body">
+    <div v-if="showTraceModal" class="modal-backdrop fade show" @click="closeTraceModal"></div>
+    <div
+      v-if="showTraceModal && selectedEntry"
+      class="modal fade show d-block"
+      tabindex="-1"
+      role="dialog"
+      aria-modal="true"
+      style="z-index: 1055"
+    >
+      <div class="modal-dialog" style="width: 90vw; max-width: 90vw; height: 95vh; margin: 2.5vh auto;">
+        <div class="modal-content" style="height: 95vh; overflow: hidden;">
+          <div class="modal-header border-bottom py-2 px-3" style="flex-shrink: 0;">
+            <div class="d-flex align-items-center gap-3">
+              <h5 class="modal-title mb-0">Échanges TR-069</h5>
+              <span class="text-muted small font-monospace">{{ selectedEntry.manufacturer || '' }} — {{ selectedEntry.serialNumber }}</span>
+            </div>
+            <button type="button" class="btn-close" aria-label="Close" @click="closeTraceModal"></button>
+          </div>
+          <div class="modal-body p-0 d-flex overflow-hidden" style="height: calc(95vh - 57px);">
+            <div class="overflow-hidden border-end" style="width: calc(100% * 5 / 12)">
+              <SequenceViewer
+                :device-id="selectedEntry.deviceId"
+                :device="{
+                  identifier: selectedEntry.deviceId,
+                  manufacturer: selectedEntry.manufacturer || '',
+                  productClass: selectedEntry.productClass || '',
+                  serialNumber: selectedEntry.serialNumber || '',
+                }"
+                :trace-started-at="selectedEntry.startedAt || ''"
+                :compact="true"
+                @select="onMessageSelect"
+              />
+            </div>
+            <div style="width: calc(100% * 7 / 12); overflow-y: auto">
+              <InspectorPanel :selected-message="inspectorMessage" />
+            </div>
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  </Teleport>
 
   <!-- JSON Editor Modal -->
   <Teleport to="body">
diff --git a/package.json b/package.json
index 9ddd311..83bdf52 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,13 @@
     "test": "node ace test",
     "lint": "eslint .",
     "format": "prettier --write .",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "docker:build": "docker compose -f docker-compose.yml -f docker-compose.simulator.yml build",
+    "docker:up": "docker compose -f docker-compose.yml -f docker-compose.simulator.yml up -d",
+    "docker:down": "docker compose -f docker-compose.yml -f docker-compose.simulator.yml down",
+    "docker:logs": "docker compose -f docker-compose.yml -f docker-compose.simulator.yml logs -f app",
+    "docker:test": "docker compose -f docker-compose.yml up -d mongodb && sleep 2 && NODE_ENV=test MONGODB_URI=mongodb://adam:adam@localhost:27017/adam-acs?authSource=admin npx vitest run ; STATUS=$? ; docker compose -f docker-compose.yml stop mongodb ; exit $STATUS",
+    "docker:build-and-test": "npm run docker:build && npm run docker:test"
   },
   "imports": {
     "#controllers/*": "./app/controllers/*.js",
diff --git a/references/tr069-state-machine-problems.md b/references/tr069-state-machine-problems.md
new file mode 100644
index 0000000..6f871ca
--- /dev/null
+++ b/references/tr069-state-machine-problems.md
@@ -0,0 +1,69 @@
+# TR-069 CWMP State Machine — Problem Catalog
+
+## CRITIQUE-1: Race Condition task queue / state machine
+
+- File: `statemachinemanager.ts` (continue() + setupTaskQueueListeners())
+- Detail: `addTask()` in DeviceActionExecutor emits 'taskSent' synchronously, setting `lastTaskId` BEFORE the XML is returned to the CPE. When both the state machine and task queue serve tasks in the same session, `lastTaskId` can point to the wrong task, corrupting CPE response routing.
+- Impact: Responses routed to wrong callback, silent data corruption, session hangs.
+
+## CRITIQUE-2: Multiple superfluous sessions on BOOTSTRAP
+
+- File: `cwmpcontroller.ts` (handleInform()) + `statemachinemanager.ts` (startStateMachine())
+- Detail: `enqueueImmediate(GPV)` in the controller + implicit ScheduleInform via SPV systematically generate 3 sessions instead of 1.
+- Impact: 3x ACS load per bootstrap, unnecessary CPE wake-ups, slower onboarding.
+
+## CRITIQUE-3: IdleState does not check gpnStatus before sending GPN
+
+- File: `mainstatemachine.ts` (IdleState.handle())
+- Detail: A device with gpnStatus='unsupported' (Livebox, buggy CPEs) still receives a GPN every session, causing systematic Fault or CPE crash/reboot.
+- Impact: CPE crash loops, Fault flooding, device never reaches operational state.
+
+## CRITIQUE-4: Silent safetyGuard in executeCurrentState()
+
+- File: `mainstatemachine.ts` (executeCurrentState())
+- Detail: The `while (safetyGuard++ < 15)` loop stops silently if the machine loops. No log of blocking state, no transition to an explicit error state.
+- Impact: Sessions terminate with empty response, device not marked in error, monitoring blind spot.
+
+## MAJEUR-5: Multi-event routing based on LAST event only
+
+- File: `statemachinemanager.ts` (startStateMachine())
+- Code: `const lastEvent = this.normalizeEvent(evts[evts.length - 1])`
+- Detail: An Inform with ['0 BOOTSTRAP', '1 BOOT'] processes only '1 BOOT'. An Inform with ['6 CONNECTION REQUEST', '2 PERIODIC'] forces ImmediateCommandStateMachine when onboarding is required.
+- Impact: Wrong state machine selected, missed onboarding, incorrect provisioning flow.
+
+## MAJEUR-6: Incomplete GPN fault codes in DeviceActionExecutor
+
+- File: `deviceactionexecutor.ts` (getParameterNames() wrappedCallback)
+- Code: `if (code === 9000 || code === 9001) { device.setGpnStatus('unsupported') }`
+- Detail: Codes 9003 (Invalid Arguments), 9004 (Resources Exceeded), 9005 (Invalid Parameter Name) should also trigger fallback. Network/timeout codes should NOT mark unsupported.
+- Impact: Missing fallback on legitimate GPN failures, false unsupported marking on transient errors.
+
+## MAJEUR-7: No GPN circuit breaker across sessions
+
+- Files: `mainstatemachine.ts`, `configurationevaluationstate.ts`, `deviceactionexecutor.ts`
+- Detail: No failure counter persisted between sessions. A CPE that crashes on GPN will be retried every Inform. No cooldown, no crash pattern detection.
+- Impact: Infinite crash loops for vulnerable CPEs, ACS resource waste.
+
+## MAJEUR-8: Critical GPV outside state machine (collision with ConfigEvalState)
+
+- File: `cwmpcontroller.ts` (handleInform() enqueueImmediate block)
+- Detail: GPV (HardwareVersion, SoftwareVersion, ConnectionRequestURL) is served by the task queue, not the state machine. It can interleave with GPN/GPV from ConfigurationEvaluationState, corrupting CWMP exchange order.
+- Impact: Out-of-order CWMP messages, session corruption, device misidentification.
+
+## MINEUR-9: Duplicated EventCode normalization
+
+- Files: `cwmpcontroller.ts` (normalizeEventCode()), `statemachinemanager.ts` (normalizeEvent())
+- Detail: Two identical functions, two maintenance points.
+- Impact: Drift risk, inconsistent normalization.
+
+## MINEUR-10: reclassifyDeviceFromCatalog() called at 4 different places
+
+- Files: `cwmpcontroller.ts`, `deviceactionexecutor.ts` (x2), `mainstatemachine.ts` (CompletedState)
+- Detail: Scattered fallback logic, hard to unit test.
+- Impact: Inconsistent reclassification timing, test complexity.
+
+## MINEUR-11: No explicit PartialOperational state
+
+- File: `configurationevaluationstate.ts` (catch block -> { isComplete: true })
+- Detail: On ConfigEval failure, the machine terminates without persisting a degraded status usable for monitoring/alerting.
+- Impact: Monitoring blind to degraded devices, no alerting on partial provisioning.
diff --git a/tests/unit/protocol/soap_fault.spec.ts b/tests/unit/protocol/soap_fault.spec.ts
new file mode 100644
index 0000000..d5ed4c2
--- /dev/null
+++ b/tests/unit/protocol/soap_fault.spec.ts
@@ -0,0 +1,64 @@
+import { describe, it, expect } from 'vitest'
+import { extractCwmpMessage } from '../../../app/protocol/soap.js'
+
+describe('extractCwmpMessage — SOAP Fault detection', () => {
+  it('detects soap-env:Fault as Fault message', () => {
+    const body = {
+      'soap-env:Fault': {
+        faultcode: 'Client',
+        faultstring: 'CWMP fault',
+        detail: { 'cwmp:Fault': { FaultCode: '9001', FaultString: 'Request denied' } },
+      },
+    }
+    const msg = extractCwmpMessage(body)
+    expect(msg).not.toBeNull()
+    expect(msg!.type).toBe('Fault')
+    expect(msg!.data.faultcode).toBe('Client')
+  })
+
+  it('detects SOAP-ENV:Fault as Fault message', () => {
+    const body = {
+      'SOAP-ENV:Fault': {
+        faultcode: 'Server',
+        faultstring: 'Internal error',
+      },
+    }
+    const msg = extractCwmpMessage(body)
+    expect(msg).not.toBeNull()
+    expect(msg!.type).toBe('Fault')
+    expect(msg!.data.faultcode).toBe('Server')
+  })
+
+  it('detects bare Fault as Fault message', () => {
+    const body = {
+      Fault: { FaultCode: '9002', FaultString: 'Internal error' },
+    }
+    const msg = extractCwmpMessage(body)
+    expect(msg).not.toBeNull()
+    expect(msg!.type).toBe('Fault')
+  })
+
+  it('detects soapenv:Fault as Fault message', () => {
+    const body = {
+      'soapenv:Fault': { faultcode: 'Client', faultstring: 'Fault' },
+    }
+    const msg = extractCwmpMessage(body)
+    expect(msg).not.toBeNull()
+    expect(msg!.type).toBe('Fault')
+  })
+
+  it('prefers cwmp: prefixed keys over Fault detection', () => {
+    const body = {
+      'cwmp:GetParameterValuesResponse': { ParameterList: [] },
+      'soap-env:Fault': { faultcode: 'Client' },
+    }
+    const msg = extractCwmpMessage(body)
+    expect(msg).not.toBeNull()
+    expect(msg!.type).toBe('GetParameterValuesResponse')
+  })
+
+  it('returns null when body has no cwmp: keys and no Fault', () => {
+    const body = { 'other:Something': {} }
+    expect(extractCwmpMessage(body)).toBeNull()
+  })
+})
diff --git a/tests/unit/services/cwmp/config_eval_skip.spec.ts b/tests/unit/services/cwmp/config_eval_skip.spec.ts
new file mode 100644
index 0000000..ad2f022
--- /dev/null
+++ b/tests/unit/services/cwmp/config_eval_skip.spec.ts
@@ -0,0 +1,141 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+// Mock logger
+vi.mock('@adonisjs/core/services/logger', () => ({
+  default: {
+    info: vi.fn(),
+    debug: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+  },
+}))
+
+// Mock DeviceModel
+vi.mock('../../../../app/models/device.js', () => ({
+  default: {
+    createOrUpdate: vi.fn().mockResolvedValue({}),
+    findByDeviceId: vi.fn().mockResolvedValue(null),
+    updateOne: vi.fn().mockResolvedValue({}),
+  },
+}))
+
+// Mock CommandModel
+vi.mock('../../../../app/models/command.js', () => ({
+  default: {
+    getCollection: vi.fn().mockReturnValue({
+      find: vi.fn().mockReturnValue({ sort: vi.fn().mockReturnValue({ toArray: vi.fn().mockResolvedValue([]) }) }),
+      countDocuments: vi.fn().mockResolvedValue(0),
+    }),
+    updateCommand: vi.fn().mockResolvedValue({}),
+  },
+}))
+
+// Mock ConfigurationModel
+vi.mock('#models/configuration', () => ({
+  default: {
+    find: vi.fn().mockResolvedValue([]),
+    findByIdentifier: vi.fn().mockResolvedValue(null),
+  },
+}))
+
+// Mock firmware catalog service
+vi.mock('../../../../app/services/firmware_catalog_service.js', () => ({
+  default: class {
+    async resolveUpgradePath() { return [] }
+  },
+  FirmwareCatalogService: class {
+    async resolveUpgradePath() { return [] }
+  },
+}))
+
+// Mock parameter_writability
+vi.mock('../../../../app/services/parameter_writability.js', () => ({
+  reclassifyDeviceFromCatalog: vi.fn(),
+}))
+
+import { ConfigurationEvaluationState, ComplianceUpdateState } from '../../../../app/services/cwmp/configuration_evaluation_state.js'
+import { Device } from '../../../../app/domain/device/device.js'
+import { DeviceId } from '../../../../app/domain/device/device_id.js'
+import { DeviceProperty } from '../../../../app/domain/device/device_parameter.js'
+import { CWMPTaskQueue } from '../../../../app/services/cwmp/task_queue.js'
+import { DeviceActionExecutor } from '../../../../app/services/cwmp/device_action_executor.js'
+import { ParameterType } from '../../../../app/domain/shared/types.js'
+import { buildProvisioningCode } from '../../../../app/utils/provisioning_code.js'
+
+function makeDevice(): Device {
+  const device = new Device(new DeviceId('Sagemcom', 'F8B7FF', 'Livebox 4', 'LB4-TEST-001'))
+  device.setDataModel('tr-181')
+  device.setGpnStatus('unsupported')
+  return device
+}
+
+function makeContext(device: Device) {
+  const taskQueue = new CWMPTaskQueue()
+  return {
+    device,
+    session: 'test-session',
+    taskQueue,
+    services: {
+      deviceAction: new DeviceActionExecutor(taskQueue),
+    },
+  }
+}
+
+describe('ConfigurationEvaluationState — skip inventory when already compliant', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('skips inventory when isAlreadyCompliant is true (no matching config)', async () => {
+    const device = makeDevice()
+    const context = makeContext(device)
+
+    const state = new ConfigurationEvaluationState()
+    const result = await state.handle(context as any)
+
+    // With no configs in DB, evaluate returns isAlreadyCompliant: true
+    // State should transition forward without sending any GPN/GPV
+    // (no inventory, no diffs)
+    expect(result.response).toBeFalsy()
+    expect(result.nextState || result.isComplete).toBeTruthy()
+  })
+})
+
+describe('ComplianceUpdateState — skip provCode SPV when matching', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('skips SPV when device already has matching provisioning code', async () => {
+    const device = makeDevice()
+
+    const mockConfig = { identifier: 'TestConfig', version: '1.0', desiredParameters: [], firmwareTarget: null }
+    const expectedProvCode = buildProvisioningCode(mockConfig as any)
+
+    // Set the device's ProvisioningCode to match what buildProvisioningCode produces
+    device.setProperty(new DeviceProperty(
+      'Device.DeviceInfo.ProvisioningCode',
+      expectedProvCode,
+      ParameterType.STRING
+    ))
+
+    const context = makeContext(device)
+
+    const mockEngineResult = {
+      configuration: mockConfig,
+      inventoryPaths: [],
+      parameterDiffs: [],
+      firmwareMigrationPath: [],
+      isAlreadyCompliant: true,
+      skipFirmware: false,
+    }
+
+    const state = new ComplianceUpdateState(mockEngineResult as any)
+    const result = await state.handle(context as any)
+
+    // Should NOT produce a response (no SPV sent)
+    // Should transition to ExecutingCommandsState
+    expect(result.response).toBeFalsy()
+    expect(result.nextState).toBeDefined()
+  })
+})
diff --git a/tests/unit/services/cwmp/critical_reads_response.spec.ts b/tests/unit/services/cwmp/critical_reads_response.spec.ts
new file mode 100644
index 0000000..4a70c48
--- /dev/null
+++ b/tests/unit/services/cwmp/critical_reads_response.spec.ts
@@ -0,0 +1,164 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+// Mock logger
+vi.mock('@adonisjs/core/services/logger', () => ({
+  default: {
+    info: vi.fn(),
+    debug: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+  },
+}))
+
+// Mock DeviceModel
+vi.mock('../../../../app/models/device.js', () => ({
+  default: {
+    createOrUpdate: vi.fn().mockResolvedValue({}),
+    findByDeviceId: vi.fn().mockResolvedValue(null),
+    updateOne: vi.fn().mockResolvedValue({}),
+  },
+}))
+
+// Mock CommandModel
+vi.mock('../../../../app/models/command.js', () => ({
+  default: {
+    getCollection: vi.fn().mockReturnValue({
+      find: vi.fn().mockReturnValue({ sort: vi.fn().mockReturnValue({ toArray: vi.fn().mockResolvedValue([]) }) }),
+      countDocuments: vi.fn().mockResolvedValue(0),
+    }),
+    updateCommand: vi.fn().mockResolvedValue({}),
+  },
+}))
+
+// Mock configuration evaluation (skip config eval for these tests)
+vi.mock('../../../../app/services/cwmp/configuration_evaluation_state.js', () => ({
+  ConfigurationEvaluationState: class {
+    name = 'configuration-evaluation'
+    async handle() { return { isComplete: true, response: '' } }
+  },
+}))
+
+// Mock reclassify
+vi.mock('../../../../app/services/parameter_writability.js', () => ({
+  reclassifyDeviceFromCatalog: vi.fn(),
+}))
+
+import { MainStateMachine } from '../../../../app/services/cwmp/main_state_machine.js'
+import { Device } from '../../../../app/domain/device/device.js'
+import { DeviceId } from '../../../../app/domain/device/device_id.js'
+import { CWMPTaskQueue } from '../../../../app/services/cwmp/task_queue.js'
+
+function makeDevice(): Device {
+  const device = new Device(new DeviceId('Sagemcom', 'F8B7FF', 'Livebox 4', 'LB4-TEST-001'))
+  device.setDataModel('tr-181')
+  device.setGpnStatus('unsupported') // Skip GPN, go to CriticalReads
+  return device
+}
+
+describe('CriticalReadsState — GPV response processing', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('processes GPV response and updates device values', async () => {
+    const device = makeDevice()
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    // Start: IdleState → CriticalReadsState → sends GPV
+    const gpvRequest = await sm.start()
+    expect(gpvRequest).toContain('GetParameterValues')
+
+    // Simulate GPVResponse with ParameterValueStruct
+    await sm.handleResponse(true, {
+      ParameterList: {
+        ParameterValueStruct: [
+          { Name: 'Device.DeviceInfo.HardwareVersion', Value: { _: 'v3.0', '$xsi:type': 'xsd:string' } },
+          { Name: 'Device.DeviceInfo.SoftwareVersion', Value: { _: 'SR50-5.0.0', '$xsi:type': 'xsd:string' } },
+          { Name: 'Device.DeviceInfo.ModelName', Value: { _: 'Livebox 4', '$xsi:type': 'xsd:string' } },
+        ],
+      },
+    })
+
+    // Device should have the values stored
+    const hwProp = device.getProperty('Device.DeviceInfo.HardwareVersion')
+    expect(hwProp).not.toBeNull()
+    expect(hwProp!.value).toBe('v3.0')
+
+    const swProp = device.getProperty('Device.DeviceInfo.SoftwareVersion')
+    expect(swProp).not.toBeNull()
+    expect(swProp!.value).toBe('SR50-5.0.0')
+  })
+
+  it('normalizes Name fields from object to string when xsi:type attribute is present', async () => {
+    const device = makeDevice()
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    await sm.start()
+
+    // Simulate GPVResponse where Name has xsi:type attribute (parsed as object by XMLParser)
+    await sm.handleResponse(true, {
+      ParameterList: {
+        ParameterValueStruct: [
+          {
+            Name: { _: 'Device.DeviceInfo.HardwareVersion', '$xsi:type': 'xsd:string' },
+            Value: { _: 'v2.1', '$xsi:type': 'xsd:string' },
+          },
+        ],
+      },
+    })
+
+    // Should normalize Name._ to string and store correctly
+    const hwProp = device.getProperty('Device.DeviceInfo.HardwareVersion')
+    expect(hwProp).not.toBeNull()
+    expect(hwProp!.value).toBe('v2.1')
+  })
+
+  it('handles empty ParameterValueStruct gracefully', async () => {
+    const device = makeDevice()
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    await sm.start()
+
+    // Simulate empty GPV response
+    await sm.handleResponse(true, { ParameterList: { ParameterValueStruct: [] } })
+
+    // Should not throw, machine should continue
+    expect(sm.getCurrentStateName()).not.toBe('critical-reads')
+  })
+
+  it('handles missing ParameterList gracefully', async () => {
+    const device = makeDevice()
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    await sm.start()
+
+    // Simulate response with no ParameterList
+    await sm.handleResponse(true, {})
+
+    // Should not throw, machine should continue
+    expect(sm.getCurrentStateName()).not.toBe('critical-reads')
+  })
+
+  it('transitions to configuration-evaluation after processing', async () => {
+    const device = makeDevice()
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    await sm.start()
+    await sm.handleResponse(true, {
+      ParameterList: {
+        ParameterValueStruct: [
+          { Name: 'Device.DeviceInfo.HardwareVersion', Value: { _: 'v1', '$xsi:type': 'xsd:string' } },
+        ],
+      },
+    })
+
+    // Should have transitioned past critical-reads to configuration-evaluation
+    expect(sm.getCurrentStateName()).not.toBe('critical-reads')
+    expect(sm.getCurrentStateName()).toBe('configuration-evaluation')
+  })
+})
diff --git a/tests/unit/services/cwmp/gpn_circuit_breaker.spec.ts b/tests/unit/services/cwmp/gpn_circuit_breaker.spec.ts
new file mode 100644
index 0000000..1de36b4
--- /dev/null
+++ b/tests/unit/services/cwmp/gpn_circuit_breaker.spec.ts
@@ -0,0 +1,132 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+// Mock logger
+vi.mock('@adonisjs/core/services/logger', () => ({
+  default: {
+    info: vi.fn(),
+    debug: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+  },
+}))
+
+// Mock DeviceModel
+vi.mock('../../../../app/models/device.js', () => ({
+  default: {
+    createOrUpdate: vi.fn().mockResolvedValue({}),
+    findByDeviceId: vi.fn().mockResolvedValue(null),
+    updateOne: vi.fn().mockResolvedValue({}),
+  },
+}))
+
+// Mock CommandModel
+vi.mock('../../../../app/models/command.js', () => ({
+  default: {
+    getCollection: vi.fn().mockReturnValue({
+      find: vi.fn().mockReturnValue({ sort: vi.fn().mockReturnValue({ toArray: vi.fn().mockResolvedValue([]) }) }),
+      countDocuments: vi.fn().mockResolvedValue(0),
+    }),
+    updateCommand: vi.fn().mockResolvedValue({}),
+  },
+}))
+
+// Mock configuration engine
+vi.mock('../../../../app/services/cwmp/configuration_evaluation_state.js', () => ({
+  ConfigurationEvaluationState: class {
+    name = 'configuration-evaluation'
+    async handle() { return { isComplete: true, response: '' } }
+  },
+}))
+
+// Mock reclassify
+vi.mock('../../../../app/services/parameter_writability.js', () => ({
+  reclassifyDeviceFromCatalog: vi.fn(),
+}))
+
+import { MainStateMachine } from '../../../../app/services/cwmp/main_state_machine.js'
+import { Device } from '../../../../app/domain/device/device.js'
+import { DeviceId } from '../../../../app/domain/device/device_id.js'
+import { CWMPTaskQueue } from '../../../../app/services/cwmp/task_queue.js'
+import DeviceModel from '../../../../app/models/device.js'
+
+function makeDevice(): Device {
+  const device = new Device(new DeviceId('Sagemcom', 'F8B7FF', 'Livebox 4', 'LB4-TEST-001'))
+  device.setDataModel('tr-181')
+  return device
+}
+
+describe('GPN Circuit Breaker — DiscoveringParametersState', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('IdleState skips GPN when gpnStatus is unsupported', async () => {
+    const device = makeDevice()
+    device.setGpnStatus('unsupported')
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    // Start triggers IdleState → should skip GPN
+    const response = await sm.start()
+
+    // Should produce a GPV (critical reads) not a GPN
+    expect(response).toContain('GetParameterValues')
+    expect(response).not.toContain('GetParameterNames')
+  })
+
+  it('IdleState skips GPN when circuit breaker is open', async () => {
+    const device = makeDevice()
+    device.setGpnStatus('unknown')
+    device.setGpnCircuitBreaker({
+      failureCount: 2,
+      lastFailureDate: new Date(),
+      state: 'open',
+      cooldownUntil: new Date(Date.now() + 86400000),
+    })
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    const response = await sm.start()
+
+    // Should produce a GPV (critical reads) not a GPN
+    expect(response).toContain('GetParameterValues')
+    expect(response).not.toContain('GetParameterNames')
+  })
+
+  it('IdleState proceeds to GPN when gpnStatus is unknown and circuit breaker is closed', async () => {
+    const device = makeDevice()
+    device.setGpnStatus('unknown')
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    const response = await sm.start()
+
+    // Should produce a GPN request
+    expect(response).toContain('GetParameterNames')
+  })
+
+  it('DiscoveringParametersState calls recordGpnFailure and persists on fault', async () => {
+    const device = makeDevice()
+    device.setGpnStatus('unknown')
+    const taskQueue = new CWMPTaskQueue()
+    const sm = new MainStateMachine(device, 'session-1', taskQueue)
+
+    // Start: IdleState → DiscoveringParametersState → sends GPN
+    await sm.start()
+
+    // Simulate CPE fault response
+    const response = await sm.handleResponse(false, { FaultCode: '9001', FaultString: 'Method not supported' })
+
+    // Device should now be marked as unsupported
+    expect(device.gpnStatus).toBe('unsupported')
+
+    // Circuit breaker should have recorded the failure
+    expect(device.gpnCircuitBreaker.failureCount).toBe(1)
+
+    // Should have persisted via createOrUpdate
+    expect(DeviceModel.createOrUpdate).toHaveBeenCalled()
+
+    // Should continue to critical reads (GPV)
+    expect(response).toContain('GetParameterValues')
+  })
+})
diff --git a/tests/unit/services/cwmp/main_state_machine_extended.spec.ts b/tests/unit/services/cwmp/main_state_machine_extended.spec.ts
index 368be66..11617f9 100644
--- a/tests/unit/services/cwmp/main_state_machine_extended.spec.ts
+++ b/tests/unit/services/cwmp/main_state_machine_extended.spec.ts
@@ -13,8 +13,8 @@ vi.mock('../../../../app/models/command.js', () => ({
   default: {
     getCollection: () => ({
       find: vi.fn().mockReturnValue({
-          sort: vi.fn().mockReturnValue({ toArray: vi.fn().mockResolvedValue([]) }),
-        }),
+        sort: vi.fn().mockReturnValue({ toArray: vi.fn().mockResolvedValue([]) }),
+      }),
     }),
     updateCommand: vi.fn().mockResolvedValue({}),
   },
@@ -54,17 +54,19 @@ describe('MainStateMachine', () => {
     await sm.start()
     // Simulate GPN success response
     const response = await sm.handleResponse(true, {
-      ParameterList: { ParameterInfoStruct: [{ Name: 'Device.ManagementServer.URL', Writable: '1' }] },
+      ParameterList: {
+        ParameterInfoStruct: [{ Name: 'Device.ManagementServer.URL', Writable: '1' }],
+      },
     })
-    // After GPN success, should transition to configuration-evaluation
-    expect(sm.getCurrentStateName()).toBe('configuration-evaluation')
+    // After GPN success, should transition to critical-reads
+    expect(sm.getCurrentStateName()).toBe('critical-reads')
   })
 
-  it('with unknown data model, skips to configuration-evaluation', async () => {
+  it('with unknown data model, skips to critical-reads', async () => {
     const sm = new MainStateMachine(makeDevice('unknown'), 'sess-1', new CWMPTaskQueue())
     await sm.start()
-    // idle → directly to configuration-evaluation (no GPN for unknown model)
-    expect(sm.getCurrentStateName()).toBe('configuration-evaluation')
+    // idle → directly to critical-reads (no GPN for unknown model)
+    expect(sm.getCurrentStateName()).toBe('critical-reads')
   })
 
   it('with tr-098, sends GPN for InternetGatewayDevice.ManagementServer.', async () => {
@@ -82,23 +84,24 @@ describe('MainStateMachine', () => {
     expect(sm.getCurrentStateName()).not.toBe('discovering-parameters')
   })
 
-  it('full lifecycle: idle → discovering → config-eval → compliance → executing → completed', async () => {
+  it('full lifecycle: idle → discovering → critical-reads → config-eval → compliance → executing → operational', async () => {
     const sm = new MainStateMachine(makeDevice('tr-181'), 'sess-1', new CWMPTaskQueue())
     // Step 1: start → GPN
     await sm.start()
     expect(sm.getCurrentStateName()).toBe('discovering-parameters')
 
-    // Step 2: GPN response → config-eval
+    // Step 2: GPN response → critical-reads
     await sm.handleResponse(true, { ParameterList: { ParameterInfoStruct: [] } })
-    expect(sm.getCurrentStateName()).toBe('configuration-evaluation')
+    expect(sm.getCurrentStateName()).toBe('critical-reads')
 
-    // Step 3+: config eval will process its queue and eventually reach compliance-update
-    // Since our mock engine returns inventoryPaths, it will send GPN requests
-    // After all config eval actions complete, it reaches compliance-update → executing-commands → completed
-    // Simulate multiple responses to drain the config eval state
+    // Step 3+: critical reads will send GPV, after response moves to config eval
+    // Simulate multiple responses to drain the state machine
     let guard = 0
     while (!sm.isCompleted() && guard++ < 20) {
-      await sm.handleResponse(true, { Status: 0, ParameterList: { ParameterInfoStruct: [], ParameterValueStruct: [] } })
+      await sm.handleResponse(true, {
+        Status: 0,
+        ParameterList: { ParameterInfoStruct: [], ParameterValueStruct: [] },
+      })
     }
     expect(sm.isCompleted()).toBe(true)
   })
@@ -127,7 +130,9 @@ describe('ExecutingCommandsState', () => {
       services: { deviceAction: { getParameterValues: vi.fn() } as any },
     }
     const result = await state.handle(context)
-    expect(result.isComplete).toBe(true)
+    // With includeNI=true and no commands, transitions to OperationalState
+    expect(result.nextState).toBeDefined()
+    expect(result.nextState!.name).toBe('operational')
   })
 
   it('returns isComplete when no commands found (includeNI=false)', async () => {
diff --git a/tests/unit/services/cwmp/stale_session.spec.ts b/tests/unit/services/cwmp/stale_session.spec.ts
new file mode 100644
index 0000000..fcdba28
--- /dev/null
+++ b/tests/unit/services/cwmp/stale_session.spec.ts
@@ -0,0 +1,100 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+
+// Mock logger
+vi.mock('@adonisjs/core/services/logger', () => ({
+  default: {
+    info: vi.fn(),
+    debug: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+  },
+}))
+
+// Mock DeviceModel
+vi.mock('../../../../app/models/device.js', () => ({
+  default: {
+    createOrUpdate: vi.fn().mockResolvedValue({}),
+    findByDeviceId: vi.fn().mockResolvedValue(null),
+    updateOne: vi.fn().mockResolvedValue({}),
+  },
+}))
+
+// Mock CommandModel
+vi.mock('../../../../app/models/command.js', () => ({
+  default: {
+    getCollection: vi.fn().mockReturnValue({
+      find: vi.fn().mockReturnValue({ sort: vi.fn().mockReturnValue({ toArray: vi.fn().mockResolvedValue([]) }) }),
+      countDocuments: vi.fn().mockResolvedValue(0),
+    }),
+    updateCommand: vi.fn().mockResolvedValue({}),
+  },
+}))
+
+import { StateMachineManager, MachineStatus } from '../../../../app/services/cwmp/state_machine_manager.js'
+import { Device } from '../../../../app/domain/device/device.js'
+import { DeviceId } from '../../../../app/domain/device/device_id.js'
+
+function makeDevice(): Device {
+  const device = new Device(new DeviceId('Sagemcom', 'F8B7FF', 'Livebox 4', 'LB4-TEST-001'))
+  device.setDataModel('tr-181')
+  device.setGpnStatus('unsupported')
+  return device
+}
+
+describe('StateMachineManager — stale session replacement', () => {
+  let manager: StateMachineManager
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    // Reset singleton
+    ;(StateMachineManager as any).instance = null
+    manager = StateMachineManager.getInstance()
+  })
+
+  it('replaces stale MainStateMachine when session differs', async () => {
+    const device = makeDevice()
+
+    // Start first machine on session-A
+    const machine1 = await manager.startStateMachine(device, 'session-A', { events: ['0 BOOTSTRAP'] })
+    expect(machine1.status).toBe(MachineStatus.RUNNING)
+    expect(machine1.session).toBe('session-A')
+
+    // Start second machine on session-B (different session, same device)
+    const machine2 = await manager.startStateMachine(device, 'session-B', { events: ['2 PERIODIC'] })
+
+    // Should be a NEW machine (not the old one rebinding)
+    expect(machine2.session).toBe('session-B')
+    // Old machine should be completed
+    expect(machine1.status).toBe(MachineStatus.COMPLETED)
+  })
+
+  it('does NOT replace machine when session is same', async () => {
+    const device = makeDevice()
+
+    // Start machine on session-A
+    const machine1 = await manager.startStateMachine(device, 'session-A', { events: ['0 BOOTSTRAP'] })
+
+    // Start again on SAME session
+    const machine2 = await manager.startStateMachine(device, 'session-A', { events: ['2 PERIODIC'] })
+
+    // Should return the same machine (rebinding)
+    expect(machine2.id).toBe(machine1.id)
+    expect(machine1.status).toBe(MachineStatus.RUNNING)
+  })
+
+  it('creates fresh machine after replacing stale one', async () => {
+    const device = makeDevice()
+
+    // Start first machine
+    await manager.startStateMachine(device, 'session-old', { events: ['0 BOOTSTRAP'] })
+
+    // Start new machine with different session
+    const newMachine = await manager.startStateMachine(device, 'session-new', { events: ['2 PERIODIC'] })
+
+    // Fresh machine should be running
+    expect(newMachine.status).toBe(MachineStatus.RUNNING)
+    expect(newMachine.session).toBe('session-new')
+    // Should be a MainStateMachine (PERIODIC event triggers MainStateMachine)
+    expect(newMachine.currentState).toBeDefined()
+  })
+})
diff --git a/tests/unit/services/cwmp/task_queue.spec.ts b/tests/unit/services/cwmp/task_queue.spec.ts
index e63e85c..846a8c1 100644
--- a/tests/unit/services/cwmp/task_queue.spec.ts
+++ b/tests/unit/services/cwmp/task_queue.spec.ts
@@ -36,21 +36,22 @@ describe('CWMPTaskQueue', () => {
 
   describe('addTask', () => {
     it('adds task, marks as SENT, and returns SOAP XML', () => {
-      const xml = queue.addTask(makeDeviceId(), 'reboot', { commandKey: 'test' }, async () => '')
-      expect(xml).toContain('Reboot')
-      expect(xml).toContain('test')
+      const result = queue.addTask(makeDeviceId(), 'reboot', { commandKey: 'test' }, async () => '')
+      expect(result.xml).toContain('Reboot')
+      expect(result.xml).toContain('test')
+      expect(result.taskId).toBeDefined()
     })
 
     it('returns empty string for unknown task type', () => {
-      const xml = queue.addTask(makeDeviceId(), 'unknown_type', {}, async () => '')
-      expect(xml).toBe('')
+      const result = queue.addTask(makeDeviceId(), 'unknown_type', {}, async () => '')
+      expect(result.xml).toBe('')
     })
 
-    it('emits taskSent event', () => {
+    it('does not emit taskSent event (race condition fix)', () => {
       let sent = false
       queue.on('taskSent', () => { sent = true })
       queue.addTask(makeDeviceId(), 'factory_reset', {}, async () => '')
-      expect(sent).toBe(true)
+      expect(sent).toBe(false)
     })
   })
 
diff --git a/tests/unit/services/main_state_machine.spec.ts b/tests/unit/services/main_state_machine.spec.ts
index e1643f8..fdee9c3 100644
--- a/tests/unit/services/main_state_machine.spec.ts
+++ b/tests/unit/services/main_state_machine.spec.ts
@@ -102,7 +102,7 @@ describe('MainStateMachine — TR-181 device', () => {
     // Simulate any response (success or failure) — state machine advances
     await sm.handleResponse(true, {})
 
-    // Should have moved past discovering-parameters (no more paths in queue)
+    // Should have moved past discovering-parameters (now in critical-reads)
     expect(sm.getCurrentStateName()).not.toBe('discovering-parameters')
     expect(sm.getCurrentStateName()).not.toBe('idle')
   })
@@ -198,16 +198,17 @@ describe('MainStateMachine — TR-098 device', () => {
 // ---------------------------------------------------------------------------
 
 describe('MainStateMachine — unknown data model', () => {
-  it('skips GPN and goes directly to configuration-evaluation', async () => {
+  it('skips GPN and goes directly to critical-reads', async () => {
     const device = makeUnknownDevice()
     const taskQueue = new CWMPTaskQueue()
     const sm = new MainStateMachine(device, 'session-1', taskQueue)
 
     await sm.start()
 
-    // Should skip discovering-parameters entirely
+    // Should skip discovering-parameters and go to critical-reads
     expect(sm.getCurrentStateName()).not.toBe('discovering-parameters')
     expect(sm.getCurrentStateName()).not.toBe('idle')
+    expect(sm.getCurrentStateName()).toBe('critical-reads')
   })
 })
 
@@ -254,7 +255,7 @@ describe('MainStateMachine — CompletedState reclassification', () => {
 // ---------------------------------------------------------------------------
 
 describe('DeviceActionExecutor — reclassification after updateFromValues', () => {
-  it('reclassifies properties added via SPV callback when GPN unsupported', async () => {
+  it('SPV callback updates device values but does not reclassify (consolidated to terminal state)', async () => {
     const device = makeTr181Device()
     device.setGpnStatus('unsupported')
     // Device starts with only read-only properties (like after first Inform)
@@ -282,10 +283,9 @@ describe('DeviceActionExecutor — reclassification after updateFromValues', ()
 
     await taskQueue.executeTaskCallback(spvTask!.id, 'success' as any, { Status: 0 })
 
-    // ProvisioningCode should now be a parameter (reclassified after updateFromValues)
-    expect(device.getParameter('Device.DeviceInfo.ProvisioningCode')).not.toBeNull()
-    expect(device.getParameter('Device.DeviceInfo.ProvisioningCode')!.value).toBe('test-code')
-    expect(device.getProperty('Device.DeviceInfo.ProvisioningCode')).toBeNull()
+    // ProvisioningCode is stored as a property (reclassification happens later in OperationalState)
+    expect(device.getProperty('Device.DeviceInfo.ProvisioningCode')).not.toBeNull()
+    expect(device.getProperty('Device.DeviceInfo.ProvisioningCode')!.value).toBe('test-code')
   })
 
   it('does NOT reclassify when GPN is supported (live data is authoritative)', async () => {