diff --git a/fields/6.0.23/Account.json b/fields/6.0.23/Account.json
new file mode 100644
index 0000000..9f104aa
--- /dev/null
+++ b/fields/6.0.23/Account.json
@@ -0,0 +1,9 @@
+{
+  "name": "^[^\"' ]+$",
+  "x_password": "",
+  "vlan": "[2-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|400[0-9]|^$",
+  "ip":"^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+  "tunnel_config_type": "vpn|802.1x|custom",
+  "tunnel_type": "[1-9]|1[0-3]|^$",
+  "tunnel_medium_type": "[1-9]|1[0-5]|^$"
+}
diff --git a/fields/6.0.23/ApGroups.json b/fields/6.0.23/ApGroups.json
new file mode 100644
index 0000000..329dce3
--- /dev/null
+++ b/fields/6.0.23/ApGroups.json
@@ -0,0 +1,3 @@
+{
+    "name":".{1,128}"
+}
diff --git a/fields/6.0.23/AuthenticationRequest.json b/fields/6.0.23/AuthenticationRequest.json
new file mode 100644
index 0000000..8e88f6e
--- /dev/null
+++ b/fields/6.0.23/AuthenticationRequest.json
@@ -0,0 +1,12 @@
+{
+  "username": ".{1,256}",
+  "password": ".{1,256}",
+  "remember": "true|false",
+  "strict": "true|false",
+  "site_name": ".{0,256}",
+  "sso_token": ".{0,256}",
+  "for_hotspot": "true|false",
+  "for_sso": "true|false",
+  "ubic_2fa_token": ".{0,256}",
+  "ubic_uuid": ".{0,256}"
+}
diff --git a/fields/6.0.23/BroadcastGroup.json b/fields/6.0.23/BroadcastGroup.json
new file mode 100644
index 0000000..677d265
--- /dev/null
+++ b/fields/6.0.23/BroadcastGroup.json
@@ -0,0 +1,4 @@
+{
+    "name": "",
+    "member_table": [""]
+}
diff --git a/fields/6.0.23/ChannelPlan.json b/fields/6.0.23/ChannelPlan.json
new file mode 100644
index 0000000..a790643
--- /dev/null
+++ b/fields/6.0.23/ChannelPlan.json
@@ -0,0 +1,35 @@
+{
+  "conf_source": "manual|radio-ai",
+  "date": "^$|^(20[0-9]{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9])Z?$",
+  "fitness": "^[0-9]+\\.?[0-9]*$",
+  "note": ".{0,1024}",
+  "radio": "na|ng|ng\\+na",
+  "radio_table": [{
+    "device_mac": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$",
+    "name": "[a-z]*[0-9]*",
+    "channel": "[0-9]|[1][0-4]|16|34|36|38|40|42|44|46|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165|183|184|185|187|188|189|192|196|auto",
+    "backup_channel": "[0-9]|[1][0-4]|16|34|36|38|40|42|44|46|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165|183|184|185|187|188|189|192|196|auto",
+    "width": "20|40|80|160",
+    "tx_power": "[\\d]+|auto",
+    "tx_power_mode": "auto|medium|high|low|custom"
+  }],
+  "satisfaction_table": [{
+    "device_mac": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$",
+    "satisfaction": "^[0-9]+\\.?[0-9]*$"
+  }],
+  "site_blacklisted_channels": [{
+    "channel": "36|38|40|42|44|46|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165|183|184|185|187|188|189|192|196",
+    "timestamp": "[1-9][0-9]{12}"
+  }],
+  "ap_blacklisted_channels": [{
+    "mac": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$",
+    "channel": "36|38|40|42|44|46|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165|183|184|185|187|188|189|192|196",
+    "timestamp": "[1-9][0-9]{12}"
+  }],
+  "coupling": [{
+    "source": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2}).*$",
+    "target": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2}).*$",
+    "rssi": "-?[0-9]{1,3}"
+  }],
+  "satisfaction": "^[0-9]+\\.?[0-9]*$"
+}
diff --git a/fields/6.0.23/Dashboard.json b/fields/6.0.23/Dashboard.json
new file mode 100644
index 0000000..eb5bc1f
--- /dev/null
+++ b/fields/6.0.23/Dashboard.json
@@ -0,0 +1,12 @@
+{
+  "name": "",
+  "desc": "",
+  "is_public": "true|false",
+  "controller_version": "",
+  "modules":[{
+    "id": "",
+    "module_id": "",
+    "config": "",
+    "restrictions": ""
+  }]
+}
diff --git a/fields/6.0.23/Device.json b/fields/6.0.23/Device.json
new file mode 100644
index 0000000..19a931a
--- /dev/null
+++ b/fields/6.0.23/Device.json
@@ -0,0 +1,144 @@
+{
+    "name": ".{1,128}",
+    "x": "",
+    "y": "",
+    "heightInMeters": "^([-]?[\\d]+[.]?[\\d]*)$",
+    "locked": "true|false",
+    "map_id": "",
+    "disabled": "true|false",
+    "led_override": "default|on|off",
+    "led_override_color": "^#(?:[0-9a-fA-F]{3}){1,2}$",
+    "led_override_color_brightness": "^[0-9][0-9]?$|^100$",
+    "outdoor_mode_override": "default|on|off",
+    "mesh_sta_vap_enabled": "true|false",
+    "config_network": {
+        "bonding_enabled": "true|false",
+        "type": "dhcp|static",
+        "ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+        "netmask": "^((128|192|224|240|248|252|254)\\.0\\.0\\.0)|(255\\.(((0|128|192|224|240|248|252|254)\\.0\\.0)|(255\\.(((0|128|192|224|240|248|252|254)\\.0)|255\\.(0|128|192|224|240|248|252|254)))))$",
+        "gateway": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+        "dns1": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$|^$",
+        "dns2": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$|^$",
+        "dnssuffix": ""
+    },
+    "radio_table": [{
+        "radio": "ng|na|ad",
+        "channel": "[0-9]|[1][0-4]|4.5|16|34|36|38|40|42|44|46|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165|183|184|185|187|188|189|192|196|auto",
+        "backup_channel": "[0-9]|[1][0-4]|16|34|36|38|40|42|44|46|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165|183|184|185|187|188|189|192|196|auto",
+        "ht": "20|40|80|160|1080|2160",
+        "tx_power_mode": "auto|medium|high|low|custom",
+        "tx_power": "[\\d]+|auto",
+        "min_rssi_enabled": "true|false",
+        "min_rssi": "^-([1-9]|[1-8][0-9]|9[0-4])$",
+        "name": "",
+        "hard_noise_floor_enabled": "true|false",
+        "sens_level_enabled": "true|false",
+        "sens_level": "^-([5-8][0-9]|90)$",
+        "antenna_gain": "^-?([0-9]|[1-9][0-9])",
+        "antenna_id": "-1|[0-9]",
+        "vwire_enabled":"true|false",
+        "loadbalance_enabled": "true|false",
+        "maxsta": "[1-9]|[1-9][0-9]|1[0-9]{2}|200|^$"
+    }],
+    "wlan_overrides": [{
+        "enabled":"true|false",
+        "name":".{1,32}",
+        "name_combine_enabled":"true|false",
+        "name_combine_suffix":".{0,8}",
+        "vlan":"[2-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-8][0-9]|409[0-5]|^$",
+        "vlan_enabled":"true|false",
+        "x_passphrase": "[\\x20-\\x7E]{8,63}|[0-9a-fA-F]{64}",
+        "wlan_id":"[\\d\\w]+",
+        "radio":"ng|na",
+        "radio_name":""
+    }],
+    "outlet_overrides": [{
+        "index": "[0-9]{1,2}",
+        "name":".{0,128}",
+        "relay_state": "true|false",
+        "cycle_enabled": "true|false"
+    }],
+    "outlet_enabled": "true|false",
+    "ethernet_overrides": [{
+        "ifname": "eth[0-9]{1,2}",
+        "networkgroup": "LAN[2-8]?|WAN[2]?"
+    }],
+    "jumboframe_enabled": "true|false",
+    "flowctrl_enabled": "true|false",
+    "stp_version": "stp|rstp|disabled",
+    "stp_priority": "0|4096|8192|12288|16384|20480|24576|28672|32768|36864|40960|45056|49152|53248|57344|61440",
+    "dot1x_portctrl_enabled": "true|false",
+    "dot1x_fallback_networkconf_id": "[\\d\\w]+|",
+    "radiusprofile_id": "",
+    "atf_enabled": "true|false",
+    "bandsteering_mode": "off|equal|prefer_5g",
+    "dpi_enabled": "true|false",
+    "resetbtn_enabled": "on|off",
+    "mgmt_network_id": "[\\d\\w]+",
+    "switch_vlan_enabled": "false|true",
+    "port_overrides": [{
+        "port_idx":"[1-9]|[1-4][0-9]|5[0-2]",
+        "name":".{0,128}",
+        "op_mode":"switch|mirror|aggregate",
+        "autoneg":"true|false",
+        "speed":"10|100|1000|2500|5000|10000|20000|25000|40000|50000|100000",
+        "full_duplex":"true|false",
+        "poe_mode":"auto|pasv24|passthrough|off",
+        "isolation":"true|false",
+        "dot1x_ctrl":"auto|force_authorized|force_unauthorized|mac_based|multi_host",
+        "dot1x_idle_timeout":"[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]",
+        "stormctrl_type": "level|rate",
+        "stormctrl_ucast_enabled": "true|false",
+        "stormctrl_ucast_level": "[0-9]|[1-9][0-9]|100",
+        "stormctrl_ucast_rate": "[0-9]|[1-9][0-9]{1,6}|1[0-3][0-9]{6}|14[0-7][0-9]{5}|148[0-7][0-9]{4}|14880000",
+        "stormctrl_mcast_enabled": "true|false",
+        "stormctrl_mcast_level": "[0-9]|[1-9][0-9]|100",
+        "stormctrl_mcast_rate": "[0-9]|[1-9][0-9]{1,6}|1[0-3][0-9]{6}|14[0-7][0-9]{5}|148[0-7][0-9]{4}|14880000",
+        "stormctrl_bcast_enabled": "true|false",
+        "stormctrl_bcast_level": "[0-9]|[1-9][0-9]|100",
+        "stormctrl_bcast_rate": "[0-9]|[1-9][0-9]{1,6}|1[0-3][0-9]{6}|14[0-7][0-9]{5}|148[0-7][0-9]{4}|14880000",
+        "priority_queue1_level": "[0-9]|[1-9][0-9]|100",
+        "priority_queue2_level": "[0-9]|[1-9][0-9]|100",
+        "priority_queue3_level": "[0-9]|[1-9][0-9]|100",
+        "priority_queue4_level": "[0-9]|[1-9][0-9]|100",
+        "portconf_id":"[\\d\\w]+",
+        "mirror_port_idx":"[1-9]|[1-4][0-9]|5[0-2]",
+        "lldpmed_enabled": "true|false",
+        "lldpmed_notify_enabled": "true|false",
+        "stp_port_mode": "true|false",
+        "egress_rate_limit_kbps_enabled": "true|false",
+        "egress_rate_limit_kbps": "6[4-9]|[7-9][0-9]|[1-9][0-9]{2,6}",
+        "aggregate_num_ports":"[2-6]",
+        "port_security_enabled": "true|false",
+        "port_security_mac_address": ["^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$"]
+    }],
+    "power_source_ctrl_enabled": "true|false",
+    "power_source_ctrl": "auto|8023af|8023at|8023bt-type3|8023bt-type4|pasv24|poe-injector|ac|adapter|dc|rps",
+    "snmp_location": ".{0,255}",
+    "snmp_contact": ".{0,255}",
+    "baresip_enabled": "true|false",
+    "baresip_extension": "^\\+?[a-zA-Z0-9_.\\-!~*'()]*",
+    "baresip_auth_user": "^\\+?[a-zA-Z0-9_.\\-!~*'()]*",
+    "x_baresip_password": "^[a-zA-Z0-9_.\\-!~*'()]*",
+    "volume": "[0-9]|[1-9][0-9]|100",
+    "lte_ext_ant": "true|false",
+    "lte_poe": "true|false",
+    "lte_soft_limit": "\\d+",
+    "lcm_brightness_override": "true|false",
+    "lcm_brightness": "[1-9]|[1-9][0-9]|100",
+    "lcm_idle_timeout_override": "true|false",
+    "lcm_idle_timeout": "[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-5][0-9][0-9]|3600",
+    "rps_override": {
+        "power_management_mode": "dynamic|static",
+        "rps_port_table": [{
+            "port_idx": "[1-6]",
+            "name": ".{0,32}",
+            "port_mode":"auto|force_active|manual|disabled"
+        }]
+    },
+    "lcm_tracker_seed": ".{0,50}",
+    "lcm_tracker_enabled": "true|false",
+    "ubb_pair_name": ".{1,128}",
+    "lte_sim_pin": "[0-9]{4,8}",
+    "lte_apn": ".{1,128}"
+}
diff --git a/fields/6.0.23/DhcpOption.json b/fields/6.0.23/DhcpOption.json
new file mode 100644
index 0000000..63f9c8d
--- /dev/null
+++ b/fields/6.0.23/DhcpOption.json
@@ -0,0 +1,8 @@
+{
+    "type": "^(boolean|hexarray|integer|ipaddress|macaddress|text)$",
+    "code": "^(?!(?:15|42|43|44|51|66|67|252)$)([7-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-4])$",
+    "name": "^[A-Za-z0-9-_]{1,25}$",
+    "signed": "^(true|false)$",
+    "width": "^(8|16|32)$"
+}
+
diff --git a/fields/6.0.23/DpiApp.json b/fields/6.0.23/DpiApp.json
new file mode 100644
index 0000000..55760c2
--- /dev/null
+++ b/fields/6.0.23/DpiApp.json
@@ -0,0 +1,10 @@
+{
+    "name": ".{1,128}",
+    "enabled": "false|true",
+    "apps": [ "[0-9]{1,8}" ],
+    "cats": [ "[0-9]{1,3}" ],
+    "blocked": "false|true",
+    "log": "false|true",
+    "qos_rate_max_up": "-1|[2-9]|[1-9][0-9]{1,4}|100000|10[0-1][0-9]{3}|102[0-3][0-9]{2}|102400",
+    "qos_rate_max_down": "-1|[2-9]|[1-9][0-9]{1,4}|100000|10[0-1][0-9]{3}|102[0-3][0-9]{2}|102400"
+}
diff --git a/fields/6.0.23/DpiGroup.json b/fields/6.0.23/DpiGroup.json
new file mode 100644
index 0000000..de915a1
--- /dev/null
+++ b/fields/6.0.23/DpiGroup.json
@@ -0,0 +1,5 @@
+{
+    "name":".{1,128}",
+    "enabled": "false|true",
+    "dpiapp_ids": [ "[\\d\\w]+" ]
+}
diff --git a/fields/6.0.23/DynamicDNS.json b/fields/6.0.23/DynamicDNS.json
new file mode 100644
index 0000000..b866f64
--- /dev/null
+++ b/fields/6.0.23/DynamicDNS.json
@@ -0,0 +1,10 @@
+{
+    "interface": "wan|wan2",
+    "service": "afraid|changeip|cloudflare|dnspark|dslreports|dyndns|easydns|googledomains|namecheap|noip|sitelutions|zoneedit|custom",
+    "custom_service": "^[^\"' ]+$",
+    "host_name": "^[^\"' ]+$",
+    "login": "^[^\"' ]+$",
+    "x_password": "^[^\"' ]+$",
+    "server": "^[^\"' ]+$|^$",
+    "options": ["^[^\"' ]+$"]
+}
diff --git a/fields/6.0.23/FirewallGroup.json b/fields/6.0.23/FirewallGroup.json
new file mode 100644
index 0000000..a148c69
--- /dev/null
+++ b/fields/6.0.23/FirewallGroup.json
@@ -0,0 +1,5 @@
+{
+    "name": ".{1,64}",
+    "group_type": "address-group|port-group|ipv6-address-group",
+    "group_members": [ "" ]
+}
diff --git a/fields/6.0.23/FirewallRule.json b/fields/6.0.23/FirewallRule.json
new file mode 100644
index 0000000..9e3f7df
--- /dev/null
+++ b/fields/6.0.23/FirewallRule.json
@@ -0,0 +1,48 @@
+{
+    "name": ".{1,128}",
+    "ruleset": "WAN_IN|WAN_OUT|WAN_LOCAL|LAN_IN|LAN_OUT|LAN_LOCAL|GUEST_IN|GUEST_OUT|GUEST_LOCAL|WANv6_IN|WANv6_OUT|WANv6_LOCAL|LANv6_IN|LANv6_OUT|LANv6_LOCAL|GUESTv6_IN|GUESTv6_OUT|GUESTv6_LOCAL",
+    "rule_index": "2[0-9]{3}|4[0-9]{3}",
+
+    "enabled": "true|false",
+    "action": "drop|reject|accept",
+    "protocol": "^$|all|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|tcp_udp|ah|ax.25|dccp|ddp|egp|eigrp|encap|esp|etherip|fc|ggp|gre|hip|hmp|icmp|idpr-cmtp|idrp|igmp|igp|ip|ipcomp|ipencap|ipip|ipv6|ipv6-frag|ipv6-icmp|ipv6-nonxt|ipv6-opts|ipv6-route|isis|iso-tp4|l2tp|manet|mobility-header|mpls-in-ip|ospf|pim|pup|rdp|rohc|rspf|rsvp|sctp|shim6|skip|st|tcp|udp|udplite|vmtp|vrrp|wesp|xns-idp|xtp",
+    "protocol_v6": "^$|([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|ah|all|dccp|eigrp|esp|gre|icmpv6|ipcomp|ipv6|ipv6-frag|ipv6-icmp|ipv6-nonxt|ipv6-opts|ipv6-route|isis|l2tp|manet|mobility-header|mpls-in-ip|ospf|pim|rsvp|sctp|shim6|tcp|tcp_udp|udp|vrrp",
+    "protocol_match_excepted": "false|true",
+
+    "state_established": "false|true",
+    "state_invalid": "false|true",
+    "state_new": "false|true",
+    "state_related": "false|true",
+
+    "ipsec": "match-ipsec|match-none|^$",
+    "icmp_typename" : "^$|address-mask-reply|address-mask-request|any|communication-prohibited|destination-unreachable|echo-reply|echo-request|fragmentation-needed|host-precedence-violation|host-prohibited|host-redirect|host-unknown|host-unreachable|ip-header-bad|network-prohibited|network-redirect|network-unknown|network-unreachable|parameter-problem|port-unreachable|precedence-cutoff|protocol-unreachable|redirect|required-option-missing|router-advertisement|router-solicitation|source-quench|source-route-failed|time-exceeded|timestamp-reply|timestamp-request|TOS-host-redirect|TOS-host-unreachable|TOS-network-redirect|TOS-network-unreachable|ttl-zero-during-reassembly|ttl-zero-during-transit",
+    "icmpv6_typename" : "^$|address-unreachable|bad-header|beyond-scope|communication-prohibited|destination-unreachable|echo-reply|echo-request|failed-policy|neighbor-advertisement|neighbor-solicitation|no-route|packet-too-big|parameter-problem|port-unreachable|redirect|reject-route|router-advertisement|router-solicitation|time-exceeded|ttl-zero-during-reassembly|ttl-zero-during-transit|unknown-header-type|unknown-option",
+
+    "dst_address": "",
+    "dst_address_ipv6": "",
+    "dst_port": "",
+    "dst_firewallgroup_ids": [ "[\\d\\w]+" ],
+    "dst_networkconf_id": "[\\d\\w]+|^$",
+    "dst_networkconf_type": "ADDRv4|NETv4",
+
+    "src_address": "",
+    "src_address_ipv6": "",
+    "src_port": "",
+    "src_firewallgroup_ids": [ "[\\d\\w]+" ],
+    "src_networkconf_id": "[\\d\\w]+|^$",
+    "src_networkconf_type": "ADDRv4|NETv4",
+    "src_mac_address": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$|^$",
+
+    "startdate": "^$|^(20[0-9]{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9])$",
+    "stopdate": "^$|^(20[0-9]{2}-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9])$",
+    "starttime": "^$|^(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9])$",
+    "stoptime": "^$|^(([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9])$",
+    "monthdays": "^$|^(([1-9]|[12][0-9]|3[01])(,([1-9]|[12][0-9]|3[01])){0,30})$",
+    "monthdays_negate": "false|true",
+    "weekdays": "^$|^((Mon|Tue|Wed|Thu|Fri|Sat|Sun)(,(Mon|Tue|Wed|Thu|Fri|Sat|Sun)){0,6})$",
+    "weekdays_negate": "false|true",
+    "utc": "false|true",
+    "contiguous": "false|true",
+
+    "logging": "false|true"
+}
diff --git a/fields/6.0.23/HeatMap.json b/fields/6.0.23/HeatMap.json
new file mode 100644
index 0000000..eaa6021
--- /dev/null
+++ b/fields/6.0.23/HeatMap.json
@@ -0,0 +1,6 @@
+{
+    "map_id": "",
+    "type": "download|upload",
+    "name": ".*[^\\s]+.*",
+    "description": ""
+}
diff --git a/fields/6.0.23/HeatMapPoint.json b/fields/6.0.23/HeatMapPoint.json
new file mode 100644
index 0000000..f119f69
--- /dev/null
+++ b/fields/6.0.23/HeatMapPoint.json
@@ -0,0 +1,7 @@
+{
+    "heatmap_id": "",
+    "x": "[-+]?[0-9]*\\.?[0-9]+",
+    "y": "[-+]?[0-9]*\\.?[0-9]+",
+    "upload_speed": "[-+]?[0-9]*\\.?[0-9]+",
+    "download_speed": "[-+]?[0-9]*\\.?[0-9]+"
+}
diff --git a/fields/6.0.23/Hotspot2Conf.json b/fields/6.0.23/Hotspot2Conf.json
new file mode 100644
index 0000000..8344c7a
--- /dev/null
+++ b/fields/6.0.23/Hotspot2Conf.json
@@ -0,0 +1,136 @@
+{
+  "name": ".{1,128}",
+  "venue_name": [
+    {
+      "language": "[a-z]{3}",
+      "name": "",
+      "url": ""
+    }
+  ],
+  "venue_group": "0|1|2|3|4|5|6|7|8|9|10|11",
+  "venue_type": "0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15",
+  "network_type": "0|1|2|3|4|5|14|15",
+  "network_access_internet": "true|false",
+  "network_access_asra": "true|false",
+  "network_access_esr": "true|false",
+  "network_access_uesa": "true|false",
+  "ipaddr_type_avail_v4": "0|1|2|3|4|5|6|7",
+  "ipaddr_type_avail_v6": "0|1|2",
+  "hessid_used" : "true|false",
+  "hessid": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$|^$",
+  "anqp_domain_id": "^0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]|$",
+  "network_auth_type": "-1|0|1|2|3",
+  "network_auth_url": "",
+  "disable_dgaf": "true|false",
+  "deauth_req_timeout" : "[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-5][0-9][0-9]|3600",
+  "osu_ssid": "",
+  "nai_realm_list": [
+    {
+      "name": ".{1,128}",
+      "status": "true|false",
+      "encoding": "0|1",
+      "eap_method": "13|21|18|23|50",
+      "auth_ids": "",
+      "auth_vals": ""
+    }
+  ],
+  "domain_name_list": [".{1,128}"],
+  "roaming_consortium_list": [
+    {
+      "name": ".{1,128}",
+      "oid": ".{1,128}"
+    }
+  ],
+  "cellular_network_list": [
+    {
+      "name": ".{1,128}",
+      "mcc": "[0-9]{3}",
+      "mnc": "[0-9]{3}"
+    }
+  ],
+  "friendly_name" : [
+     {
+      "language": "[a-z]{3}",
+      "text": ".{1,128}"
+     }
+  ],
+  "t_c_filename" : ".{1,256}",
+  "t_c_timestamp" : "[0-9]{1,12}",
+  "icons" : [
+    {
+      "name" : ".{1,256}",
+      "width": "[0-9]{1,8}",
+      "height": "[0-9]{1,8}",
+      "media": ".{1,256}",
+      "language": "[a-z]{3}",
+      "filename": ".{1,256}",
+      "data": "",
+      "size": "[0-9]{1,8}"
+    }
+  ],
+  "metrics_status" : "true|false",
+  "metrics_info_link_status" : "up|down|test",
+  "metrics_info_symmetric" : "true|false",
+  "metrics_info_at_capacity" : "true|false",
+  "metrics_downlink_speed_set": "true|false",
+  "metrics_downlink_speed": "[0-9]{1,10}",
+  "metrics_uplink_speed_set": "true|false",
+  "metrics_uplink_speed": "[0-9]{1,10}",
+  "metrics_downlink_load_set": "true|false",
+  "metrics_downlink_load": "[0-9]{1,3}",
+  "metrics_uplink_load_set": "true|false",
+  "metrics_uplink_load": "[0-9]{1,3}",
+  "metrics_measurement_set": "true|false",
+  "metrics_measurement": "[0-9]{1,5}",
+  "capab" : [
+    {
+      "protocol" : "icmp|tcp_udp|tcp|udp|esp",
+      "port": "^(0|[1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])|$",
+      "status" : "closed|open|unknown"
+    }
+  ],
+  "osu" : [
+    {
+      "server_uri": "",
+      "friendly_name" : [
+        {
+          "language": "[a-z]{3}",
+          "text": ".{1,128}"
+        }
+      ],
+      "description" : [
+        {
+          "language": "[a-z]{3}",
+          "text": ".{1,128}"
+        }
+      ],
+      "nai" : "",
+      "nai2" : "",
+      "operating_class" : "[0-9A-Fa-f]{12}",
+      "method_soap_xml_spp": "true|false",
+      "method_oma_dm": "true|false",
+      "icon" : [
+        {
+          "name": ".{1,128}"
+        }
+      ]
+    }
+  ],
+  "gas_advanced": "true|false",
+  "gas_frag_limit" : "[0-9]{0,5}",
+  "gas_comeback_delay" : "[0-9]{0,4}",
+  "qos_map_status" : "true|false",
+  "qos_map_exceptions" : [
+    {
+      "dcsp" : "[0-9]{1,2}",
+      "up" : "[0-7]"
+    }
+  ],
+  "qos_map_dcsp" : [
+    {
+      "low" : "[0-9]{1,3}",
+      "high" : "[0-9]{1,3}"
+    }
+  ],
+  "save_timestamp": ""
+}
diff --git a/fields/6.0.23/HotspotOp.json b/fields/6.0.23/HotspotOp.json
new file mode 100644
index 0000000..aa464df
--- /dev/null
+++ b/fields/6.0.23/HotspotOp.json
@@ -0,0 +1,5 @@
+{
+    "name": ".{1,256}",
+    "x_password": ".{1,256}",
+    "note": ""
+}
diff --git a/fields/6.0.23/HotspotPackage.json b/fields/6.0.23/HotspotPackage.json
new file mode 100644
index 0000000..5ab20f3
--- /dev/null
+++ b/fields/6.0.23/HotspotPackage.json
@@ -0,0 +1,31 @@
+{
+    "name": "",
+    "charged_as": "",
+    "amount": "^([\\d]+[.]?[\\d]*)$",
+    "currency": "[A-Z]{3}",
+    "hours": "[\\d]+|^$",
+    "trial_duration_minutes": "[\\d]+|^$",
+    "trial_reset": "^([\\d]+[.]?[\\d]*)$|^$",
+    "limit_overwrite": "true|false",
+    "limit_up": "[\\d]+|^$",
+    "limit_down": "[\\d]+|^$",
+    "limit_quota": "[\\d]+|^$",
+    "index": "[\\d]+",
+    "custom_payment_fields_enabled": "true|false",
+    "payment_fields_address_enabled": "true|false",
+    "payment_fields_address_required": "true|false",
+    "payment_fields_city_enabled": "true|false",
+    "payment_fields_city_required": "true|false",
+    "payment_fields_country_enabled": "true|false",
+    "payment_fields_country_required": "true|false",
+    "payment_fields_email_enabled": "true|false",
+    "payment_fields_email_required": "true|false",
+    "payment_fields_first_name_enabled": "true|false",
+    "payment_fields_first_name_required": "true|false",
+    "payment_fields_last_name_enabled": "true|false",
+    "payment_fields_last_name_required": "true|false",
+    "payment_fields_state_enabled": "true|false",
+    "payment_fields_state_required": "true|false",
+    "payment_fields_zip_enabled": "true|false",
+    "payment_fields_zip_required": "true|false"
+}
diff --git a/fields/6.0.23/Map.json b/fields/6.0.23/Map.json
new file mode 100644
index 0000000..0fa5c6d
--- /dev/null
+++ b/fields/6.0.23/Map.json
@@ -0,0 +1,15 @@
+{
+    "name": "",
+    "mapTypeId": "satellite|roadmap|hybrid|terrain",
+    "tilt": "[\\d]+",
+    "type": "designerMap|imageMap|googleMap",
+    "upp": "^([\\d]+[.]?[\\d]*)$",
+    "unit": "m|f",
+    "lat": "^([-]?[\\d]+[.]?[\\d]*([eE][-+]?[\\d]+)?)$",
+    "lng": "^([-]?[\\d]+[.]?[\\d]*([eE][-+]?[\\d]+)?)$",
+    "selected": "true|false",
+    "zoom": "[\\d]+",
+    "offset_top": "^([-]?[\\d]+[.]?[\\d]*)$",
+    "offset_left": "^([-]?[\\d]+[.]?[\\d]*)$",
+    "opacity": "^(0(\\.[\\d]{1,2})?|1)$|^$"
+}
diff --git a/fields/6.0.23/MediaFile.json b/fields/6.0.23/MediaFile.json
new file mode 100644
index 0000000..7c98cf6
--- /dev/null
+++ b/fields/6.0.23/MediaFile.json
@@ -0,0 +1,3 @@
+{
+    "name": ""
+}
diff --git a/fields/6.0.23/NetworkConf.json b/fields/6.0.23/NetworkConf.json
new file mode 100644
index 0000000..6dd24f1
--- /dev/null
+++ b/fields/6.0.23/NetworkConf.json
@@ -0,0 +1,150 @@
+{
+    "name": ".{1,128}",
+    "enabled": "true|false",
+    "purpose": "corporate|guest|remote-user-vpn|site-vpn|vlan-only|vpn-client|wan",
+    "vpn_type": "auto|ipsec-vpn|openvpn-vpn|pptp-client|l2tp-server|pptp-server|uid-server",
+    "vlan_enabled": "false|true",
+    "vlan": "[2-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|400[0-9]|^$",
+    "gateway_type":"default|switch",
+    "gateway_device": "(^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)",
+    "priority": "[1-4]",
+    "igmp_snooping": "true|false",
+    "igmp_fastleave": "true|false",
+    "igmp_supression": "true|false",
+    "igmp_maxresponse": "[1-9]|1[0-9]|2[0-5]|^$",
+    "igmp_mcrtrexpiretime": "[0-9]|[1-9][0-9]{1,2}|[1-2][0-9]{3}|3[0-5][0-9]{2}|3600|^$",
+    "igmp_groupmembership": "[2-9]|[1-9][0-9]{1,2}|[1-2][0-9]{3}|3[0-5][0-9]{2}|3600|^$",
+    "igmp_querier": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "ip_subnet": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\/([1-9]|[1-2][0-9]|30)$",
+    "ipv6_subnet": "",
+
+    "ipv6_interface_type": "static|pd|none",
+    "ipv6_pd_interface": "wan|wan2",
+    "ipv6_pd_prefixid": "^$|[a-fA-F0-9]{1,4}",
+    "ipv6_ra_enabled": "false|true",
+    "ipv6_ra_priority": "high|medium|low",
+    "ipv6_ra_valid_lifetime": "^([0-9]|[1-8][0-9]|9[0-9]|[1-8][0-9]{2}|9[0-8][0-9]|99[0-9]|[1-8][0-9]{3}|9[0-8][0-9]{2}|99[0-8][0-9]|999[0-9]|[1-8][0-9]{4}|9[0-8][0-9]{3}|99[0-8][0-9]{2}|999[0-8][0-9]|9999[0-9]|[1-8][0-9]{5}|9[0-8][0-9]{4}|99[0-8][0-9]{3}|999[0-8][0-9]{2}|9999[0-8][0-9]|99999[0-9]|[1-8][0-9]{6}|9[0-8][0-9]{5}|99[0-8][0-9]{4}|999[0-8][0-9]{3}|9999[0-8][0-9]{2}|99999[0-8][0-9]|999999[0-9]|[12][0-9]{7}|30[0-9]{6}|31[0-4][0-9]{5}|315[0-2][0-9]{4}|3153[0-5][0-9]{3}|31536000)$|^$",
+    "ipv6_ra_preferred_lifetime": "^([0-9]|[1-8][0-9]|9[0-9]|[1-8][0-9]{2}|9[0-8][0-9]|99[0-9]|[1-8][0-9]{3}|9[0-8][0-9]{2}|99[0-8][0-9]|999[0-9]|[1-8][0-9]{4}|9[0-8][0-9]{3}|99[0-8][0-9]{2}|999[0-8][0-9]|9999[0-9]|[1-8][0-9]{5}|9[0-8][0-9]{4}|99[0-8][0-9]{3}|999[0-8][0-9]{2}|9999[0-8][0-9]|99999[0-9]|[1-8][0-9]{6}|9[0-8][0-9]{5}|99[0-8][0-9]{4}|999[0-8][0-9]{3}|9999[0-8][0-9]{2}|99999[0-8][0-9]|999999[0-9]|[12][0-9]{7}|30[0-9]{6}|31[0-4][0-9]{5}|315[0-2][0-9]{4}|3153[0-5][0-9]{3}|31536000)$|^$",
+    "ipv6_pd_start": "",
+    "ipv6_pd_stop": "",
+    "domain_name": "(?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\\.)+[a-zA-Z]{2,63}$)|^$|[a-zA-Z0-9-]{1,63}",
+    "dhcpd_enabled": "true|false",
+    "dhcpd_start": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_stop": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_gateway": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_gateway_enabled": "^true|false$",
+    "dhcpd_dns_enabled": "true|false",
+    "dhcpd_dns_1": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_dns_2": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_dns_3": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_dns_4": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_leasetime": "[\\d]+",
+    "dhcpd_wins_enabled": "true|false",
+    "dhcpd_wins_1": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_wins_2": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_ntp_enabled": "true|false",
+    "dhcpd_ntp_1": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_ntp_2": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_boot_enabled": "true|false",
+    "dhcpd_boot_server": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$|(?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\\.)+[a-zA-Z]{2,63}$)|[a-zA-Z0-9-]{1,63}|^$",
+    "dhcpd_boot_filename": ".{1,256}",
+    "dhcpd_unifi_controller": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_time_offset_enabled": "true|false",
+    "dhcpd_time_offset": "^0$|^-?([1-9]([0-9]{1,3})?|[1-7][0-9]{4}|[8][0-5][0-9]{3}|86[0-3][0-9]{2}|86400)$",
+    "dhcpd_wpad_url": "",
+    "dhcpd_tftp_server": "",
+    "dhcp_relay_enabled": "true|false",
+    "dhcpguard_enabled": "true|false",
+    "dhcpd_ip_1": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_ip_2": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_ip_3": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dhcpd_mac_1": "(^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)",
+    "dhcpd_mac_2": "(^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)",
+    "dhcpd_mac_3": "(^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)",
+    "dhcpdv6_enabled": "true|false",
+    "dhcpdv6_start": "",
+    "dhcpdv6_stop": "",
+    "dhcpdv6_leasetime": "[\\d]+",
+    "dhcpdv6_dns_auto": "true|false",
+    "dhcpdv6_dns_1": "",
+    "dhcpdv6_dns_2": "",
+    "dhcpdv6_dns_3": "",
+    "dhcpdv6_dns_4": "",
+    "is_nat": "true|false",
+    "nat_outbound_ip_addresses": [{
+        "wan_network_group": "WAN|WAN2",
+        "ip_address": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$"
+    }],
+    "networkgroup": "LAN[2-8]?",
+    "usergroup_id": "",
+    "dpi_enabled": "false|true",
+    "dpigroup_id": "[\\d\\w]+|^$",
+    "remote_site_id": "",
+    "remote_site_subnets": [ "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\/([1-9]|[1-2][0-9]|30)$|^$" ],
+    "exposed_to_site_vpn": "false|true",
+    "require_mschapv2": "true|false",
+    "remote_vpn_subnets": [ "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\/([1-9]|[1-2][0-9]|30)$|^$" ],
+    "ipsec_peer_ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+    "ipsec_local_ip": "^any$|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+    "x_ipsec_pre_shared_key": "[^\\\"\\' ]+",
+    "ipsec_profile": "customized|azure_dynamic|azure_static",
+    "ipsec_encryption": "aes128|aes192|aes256|3des",
+    "ipsec_hash": "sha1|md5|sha256|sha384|sha512",
+    "ipsec_dh_group": "2|5|14|15|16|19|20|21|25|26",
+    "ipsec_ike_dh_group": "1|2|5|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32",
+    "ipsec_esp_dh_group": "1|2|5|14|15|16|17|18",
+    "ipsec_key_exchange": "ikev1|ikev2",
+    "ipsec_pfs": "false|true",
+    "ipsec_dynamic_routing": "true|false",
+    "lte_lan_enabled": "true|false",
+    "l2tp_interface": "wan|wan2",
+    "openvpn_mode": "site-to-site|client|server",
+    "openvpn_remote_host": "[^\\\"\\' ]+|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+    "openvpn_local_port": "^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$",
+    "openvpn_remote_port": "^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$",
+    "openvpn_local_address": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+    "openvpn_remote_address": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+    "x_openvpn_shared_secret_key": "[0-9A-Fa-f]{512}",
+    "pptpc_server_ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|(?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\\.)+[a-zA-Z]{2,63}$)|^[a-zA-Z0-9-]{1,63}$",
+    "pptpc_username": "[^\\\"\\' ]+",
+    "x_pptpc_password": "[^\\\"\\' ]+",
+    "pptpc_require_mppe": "true|false",
+    "pptpc_route_distance": "^[1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]$|^$",
+    "vpn_client_pull_dns": "true|false",
+    "vpn_client_default_route": "true|false",
+    "upnp_lan_enabled": "true|false",
+    "route_distance": "^[1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]$|^$",
+    "radiusprofile_id": "",
+    "wan_type": "disabled|dhcp|static|pppoe",
+    "wan_networkgroup": "WAN[2]?|WAN_LTE_FAILOVER",
+    "wan_ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+    "wan_ip_aliases":  [ "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\/([1-9]|[1-2][0-9]|30)$|^$" ],
+    "wan_netmask": "^((128|192|224|240|248|252|254)\\.0\\.0\\.0)|(255\\.(((0|128|192|224|240|248|252|254)\\.0\\.0)|(255\\.(((0|128|192|224|240|248|252|254)\\.0)|255\\.(0|128|192|224|240|248|252|254)))))$",
+    "wan_gateway": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "wan_username": "[^\"' ]+",
+    "wan_dhcp_options": [{
+        "optionNumber": "([1-9]|[1-8][0-9]|9[0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-4])",
+        "value": ""
+    }],
+    "x_wan_password": "[^\"' ]+",
+    "report_wan_event": "true|false",
+    "wan_dns1": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "wan_dns2": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "wan_dns3": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "wan_dns4": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "wan_vlan_enabled": "false|true",
+    "wan_vlan": "[0-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-8][0-9]|409[0-4]|^$",
+    "wan_egress_qos": "[1-7]|^$",
+    "wan_smartq_enabled": "false|true",
+    "wan_smartq_up_rate": "[0-9]{1,6}|1000000",
+    "wan_smartq_down_rate": "[0-9]{1,6}|1000000",
+    "wan_load_balance_type": "failover-only|weighted",
+    "wan_load_balance_weight": "[1-9]|[1-9][0-9]",
+    "wan_type_v6": "disabled|dhcpv6|static",
+    "wan_dhcpv6_pd_size": "^(4[89]|5[0-9]|6[0-4])$|^$",
+    "wan_ipv6": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$|^$",
+    "wan_prefixlen": "^([1-9]|[1-8][0-9]|9[0-9]|1[01][0-9]|12[0-8])$|^$",
+    "wan_gateway_v6": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$|^$",
+    "ipsec_interface": "wan|wan2",
+    "auto_scale_enabled": "false|true"
+}
diff --git a/fields/6.0.23/PortConf.json b/fields/6.0.23/PortConf.json
new file mode 100644
index 0000000..5beb225
--- /dev/null
+++ b/fields/6.0.23/PortConf.json
@@ -0,0 +1,36 @@
+{
+    "name": "",
+    "forward": "all|native|customize|disabled",
+    "native_networkconf_id": "",
+    "tagged_networkconf_ids": [""],
+    "voice_networkconf_id": "",
+    "op_mode":"switch",
+    "autoneg":"true|false",
+    "speed":"10|100|1000|2500|5000|10000|20000|25000|40000|50000|100000",
+    "full_duplex":"true|false",
+    "poe_mode":"auto|pasv24|passthrough|off",
+    "isolation":"true|false",
+    "dot1x_ctrl":"auto|force_authorized|force_unauthorized|mac_based|multi_host",
+    "dot1x_idle_timeout":"[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]",
+    "stormctrl_type": "level|rate",
+    "stormctrl_ucast_enabled": "true|false",
+    "stormctrl_ucast_level": "[0-9]|[1-9][0-9]|100",
+    "stormctrl_ucast_rate": "[0-9]|[1-9][0-9]{1,6}|1[0-3][0-9]{6}|14[0-7][0-9]{5}|148[0-7][0-9]{4}|14880000",
+    "stormctrl_mcast_enabled": "true|false",
+    "stormctrl_mcast_level": "[0-9]|[1-9][0-9]|100",
+    "stormctrl_mcast_rate": "[0-9]|[1-9][0-9]{1,6}|1[0-3][0-9]{6}|14[0-7][0-9]{5}|148[0-7][0-9]{4}|14880000",
+    "stormctrl_bcast_enabled": "true|false",
+    "stormctrl_bcast_level": "[0-9]|[1-9][0-9]|100",
+    "stormctrl_bcast_rate": "[0-9]|[1-9][0-9]{1,6}|1[0-3][0-9]{6}|14[0-7][0-9]{5}|148[0-7][0-9]{4}|14880000",
+    "priority_queue1_level": "[0-9]|[1-9][0-9]|100",
+    "priority_queue2_level": "[0-9]|[1-9][0-9]|100",
+    "priority_queue3_level": "[0-9]|[1-9][0-9]|100",
+    "priority_queue4_level": "[0-9]|[1-9][0-9]|100",
+    "lldpmed_enabled": "true|false",
+    "lldpmed_notify_enabled": "true|false",
+    "stp_port_mode": "true|false",
+    "egress_rate_limit_kbps_enabled": "true|false",
+    "egress_rate_limit_kbps": "6[4-9]|[7-9][0-9]|[1-9][0-9]{2,6}",
+    "port_security_enabled": "true|false",
+    "port_security_mac_address": ["^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$"]
+}
diff --git a/fields/6.0.23/PortForward.json b/fields/6.0.23/PortForward.json
new file mode 100644
index 0000000..2fc9c08
--- /dev/null
+++ b/fields/6.0.23/PortForward.json
@@ -0,0 +1,12 @@
+{
+    "name": ".{1,128}",
+    "enabled": "true|false",
+    "src": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])-(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([0-9]|[1-2][0-9]|3[0-2])$|^!(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^!(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])-(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^!(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([0-9]|[1-2][0-9]|3[0-2])$|^any$",
+    "dst_port": "(([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]))+(,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])){0,14}",
+    "destination_ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^any$",
+    "fwd": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+    "fwd_port": "(([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]))+(,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])){0,14}",
+    "proto": "tcp_udp|tcp|udp",
+    "log": "true|false",
+    "pfwd_interface": "wan|wan2|both"
+}
diff --git a/fields/6.0.23/RadiusProfile.json b/fields/6.0.23/RadiusProfile.json
new file mode 100644
index 0000000..0409302
--- /dev/null
+++ b/fields/6.0.23/RadiusProfile.json
@@ -0,0 +1,20 @@
+{
+    "name": ".{1,128}",
+    "vlan_enabled": "false|true",
+    "vlan_wlan_mode": "disabled|optional|required",
+    "use_usg_auth_server": "false|true",
+    "auth_servers": [{
+        "ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+        "port": "^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$|^$",
+        "x_secret": ""
+    }],
+    "accounting_enabled": "false|true",
+    "use_usg_acct_server": "false|true",
+    "interim_update_enabled": "false|true",
+    "interim_update_interval": "^([6-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9][0-9]|86400)$",
+    "acct_servers": [{
+        "ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$",
+        "port": "^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$|^$",
+        "x_secret": ""
+    }]
+}
diff --git a/fields/6.0.23/Routing.json b/fields/6.0.23/Routing.json
new file mode 100644
index 0000000..398a751
--- /dev/null
+++ b/fields/6.0.23/Routing.json
@@ -0,0 +1,11 @@
+{
+    "name": ".{1,128}",
+    "enabled": "true|false",
+    "type": "static-route",
+
+    "static-route_type": "nexthop-route|interface-route|blackhole",
+    "static-route_network": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\/([1-9]|[1-2][0-9]|3[0-2])$|^([a-fA-F0-9:]+\\/(([1-9]|[1-8][0-9]|9[0-9]|1[01][0-9]|12[0-8])))$",
+    "static-route_nexthop": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^([a-fA-F0-9:]+)$|^$",
+    "static-route_interface": "WAN1|WAN2|[\\d\\w]+|^$",
+    "static-route_distance": "^[1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]$|^$"
+}
diff --git a/fields/6.0.23/ScheduleTask.json b/fields/6.0.23/ScheduleTask.json
new file mode 100644
index 0000000..2233782
--- /dev/null
+++ b/fields/6.0.23/ScheduleTask.json
@@ -0,0 +1,14 @@
+{
+    "cron_expr": "",
+    "action": "stream|upgrade",
+    "execute_only_once": "true|false",
+    "name": "",
+    "broadcastgroup_id": "",
+    "stream_type": "media|sample",
+    "upgrade_targets": [{
+        "mac":"^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$"
+    }],
+    "mediafile_id": "",
+    "sample_filename": "",
+    "additional_sounds_enabled": "true|false"
+}
diff --git a/fields/6.0.23/Setting.json b/fields/6.0.23/Setting.json
new file mode 100644
index 0000000..cf8e760
--- /dev/null
+++ b/fields/6.0.23/Setting.json
@@ -0,0 +1,422 @@
+{
+    "mgmt": {
+        "alert_enabled": "true|false",
+        "auto_upgrade": "true|false",
+        "boot_sound": "true|false",
+        "led_enabled": "true|false",
+        "advanced_feature_enabled": "true|false",
+        "outdoor_mode_enabled": "true|false",
+        "unifi_idp_enabled": "true|false",
+        "wifiman_enabled": "true|false",
+        "x_mgmt_key": "[0-9a-f]{32}",
+        "x_ssh_keys": [""],
+        "x_ssh_username": "^[_A-Za-z0-9][-_.A-Za-z0-9]{0,29}$",
+        "x_ssh_password": ".{1,128}",
+        "x_ssh_md5passwd": "",
+        "x_ssh_sha512passwd": "",
+        "x_ssh_enabled": "true|false",
+        "x_ssh_bind_wildcard": "true|false",
+        "x_ssh_auth_password_enabled": "true|false"
+    },
+    "country": {
+        "code": "[\\d]{1,3}"
+    },
+    "locale": {
+        "timezone": ""
+    },
+    "snmp": {
+        "enabled": "true|false",
+        "enabledV3": "true|false",
+        "community": ".{1,256}",
+        "username": "[a-zA-Z0-9_-]{1,30}",
+        "x_password": "[^'\"]{8,32}"
+    },
+    "radio_ai": {
+        "enabled": "true|false",
+        "cron_expr": "",
+        "default": "true|false",
+        "radios": ["na|ng"],
+        "optimize": ["channel|power"],
+        "channels_ng": ["1|2|3|4|5|6|7|8|9|10|11|12|13|14"],
+        "channels_na": ["36|40|44|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165"],
+        "ht_modes_ng": ["^(20|40)$"],
+        "ht_modes_na": ["^(20|40|80|160)$"],
+        "exclude_devices": ["([0-9a-z]{2}:){5}[0-9a-z]{2}"],
+        "useXY": "true|false"
+    },
+    "network_optimization": {
+        "enabled": "true|false"
+    },
+    "rsyslogd": {
+        "enabled": "true|false",
+        "ip": "",
+        "port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]",
+        "debug": "false|true",
+        "this_controller": "false|true",
+        "this_controller_encrypted_only": "false|true",
+        "netconsole_enabled": "true|false",
+        "netconsole_host": "",
+        "netconsole_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]"
+    },
+    "baresip": {
+        "enabled": "true|false",
+        "server": "",
+        "outbound_proxy": "",
+        "package_url": ""
+    },
+    "super_mgmt": {
+        "override_inform_host": "true|false",
+        "auto_upgrade": "true|false",
+        "discoverable": "true|false",
+        "led_enabled": "true|false",
+        "live_chat": "disabled|super-only|everyone",
+        "live_updates": "disabled|live|auto",
+        "store_enabled": "disabled|super-only|everyone",
+        "x_ssh_username": "",
+        "x_ssh_password": "",
+        "autobackup_enabled": "true|false",
+        "autobackup_cron_expr": "",
+        "autobackup_days": "-?[\\d]+",
+        "autobackup_max_files": "[\\d]+",
+        "autobackup_timezone": "",
+        "autobackup_s3_access_key": "",
+        "autobackup_s3_access_secret": "",
+        "autobackup_s3_bucket": "",
+        "autobackup_gcs_certificate_path": "",
+        "autobackup_gcs_bucket": "",
+        "autobackup_local_path": "",
+        "autobackup_post_actions": ["copy_local|copy_s3|copy_gcs|copy_cloud"],
+        "backup_to_cloud_enabled": "true|false",
+        "google_maps_api_key": "",
+        "minimum_usable_hd_space": "[\\d]+",
+        "minimum_usable_sd_space": "[\\d]+",
+        "image_maps_use_google_engine": "true|false",
+        "data_retention_time_enabled": "true|false",
+        "data_retention_time_in_hours_for_5minutes_scale": "-?[\\d]+",
+        "data_retention_time_in_hours_for_hourly_scale": "-?[\\d]+",
+        "data_retention_time_in_hours_for_daily_scale": "-?[\\d]+",
+        "data_retention_time_in_hours_for_monthly_scale": "-?[\\d]+",
+        "data_retention_time_in_hours_for_others": "-?[\\d]+",
+        "time_series_per_client_stats_enabled": "true|false",
+        "contact_info_full_name": "",
+        "contact_info_company_name": "",
+        "contact_info_phone_number": "",
+        "contact_info_shipping_address_1": "",
+        "contact_info_shipping_address_2": "",
+        "contact_info_city": "",
+        "contact_info_state": "",
+        "contact_info_zip": "",
+        "contact_info_country": "",
+        "default_site_device_auth_password_alert": "false",
+        "enable_analytics" : "true|false",
+        "analytics_disapproved_for": ""
+    },
+    "super_identity": {
+        "name": "",
+        "hostname": ""
+    },
+    "super_mail": {
+        "provider": "smtp|cloud|disabled"
+    },
+    "super_smtp": {
+        "enabled": "true|false",
+        "host": "",
+        "port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]|^$",
+        "sender": "",
+        "use_ssl": "true|false",
+        "use_sender": "true|false",
+        "use_auth": "true|false",
+        "username": "",
+        "x_password": ""
+    },
+    "super_sdn": {
+        "enabled" : "true|false",
+        "migrated" : "true|false",
+        "ubic_uuid" : "",
+        "auth_token" : "",
+        "device_id": "",
+        "oauth_enabled": "true|false",
+        "oauth_redirect_uris": [""],
+        "oauth_app_id": "",
+        "x_oauth_app_secret": "",
+        "sso_login_enabled": ""
+    },
+    "super_cloudaccess": {
+        "enabled" : "true|false",
+        "x_certificate_arn" : "",
+        "x_certificate_pem" : "",
+        "device_id" : "",
+        "device_auth" : "",
+        "x_private_key" : "",
+        "ubic_uuid" : ""
+    },
+    "super_events": {
+        "_ignored": ""
+    },
+    "usw": {
+        "dhcp_snoop" : "true|false"
+    },
+    "guest_access": {
+        "portal_enabled": "true|false",
+        "auth": "none|hotspot|facebook_wifi|custom",
+        "redirect_enabled": "true|false",
+        "redirect_url": "",
+        "redirect_https": "true|false",
+        "redirect_to_https": "true|false",
+        "portal_customized": "true|false",
+        "portal_use_hostname": "true|false",
+        "portal_hostname": "^[a-zA-Z0-9.-]+$|^$",
+        "expire": "[\\d]+|custom",
+        "expire_number": "^[1-9][0-9]{0,5}|1000000$",
+        "expire_unit": "1|60|1440",
+        "x_password": "",
+        "custom_ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+        "facebook_enabled": "true|false",
+        "facebook_app_id": "",
+        "x_facebook_app_secret": "",
+        "facebook_scope_email": "true|false",
+        "facebook_wifi_gw_id": "",
+        "facebook_wifi_gw_name": "",
+        "x_facebook_wifi_gw_secret": "",
+        "facebook_wifi_block_https": "true|false",
+        "google_enabled": "true|false",
+        "google_client_id": "",
+        "x_google_client_secret": "",
+        "google_domain": "",
+        "google_scope_email": "true|false",
+        "password_enabled": "true|false",
+        "voucher_enabled": "true|false",
+        "voucher_customized": "true|false",
+        "payment_enabled": "true|false",
+        "restricted_subnet_": "",
+        "allowed_subnet_": "",
+        "restricted_dns_enabled": "false|true",
+        "restricted_dns_servers": [ "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$" ],
+        "gateway": "paypal|stripe|authorize|quickpay|merchantwarrior|ippay",
+        "paypal_use_sandbox": "true|false",
+        "x_paypal_username": "",
+        "x_paypal_password": "",
+        "x_paypal_signature": "",
+        "x_stripe_api_key": "",
+        "x_quickpay_agreementid": "",
+        "x_quickpay_apikey": "",
+        "x_quickpay_merchantid": "",
+        "quickpay_testmode": "true|false",
+        "x_authorize_loginid": "",
+        "x_authorize_transactionkey": "",
+        "x_merchantwarrior_merchantuuid": "",
+        "x_merchantwarrior_apikey": "",
+        "x_merchantwarrior_apipassphrase": "",
+        "x_ippay_terminalid": "",
+        "merchantwarrior_use_sandbox": "false|true",
+        "authorize_use_sandbox": "true|false",
+        "ippay_use_sandbox": "true|false",
+        "template_engine": "jsp|angular",
+        "portal_customized_bg_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+        "portal_customized_bg_image_enabled": "true|false",
+        "portal_customized_bg_image_filename": "",
+        "portal_customized_bg_image_tile": "true|false",
+        "portal_customized_box_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+        "portal_customized_box_opacity": "^[1-9][0-9]?$|^100$|^$",
+        "portal_customized_button_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+        "portal_customized_button_text_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+        "portal_customized_link_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+        "portal_customized_logo_enabled": "true|false",
+        "portal_customized_logo_filename": "",
+        "portal_customized_text_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+        "portal_customized_title": "",
+        "portal_customized_tos_enabled": "true|false",
+        "portal_customized_tos": "",
+        "portal_customized_unsplash_author_name": "",
+        "portal_customized_unsplash_author_username": "",
+        "portal_customized_welcome_text": "",
+        "portal_customized_welcome_text_enabled": "true|false",
+        "portal_customized_welcome_text_position": "under_logo|above_boxes",
+        "portal_customized_box_link_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+        "portal_customized_box_text_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+        "portal_customized_languages": [ "^[a-z]{2}(_[A-Z]{2})*$" ],
+        "radius_enabled": "true|false",
+        "radius_auth_type": "chap|mschapv2",
+        "radius_disconnect_enabled": "true|false",
+        "radius_disconnect_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]",
+        "radiusprofile_id": "",
+        "wechat_enabled": "true|false",
+        "wechat_app_id": "",
+        "wechat_shop_id": "",
+        "x_wechat_app_secret": "",
+        "x_wechat_secret_key": "",
+        "ec_enabled": "true|false"
+    },
+    "connectivity": {
+        "enable_isolated_wlan": "true|false",
+        "enabled": "true|false",
+        "x_mesh_essid": "",
+        "x_mesh_psk": "",
+        "uplink_host": "",
+        "uplink_type": ""
+    },
+    "element_adopt": {
+        "enabled": "true|false",
+        "x_element_essid": "",
+        "x_element_psk": ""
+    },
+    "auto_speedtest": {
+        "enabled": "false|true",
+        "interval": "^(1[2-9]|[2-9][0-9]|[1-9][0-9]{2,3})$"
+    },
+    "provider_capabilities": {
+        "enabled": "false|true",
+        "download": "^[1-9][0-9]*$",
+        "upload": "^[1-9][0-9]*$"
+    },
+    "dpi": {
+        "enabled": "false|true",
+        "fingerprintingEnabled": "false|true"
+    },
+    "porta": {
+        "ugw3_wan2_enabled": "false|true"
+    },
+    "broadcast": {
+        "sound_before_enabled": "true|false",
+        "sound_before_type": "sample|media",
+        "sound_before_resource": "",
+        "sound_after_enabled": "true|false",
+        "sound_after_type": "sample|media",
+        "sound_after_resource": ""
+    },
+    "radius": {
+        "enabled": "true|false",
+        "auth_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]",
+        "acct_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]",
+        "configure_whole_network": "true|false",
+        "tunneled_reply": "true|false",
+        "interim_update_interval": "^([6-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9][0-9]|86400)$",
+        "accounting_enabled": "true|false",
+        "x_secret": "[^\\\"\\' ]{1,48}"
+    },
+    "usg": {
+        "dhcp_relay_server_1": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+        "dhcp_relay_server_2": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+        "dhcp_relay_server_3": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+        "dhcp_relay_server_4": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+        "dhcp_relay_server_5": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+        "dhcp_relay_hop_count": "([1-9]|[1-8][0-9]|9[0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|^$",
+        "dhcp_relay_max_size": "(6[4-9]|[7-9][0-9]|[1-8][0-9]{2}|9[0-8][0-9]|99[0-9]|1[0-3][0-9]{2}|1400)|^$",
+        "dhcp_relay_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]|^$",
+        "dhcp_relay_agents_packets": "append|discard|forward|replace|^$",
+        "upnp_enabled": "true|false",
+        "upnp_wan_interface":"WAN|WAN2",
+        "upnp_nat_pmp_enabled": "true|false",
+        "upnp_secure_mode": "true|false",
+        "firewall_wan_default_log": "true|false",
+        "firewall_lan_default_log": "true|false",
+        "firewall_guest_default_log": "true|false",
+        "ftp_module": "true|false",
+        "gre_module": "true|false",
+        "h323_module": "true|false",
+        "pptp_module": "true|false",
+        "sip_module": "true|false",
+        "tftp_module": "true|false",
+        "icmp_timeout": "",
+        "other_timeout": "",
+        "tcp_close_timeout": "",
+        "tcp_close_wait_timeout": "",
+        "tcp_established_timeout": "",
+        "tcp_fin_wait_timeout": "",
+        "tcp_last_ack_timeout": "",
+        "tcp_syn_recv_timeout": "",
+        "tcp_syn_sent_timeout": "",
+        "tcp_time_wait_timeout": "",
+        "udp_other_timeout": "",
+        "udp_stream_timeout": "",
+        "broadcast_ping": "true|false",
+        "receive_redirects": "true|false",
+        "send_redirects": "true|false",
+        "syn_cookies": "true|false",
+        "offload_accounting": "true|false",
+        "offload_l2_blocking": "true|false",
+        "offload_sch": "true|false",
+        "mdns_enabled": "true|false",
+        "echo_server": "[^\\\"\\' ]{1,255}",
+        "lldp_enable_all": "true|false",
+        "mss_clamp_mss": "[1-9][0-9]{2,3}",
+        "mss_clamp": "auto|custom|disabled",
+        "dhcpd_use_dnsmasq": "true|false",
+        "dhcpd_hostfile_update": "true|false",
+        "geo_ip_filtering_enabled": "true|false",
+        "geo_ip_filtering_block": "block|allow",
+        "geo_ip_filtering_countries": "^([A-Z]{2})?(,[A-Z]{2}){0,149}$",
+        "geo_ip_filtering_traffic_direction": "^(both|ingress|egress)$",
+        "arp_cache_timeout": "normal|min-dhcp-lease|custom",
+        "arp_cache_base_reachable": "^$|^[1-9]{1}[0-9]{0,4}$",
+        "dnsmasq_all_servers": "true|false"
+    },
+    "ntp": {
+        "ntp_server_1": "",
+        "ntp_server_2": "",
+        "ntp_server_3": "",
+        "ntp_server_4": ""
+    },
+    "ips": {
+        "enabled_categories": ["emerging-activex|emerging-attackresponse|botcc|emerging-chat|ciarmy|compromised|emerging-dns|emerging-dos|dshield|emerging-exploit|emerging-ftp|emerging-games|emerging-icmp|emerging-icmpinfo|emerging-imap|emerging-inappropriate|emerging-info|emerging-malware|emerging-misc|emerging-mobile|emerging-netbios|emerging-p2p|emerging-policy|emerging-pop3|emerging-rpc|emerging-scada|emerging-scan|emerging-shellcode|emerging-smtp|emerging-snmp|emerging-sql|emerging-telnet|emerging-tftp|tor|emerging-trojan|emerging-useragent|emerging-voip|emerging-webapps|emerging-webclient|emerging-webserver|emerging-worm"],
+        "endpoint_scanning": "true|false",
+        "ips_mode": "ids|ips|ipsInline|disabled",
+        "restrict_tor": "true|false",
+        "restrict_torrents": "true|false",
+        "restrict_ip_addresses": "true|false",
+        "suppression": {
+            "alerts": [{
+                "category": "",
+                "gid": "[\\d]+",
+                "id": "[\\d]+",
+                "signature": "",
+                "tracking": [{
+                    "direction": "both|src|dest",
+                    "mode": "ip|subnet|network",
+                    "value": ""
+                }],
+                "type": "all|track"
+            }],
+            "whitelist": [{
+                "direction": "both|src|dest",
+                "mode": "ip|subnet|network",
+                "value": ""
+            }]
+        },
+        "dns_filtering": "true|false",
+        "dns_filters": [{
+            "name": "",
+            "description": "",
+            "filter": "none|work|family",
+            "network_id": "",
+            "version": "v4|v6",
+            "allowed_sites": [
+                "^[a-zA-Z0-9.-]+$|^$"
+            ],
+            "blocked_sites": [
+                "^[a-zA-Z0-9.-]+$|^$"
+            ],
+            "blocked_tld": [
+                "^[a-zA-Z0-9.-]+$|^$"
+            ]
+        }],
+        "honeypot_enabled": "true|false",
+        "honeypot": [{
+            "network_id": "",
+            "ip_address": "",
+            "version": "v4|v6"
+        }]
+    },
+    "super_fwupdate": {
+        "controller_channel": "internal|alpha|beta|release-candidate|release",
+        "firmware_channel": "internal|alpha|beta|release-candidate|release",
+        "sso_enabled": "true|false"
+    },
+    "lcm": {
+        "enabled": "true|false",
+        "sync": "true|false",
+        "touch_event": "true|false",
+        "brightness": "[1-9]|[1-9][0-9]|100",
+        "idle_timeout": "[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-5][0-9][0-9]|3600"
+    }
+}
diff --git a/fields/6.0.23/SettingAutoSpeedtest.json b/fields/6.0.23/SettingAutoSpeedtest.json
new file mode 100644
index 0000000..92ab674
--- /dev/null
+++ b/fields/6.0.23/SettingAutoSpeedtest.json
@@ -0,0 +1,4 @@
+{
+  "enabled": "false|true",
+  "interval": "^(1[2-9]|[2-9][0-9]|[1-9][0-9]{2,3})$"
+}
diff --git a/fields/6.0.23/SettingBaresip.json b/fields/6.0.23/SettingBaresip.json
new file mode 100644
index 0000000..a0c696a
--- /dev/null
+++ b/fields/6.0.23/SettingBaresip.json
@@ -0,0 +1,6 @@
+{
+  "enabled": "true|false",
+  "server": "",
+  "outbound_proxy": "",
+  "package_url": ""
+}
diff --git a/fields/6.0.23/SettingBroadcast.json b/fields/6.0.23/SettingBroadcast.json
new file mode 100644
index 0000000..219dfc4
--- /dev/null
+++ b/fields/6.0.23/SettingBroadcast.json
@@ -0,0 +1,8 @@
+{
+  "sound_before_enabled": "true|false",
+  "sound_before_type": "sample|media",
+  "sound_before_resource": "",
+  "sound_after_enabled": "true|false",
+  "sound_after_type": "sample|media",
+  "sound_after_resource": ""
+}
diff --git a/fields/6.0.23/SettingConnectivity.json b/fields/6.0.23/SettingConnectivity.json
new file mode 100644
index 0000000..4ddf9b2
--- /dev/null
+++ b/fields/6.0.23/SettingConnectivity.json
@@ -0,0 +1,8 @@
+{
+  "enable_isolated_wlan": "true|false",
+  "enabled": "true|false",
+  "x_mesh_essid": "",
+  "x_mesh_psk": "",
+  "uplink_host": "",
+  "uplink_type": ""
+}
diff --git a/fields/6.0.23/SettingCountry.json b/fields/6.0.23/SettingCountry.json
new file mode 100644
index 0000000..81fa84d
--- /dev/null
+++ b/fields/6.0.23/SettingCountry.json
@@ -0,0 +1,3 @@
+{
+  "code": "[\\d]{1,3}"
+}
diff --git a/fields/6.0.23/SettingDpi.json b/fields/6.0.23/SettingDpi.json
new file mode 100644
index 0000000..809a4a4
--- /dev/null
+++ b/fields/6.0.23/SettingDpi.json
@@ -0,0 +1,4 @@
+{
+  "enabled": "false|true",
+  "fingerprintingEnabled": "false|true"
+}
diff --git a/fields/6.0.23/SettingElementAdopt.json b/fields/6.0.23/SettingElementAdopt.json
new file mode 100644
index 0000000..80ed166
--- /dev/null
+++ b/fields/6.0.23/SettingElementAdopt.json
@@ -0,0 +1,5 @@
+{
+  "enabled": "true|false",
+  "x_element_essid": "",
+  "x_element_psk": ""
+}
diff --git a/fields/6.0.23/SettingGuestAccess.json b/fields/6.0.23/SettingGuestAccess.json
new file mode 100644
index 0000000..5e24885
--- /dev/null
+++ b/fields/6.0.23/SettingGuestAccess.json
@@ -0,0 +1,95 @@
+{
+  "portal_enabled": "true|false",
+  "auth": "none|hotspot|facebook_wifi|custom",
+  "redirect_enabled": "true|false",
+  "redirect_url": "",
+  "redirect_https": "true|false",
+  "redirect_to_https": "true|false",
+  "portal_customized": "true|false",
+  "portal_use_hostname": "true|false",
+  "portal_hostname": "^[a-zA-Z0-9.-]+$|^$",
+  "expire": "[\\d]+|custom",
+  "expire_number": "^[1-9][0-9]{0,5}|1000000$",
+  "expire_unit": "1|60|1440",
+  "x_password": "",
+  "custom_ip": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+  "facebook_enabled": "true|false",
+  "facebook_app_id": "",
+  "x_facebook_app_secret": "",
+  "facebook_scope_email": "true|false",
+  "facebook_wifi_gw_id": "",
+  "facebook_wifi_gw_name": "",
+  "x_facebook_wifi_gw_secret": "",
+  "facebook_wifi_block_https": "true|false",
+  "google_enabled": "true|false",
+  "google_client_id": "",
+  "x_google_client_secret": "",
+  "google_domain": "",
+  "google_scope_email": "true|false",
+  "password_enabled": "true|false",
+  "voucher_enabled": "true|false",
+  "voucher_customized": "true|false",
+  "payment_enabled": "true|false",
+  "restricted_subnet_": "",
+  "allowed_subnet_": "",
+  "restricted_dns_enabled": "false|true",
+  "restricted_dns_servers": [
+    "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$"
+  ],
+  "gateway": "paypal|stripe|authorize|quickpay|merchantwarrior|ippay",
+  "paypal_use_sandbox": "true|false",
+  "x_paypal_username": "",
+  "x_paypal_password": "",
+  "x_paypal_signature": "",
+  "x_stripe_api_key": "",
+  "x_quickpay_agreementid": "",
+  "x_quickpay_apikey": "",
+  "x_quickpay_merchantid": "",
+  "quickpay_testmode": "true|false",
+  "x_authorize_loginid": "",
+  "x_authorize_transactionkey": "",
+  "x_merchantwarrior_merchantuuid": "",
+  "x_merchantwarrior_apikey": "",
+  "x_merchantwarrior_apipassphrase": "",
+  "x_ippay_terminalid": "",
+  "merchantwarrior_use_sandbox": "false|true",
+  "authorize_use_sandbox": "true|false",
+  "ippay_use_sandbox": "true|false",
+  "template_engine": "jsp|angular",
+  "portal_customized_bg_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+  "portal_customized_bg_image_enabled": "true|false",
+  "portal_customized_bg_image_filename": "",
+  "portal_customized_bg_image_tile": "true|false",
+  "portal_customized_box_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+  "portal_customized_box_opacity": "^[1-9][0-9]?$|^100$|^$",
+  "portal_customized_button_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+  "portal_customized_button_text_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+  "portal_customized_link_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+  "portal_customized_logo_enabled": "true|false",
+  "portal_customized_logo_filename": "",
+  "portal_customized_text_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+  "portal_customized_title": "",
+  "portal_customized_tos_enabled": "true|false",
+  "portal_customized_tos": "",
+  "portal_customized_unsplash_author_name": "",
+  "portal_customized_unsplash_author_username": "",
+  "portal_customized_welcome_text": "",
+  "portal_customized_welcome_text_enabled": "true|false",
+  "portal_customized_welcome_text_position": "under_logo|above_boxes",
+  "portal_customized_box_link_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+  "portal_customized_box_text_color": "^#[a-zA-Z0-9]{6}$|^#[a-zA-Z0-9]{3}$|^$",
+  "portal_customized_languages": [
+    "^[a-z]{2}(_[A-Z]{2})*$"
+  ],
+  "radius_enabled": "true|false",
+  "radius_auth_type": "chap|mschapv2",
+  "radius_disconnect_enabled": "true|false",
+  "radius_disconnect_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]",
+  "radiusprofile_id": "",
+  "wechat_enabled": "true|false",
+  "wechat_app_id": "",
+  "wechat_shop_id": "",
+  "x_wechat_app_secret": "",
+  "x_wechat_secret_key": "",
+  "ec_enabled": "true|false"
+}
diff --git a/fields/6.0.23/SettingIps.json b/fields/6.0.23/SettingIps.json
new file mode 100644
index 0000000..6a9621f
--- /dev/null
+++ b/fields/6.0.23/SettingIps.json
@@ -0,0 +1,62 @@
+{
+  "enabled_categories": [
+    "emerging-activex|emerging-attackresponse|botcc|emerging-chat|ciarmy|compromised|emerging-dns|emerging-dos|dshield|emerging-exploit|emerging-ftp|emerging-games|emerging-icmp|emerging-icmpinfo|emerging-imap|emerging-inappropriate|emerging-info|emerging-malware|emerging-misc|emerging-mobile|emerging-netbios|emerging-p2p|emerging-policy|emerging-pop3|emerging-rpc|emerging-scada|emerging-scan|emerging-shellcode|emerging-smtp|emerging-snmp|emerging-sql|emerging-telnet|emerging-tftp|tor|emerging-trojan|emerging-useragent|emerging-voip|emerging-webapps|emerging-webclient|emerging-webserver|emerging-worm"
+  ],
+  "endpoint_scanning": "true|false",
+  "ips_mode": "ids|ips|ipsInline|disabled",
+  "restrict_tor": "true|false",
+  "restrict_torrents": "true|false",
+  "restrict_ip_addresses": "true|false",
+  "suppression": {
+    "alerts": [
+      {
+        "category": "",
+        "gid": "[\\d]+",
+        "id": "[\\d]+",
+        "signature": "",
+        "tracking": [
+          {
+            "direction": "both|src|dest",
+            "mode": "ip|subnet|network",
+            "value": ""
+          }
+        ],
+        "type": "all|track"
+      }
+    ],
+    "whitelist": [
+      {
+        "direction": "both|src|dest",
+        "mode": "ip|subnet|network",
+        "value": ""
+      }
+    ]
+  },
+  "dns_filtering": "true|false",
+  "dns_filters": [
+    {
+      "name": "",
+      "description": "",
+      "filter": "none|work|family",
+      "network_id": "",
+      "version": "v4|v6",
+      "allowed_sites": [
+        "^[a-zA-Z0-9.-]+$|^$"
+      ],
+      "blocked_sites": [
+        "^[a-zA-Z0-9.-]+$|^$"
+      ],
+      "blocked_tld": [
+        "^[a-zA-Z0-9.-]+$|^$"
+      ]
+    }
+  ],
+  "honeypot_enabled": "true|false",
+  "honeypot": [
+    {
+      "network_id": "",
+      "ip_address": "",
+      "version": "v4|v6"
+    }
+  ]
+}
diff --git a/fields/6.0.23/SettingLcm.json b/fields/6.0.23/SettingLcm.json
new file mode 100644
index 0000000..9021cf3
--- /dev/null
+++ b/fields/6.0.23/SettingLcm.json
@@ -0,0 +1,7 @@
+{
+  "enabled": "true|false",
+  "sync": "true|false",
+  "touch_event": "true|false",
+  "brightness": "[1-9]|[1-9][0-9]|100",
+  "idle_timeout": "[1-9][0-9]|[1-9][0-9][0-9]|[1-2][0-9][0-9][0-9]|3[0-5][0-9][0-9]|3600"
+}
diff --git a/fields/6.0.23/SettingLocale.json b/fields/6.0.23/SettingLocale.json
new file mode 100644
index 0000000..408bb9c
--- /dev/null
+++ b/fields/6.0.23/SettingLocale.json
@@ -0,0 +1,3 @@
+{
+  "timezone": ""
+}
diff --git a/fields/6.0.23/SettingMgmt.json b/fields/6.0.23/SettingMgmt.json
new file mode 100644
index 0000000..087d320
--- /dev/null
+++ b/fields/6.0.23/SettingMgmt.json
@@ -0,0 +1,21 @@
+{
+  "alert_enabled": "true|false",
+  "auto_upgrade": "true|false",
+  "boot_sound": "true|false",
+  "led_enabled": "true|false",
+  "advanced_feature_enabled": "true|false",
+  "outdoor_mode_enabled": "true|false",
+  "unifi_idp_enabled": "true|false",
+  "wifiman_enabled": "true|false",
+  "x_mgmt_key": "[0-9a-f]{32}",
+  "x_ssh_keys": [
+    ""
+  ],
+  "x_ssh_username": "^[_A-Za-z0-9][-_.A-Za-z0-9]{0,29}$",
+  "x_ssh_password": ".{1,128}",
+  "x_ssh_md5passwd": "",
+  "x_ssh_sha512passwd": "",
+  "x_ssh_enabled": "true|false",
+  "x_ssh_bind_wildcard": "true|false",
+  "x_ssh_auth_password_enabled": "true|false"
+}
diff --git a/fields/6.0.23/SettingNetworkOptimization.json b/fields/6.0.23/SettingNetworkOptimization.json
new file mode 100644
index 0000000..4bf5bbc
--- /dev/null
+++ b/fields/6.0.23/SettingNetworkOptimization.json
@@ -0,0 +1,3 @@
+{
+  "enabled": "true|false"
+}
diff --git a/fields/6.0.23/SettingNtp.json b/fields/6.0.23/SettingNtp.json
new file mode 100644
index 0000000..45fcc15
--- /dev/null
+++ b/fields/6.0.23/SettingNtp.json
@@ -0,0 +1,6 @@
+{
+  "ntp_server_1": "",
+  "ntp_server_2": "",
+  "ntp_server_3": "",
+  "ntp_server_4": ""
+}
diff --git a/fields/6.0.23/SettingPorta.json b/fields/6.0.23/SettingPorta.json
new file mode 100644
index 0000000..0123c2e
--- /dev/null
+++ b/fields/6.0.23/SettingPorta.json
@@ -0,0 +1,3 @@
+{
+  "ugw3_wan2_enabled": "false|true"
+}
diff --git a/fields/6.0.23/SettingProviderCapabilities.json b/fields/6.0.23/SettingProviderCapabilities.json
new file mode 100644
index 0000000..8564c06
--- /dev/null
+++ b/fields/6.0.23/SettingProviderCapabilities.json
@@ -0,0 +1,5 @@
+{
+  "enabled": "false|true",
+  "download": "^[1-9][0-9]*$",
+  "upload": "^[1-9][0-9]*$"
+}
diff --git a/fields/6.0.23/SettingRadioAi.json b/fields/6.0.23/SettingRadioAi.json
new file mode 100644
index 0000000..66de90b
--- /dev/null
+++ b/fields/6.0.23/SettingRadioAi.json
@@ -0,0 +1,27 @@
+{
+  "enabled": "true|false",
+  "cron_expr": "",
+  "default": "true|false",
+  "radios": [
+    "na|ng"
+  ],
+  "optimize": [
+    "channel|power"
+  ],
+  "channels_ng": [
+    "1|2|3|4|5|6|7|8|9|10|11|12|13|14"
+  ],
+  "channels_na": [
+    "36|40|44|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165"
+  ],
+  "ht_modes_ng": [
+    "^(20|40)$"
+  ],
+  "ht_modes_na": [
+    "^(20|40|80|160)$"
+  ],
+  "exclude_devices": [
+    "([0-9a-z]{2}:){5}[0-9a-z]{2}"
+  ],
+  "useXY": "true|false"
+}
diff --git a/fields/6.0.23/SettingRadius.json b/fields/6.0.23/SettingRadius.json
new file mode 100644
index 0000000..83963b9
--- /dev/null
+++ b/fields/6.0.23/SettingRadius.json
@@ -0,0 +1,10 @@
+{
+  "enabled": "true|false",
+  "auth_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]",
+  "acct_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]",
+  "configure_whole_network": "true|false",
+  "tunneled_reply": "true|false",
+  "interim_update_interval": "^([6-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9][0-9]|86400)$",
+  "accounting_enabled": "true|false",
+  "x_secret": "[^\\\"\\' ]{1,48}"
+}
diff --git a/fields/6.0.23/SettingRsyslogd.json b/fields/6.0.23/SettingRsyslogd.json
new file mode 100644
index 0000000..442bd91
--- /dev/null
+++ b/fields/6.0.23/SettingRsyslogd.json
@@ -0,0 +1,11 @@
+{
+  "enabled": "true|false",
+  "ip": "",
+  "port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]",
+  "debug": "false|true",
+  "this_controller": "false|true",
+  "this_controller_encrypted_only": "false|true",
+  "netconsole_enabled": "true|false",
+  "netconsole_host": "",
+  "netconsole_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]"
+}
diff --git a/fields/6.0.23/SettingSnmp.json b/fields/6.0.23/SettingSnmp.json
new file mode 100644
index 0000000..b6cee6a
--- /dev/null
+++ b/fields/6.0.23/SettingSnmp.json
@@ -0,0 +1,7 @@
+{
+  "enabled": "true|false",
+  "enabledV3": "true|false",
+  "community": ".{1,256}",
+  "username": "[a-zA-Z0-9_-]{1,30}",
+  "x_password": "[^'\"]{8,32}"
+}
diff --git a/fields/6.0.23/SettingSuperCloudaccess.json b/fields/6.0.23/SettingSuperCloudaccess.json
new file mode 100644
index 0000000..9332c4f
--- /dev/null
+++ b/fields/6.0.23/SettingSuperCloudaccess.json
@@ -0,0 +1,9 @@
+{
+  "enabled": "true|false",
+  "x_certificate_arn": "",
+  "x_certificate_pem": "",
+  "device_id": "",
+  "device_auth": "",
+  "x_private_key": "",
+  "ubic_uuid": ""
+}
diff --git a/fields/6.0.23/SettingSuperEvents.json b/fields/6.0.23/SettingSuperEvents.json
new file mode 100644
index 0000000..418cc2f
--- /dev/null
+++ b/fields/6.0.23/SettingSuperEvents.json
@@ -0,0 +1,3 @@
+{
+  "_ignored": ""
+}
diff --git a/fields/6.0.23/SettingSuperFwupdate.json b/fields/6.0.23/SettingSuperFwupdate.json
new file mode 100644
index 0000000..a809ce5
--- /dev/null
+++ b/fields/6.0.23/SettingSuperFwupdate.json
@@ -0,0 +1,5 @@
+{
+  "controller_channel": "internal|alpha|beta|release-candidate|release",
+  "firmware_channel": "internal|alpha|beta|release-candidate|release",
+  "sso_enabled": "true|false"
+}
diff --git a/fields/6.0.23/SettingSuperIdentity.json b/fields/6.0.23/SettingSuperIdentity.json
new file mode 100644
index 0000000..92a9932
--- /dev/null
+++ b/fields/6.0.23/SettingSuperIdentity.json
@@ -0,0 +1,4 @@
+{
+  "name": "",
+  "hostname": ""
+}
diff --git a/fields/6.0.23/SettingSuperMail.json b/fields/6.0.23/SettingSuperMail.json
new file mode 100644
index 0000000..6ab219a
--- /dev/null
+++ b/fields/6.0.23/SettingSuperMail.json
@@ -0,0 +1,3 @@
+{
+  "provider": "smtp|cloud|disabled"
+}
diff --git a/fields/6.0.23/SettingSuperMgmt.json b/fields/6.0.23/SettingSuperMgmt.json
new file mode 100644
index 0000000..e4457a7
--- /dev/null
+++ b/fields/6.0.23/SettingSuperMgmt.json
@@ -0,0 +1,49 @@
+{
+  "override_inform_host": "true|false",
+  "auto_upgrade": "true|false",
+  "discoverable": "true|false",
+  "led_enabled": "true|false",
+  "live_chat": "disabled|super-only|everyone",
+  "live_updates": "disabled|live|auto",
+  "store_enabled": "disabled|super-only|everyone",
+  "x_ssh_username": "",
+  "x_ssh_password": "",
+  "autobackup_enabled": "true|false",
+  "autobackup_cron_expr": "",
+  "autobackup_days": "-?[\\d]+",
+  "autobackup_max_files": "[\\d]+",
+  "autobackup_timezone": "",
+  "autobackup_s3_access_key": "",
+  "autobackup_s3_access_secret": "",
+  "autobackup_s3_bucket": "",
+  "autobackup_gcs_certificate_path": "",
+  "autobackup_gcs_bucket": "",
+  "autobackup_local_path": "",
+  "autobackup_post_actions": [
+    "copy_local|copy_s3|copy_gcs|copy_cloud"
+  ],
+  "backup_to_cloud_enabled": "true|false",
+  "google_maps_api_key": "",
+  "minimum_usable_hd_space": "[\\d]+",
+  "minimum_usable_sd_space": "[\\d]+",
+  "image_maps_use_google_engine": "true|false",
+  "data_retention_time_enabled": "true|false",
+  "data_retention_time_in_hours_for_5minutes_scale": "-?[\\d]+",
+  "data_retention_time_in_hours_for_hourly_scale": "-?[\\d]+",
+  "data_retention_time_in_hours_for_daily_scale": "-?[\\d]+",
+  "data_retention_time_in_hours_for_monthly_scale": "-?[\\d]+",
+  "data_retention_time_in_hours_for_others": "-?[\\d]+",
+  "time_series_per_client_stats_enabled": "true|false",
+  "contact_info_full_name": "",
+  "contact_info_company_name": "",
+  "contact_info_phone_number": "",
+  "contact_info_shipping_address_1": "",
+  "contact_info_shipping_address_2": "",
+  "contact_info_city": "",
+  "contact_info_state": "",
+  "contact_info_zip": "",
+  "contact_info_country": "",
+  "default_site_device_auth_password_alert": "false",
+  "enable_analytics": "true|false",
+  "analytics_disapproved_for": ""
+}
diff --git a/fields/6.0.23/SettingSuperSdn.json b/fields/6.0.23/SettingSuperSdn.json
new file mode 100644
index 0000000..7dba94f
--- /dev/null
+++ b/fields/6.0.23/SettingSuperSdn.json
@@ -0,0 +1,14 @@
+{
+  "enabled": "true|false",
+  "migrated": "true|false",
+  "ubic_uuid": "",
+  "auth_token": "",
+  "device_id": "",
+  "oauth_enabled": "true|false",
+  "oauth_redirect_uris": [
+    ""
+  ],
+  "oauth_app_id": "",
+  "x_oauth_app_secret": "",
+  "sso_login_enabled": ""
+}
diff --git a/fields/6.0.23/SettingSuperSmtp.json b/fields/6.0.23/SettingSuperSmtp.json
new file mode 100644
index 0000000..3d2cad6
--- /dev/null
+++ b/fields/6.0.23/SettingSuperSmtp.json
@@ -0,0 +1,11 @@
+{
+  "enabled": "true|false",
+  "host": "",
+  "port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]|^$",
+  "sender": "",
+  "use_ssl": "true|false",
+  "use_sender": "true|false",
+  "use_auth": "true|false",
+  "username": "",
+  "x_password": ""
+}
diff --git a/fields/6.0.23/SettingUsg.json b/fields/6.0.23/SettingUsg.json
new file mode 100644
index 0000000..edd4972
--- /dev/null
+++ b/fields/6.0.23/SettingUsg.json
@@ -0,0 +1,57 @@
+{
+  "dhcp_relay_server_1": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+  "dhcp_relay_server_2": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+  "dhcp_relay_server_3": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+  "dhcp_relay_server_4": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+  "dhcp_relay_server_5": "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+  "dhcp_relay_hop_count": "([1-9]|[1-8][0-9]|9[0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|^$",
+  "dhcp_relay_max_size": "(6[4-9]|[7-9][0-9]|[1-8][0-9]{2}|9[0-8][0-9]|99[0-9]|1[0-3][0-9]{2}|1400)|^$",
+  "dhcp_relay_port": "[1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]|^$",
+  "dhcp_relay_agents_packets": "append|discard|forward|replace|^$",
+  "upnp_enabled": "true|false",
+  "upnp_wan_interface": "WAN|WAN2",
+  "upnp_nat_pmp_enabled": "true|false",
+  "upnp_secure_mode": "true|false",
+  "firewall_wan_default_log": "true|false",
+  "firewall_lan_default_log": "true|false",
+  "firewall_guest_default_log": "true|false",
+  "ftp_module": "true|false",
+  "gre_module": "true|false",
+  "h323_module": "true|false",
+  "pptp_module": "true|false",
+  "sip_module": "true|false",
+  "tftp_module": "true|false",
+  "icmp_timeout": "",
+  "other_timeout": "",
+  "tcp_close_timeout": "",
+  "tcp_close_wait_timeout": "",
+  "tcp_established_timeout": "",
+  "tcp_fin_wait_timeout": "",
+  "tcp_last_ack_timeout": "",
+  "tcp_syn_recv_timeout": "",
+  "tcp_syn_sent_timeout": "",
+  "tcp_time_wait_timeout": "",
+  "udp_other_timeout": "",
+  "udp_stream_timeout": "",
+  "broadcast_ping": "true|false",
+  "receive_redirects": "true|false",
+  "send_redirects": "true|false",
+  "syn_cookies": "true|false",
+  "offload_accounting": "true|false",
+  "offload_l2_blocking": "true|false",
+  "offload_sch": "true|false",
+  "mdns_enabled": "true|false",
+  "echo_server": "[^\\\"\\' ]{1,255}",
+  "lldp_enable_all": "true|false",
+  "mss_clamp_mss": "[1-9][0-9]{2,3}",
+  "mss_clamp": "auto|custom|disabled",
+  "dhcpd_use_dnsmasq": "true|false",
+  "dhcpd_hostfile_update": "true|false",
+  "geo_ip_filtering_enabled": "true|false",
+  "geo_ip_filtering_block": "block|allow",
+  "geo_ip_filtering_countries": "^([A-Z]{2})?(,[A-Z]{2}){0,149}$",
+  "geo_ip_filtering_traffic_direction": "^(both|ingress|egress)$",
+  "arp_cache_timeout": "normal|min-dhcp-lease|custom",
+  "arp_cache_base_reachable": "^$|^[1-9]{1}[0-9]{0,4}$",
+  "dnsmasq_all_servers": "true|false"
+}
diff --git a/fields/6.0.23/SettingUsw.json b/fields/6.0.23/SettingUsw.json
new file mode 100644
index 0000000..f1cd979
--- /dev/null
+++ b/fields/6.0.23/SettingUsw.json
@@ -0,0 +1,3 @@
+{
+  "dhcp_snoop": "true|false"
+}
diff --git a/fields/6.0.23/SpatialRecord.json b/fields/6.0.23/SpatialRecord.json
new file mode 100644
index 0000000..3597403
--- /dev/null
+++ b/fields/6.0.23/SpatialRecord.json
@@ -0,0 +1,11 @@
+{
+    "name": ".{1,128}",
+    "devices": [{
+        "mac": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$",
+        "position": {
+            "x": "(^([-]?[\\d]+)$)|(^([-]?[\\d]+[.]?[\\d]+)$)",
+            "y": "(^([-]?[\\d]+)$)|(^([-]?[\\d]+[.]?[\\d]+)$)",
+            "z": "(^([-]?[\\d]+)$)|(^([-]?[\\d]+[.]?[\\d]+)$)"
+        }
+    }]
+}
\ No newline at end of file
diff --git a/fields/6.0.23/Tag.json b/fields/6.0.23/Tag.json
new file mode 100644
index 0000000..677d265
--- /dev/null
+++ b/fields/6.0.23/Tag.json
@@ -0,0 +1,4 @@
+{
+    "name": "",
+    "member_table": [""]
+}
diff --git a/fields/6.0.23/User.json b/fields/6.0.23/User.json
new file mode 100644
index 0000000..4e23d0b
--- /dev/null
+++ b/fields/6.0.23/User.json
@@ -0,0 +1,12 @@
+{
+    "mac": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$",
+    "name": "",
+    "note": "",
+    "blocked": "",
+    "hostname": "",
+    "last_seen": "",
+    "usergroup_id": "",
+    "use_fixedip": "false|true",
+    "network_id": "",
+    "fixed_ip": ""
+}
diff --git a/fields/6.0.23/UserGroup.json b/fields/6.0.23/UserGroup.json
new file mode 100644
index 0000000..24dd313
--- /dev/null
+++ b/fields/6.0.23/UserGroup.json
@@ -0,0 +1,5 @@
+{
+    "name": ".{1,128}",
+    "qos_rate_max_up": "-1|[2-9]|[1-9][0-9]{1,4}|100000",
+    "qos_rate_max_down": "-1|[2-9]|[1-9][0-9]{1,4}|100000"
+}
diff --git a/fields/6.0.23/VirtualDevice.json b/fields/6.0.23/VirtualDevice.json
new file mode 100644
index 0000000..89c900f
--- /dev/null
+++ b/fields/6.0.23/VirtualDevice.json
@@ -0,0 +1,8 @@
+{
+    "type": "uap|usg|usw",
+    "map_id": "",
+    "x": "",
+    "y": "",
+    "heightInMeters": "^([-]?[\\d]+[.]?[\\d]*)$",
+    "locked": "true|false"
+}
diff --git a/fields/6.0.23/Wall.json b/fields/6.0.23/Wall.json
new file mode 100644
index 0000000..b14dfc1
--- /dev/null
+++ b/fields/6.0.23/Wall.json
@@ -0,0 +1,9 @@
+{
+    "map_id": "",
+    "a": ["^([-]?[\\d]+[.]?[\\d]*)$"],
+    "b": ["^([-]?[\\d]+[.]?[\\d]*)$"],
+    "id": "",
+    "heightInMeters": "^([-]?[\\d]+[.]?[\\d]*)$",
+    "thicknessInMeters": "^([-]?[\\d]+[.]?[\\d]*)$",
+    "type": ""
+}
diff --git a/fields/6.0.23/WlanConf.json b/fields/6.0.23/WlanConf.json
new file mode 100644
index 0000000..8d46127
--- /dev/null
+++ b/fields/6.0.23/WlanConf.json
@@ -0,0 +1,84 @@
+{
+    "name": ".{1,32}",
+    "name_combine_enabled": "true|false",
+    "name_combine_suffix": ".{0,8}",
+    "enabled": "true|false",
+    "iapp_enabled": "true|false",
+    "x_iapp_key": "[0-9A-Fa-f]{32}",
+    "security": "open|wpapsk|wep|wpaeap|osen",
+    "x_passphrase": "[\\x20-\\x7E]{8,63}|[0-9a-fA-F]{64}",
+    "x_wep": "",
+    "wep_idx": "[1-4]",
+    "radiusprofile_id": "",
+    "hide_ssid": "false|true",
+    "priority": "medium|high|low",
+    "vlan_enabled": "false|true",
+    "vlan": "[2-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-8][0-9]|409[0-5]|^$",
+    "is_guest": "false|true",
+    "usergroup_id": "",
+    "networkconf_id": "",
+    "roam_cluster_id": "[0-9]|[1-2][0-9]|[3][0-1]|^$",
+    "wpa_mode": "auto|wpa1|wpa2",
+    "wpa_enc": "auto|ccmp",
+    "p2p" : "true|false",
+    "p2p_cross_connect": "true|false",
+    "proxy_arp" : "true|false",
+    "l2_isolation" : "true|false",
+    "tdls_prohibit": "true|false",
+    "bss_transition": "true|false",
+    "auth_cache": "true|false",
+    "group_rekey": "^(0|[6-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9][0-9]|86400)$",
+    "uapsd_enabled": "false|true",
+    "dpi_enabled": "false|true",
+    "dpigroup_id": "[\\d\\w]+|^$",
+    "schedule_enabled": "false|true",
+    "schedule_reversed": "false|true",
+    "schedule": [
+        "(sun|mon|tue|wed|thu|fri|sat)(\\-(sun|mon|tue|wed|thu|fri|sat))?\\|([0-2][0-9][0-5][0-9])\\-([0-2][0-9][0-5][0-9])"
+    ],
+    "schedule_with_duration": [
+        {
+            "start_days_of_week": [
+                "^(sun|mon|tue|wed|thu|fri|sat)$"
+            ],
+            "start_hour": "^(1?[0-9])|(2[0-3])$",
+            "start_minute": "^[0-5]?[0-9]$",
+            "duration_minutes": "^[1-9][0-9]*$"
+        }
+    ],
+    "dtim_mode": "default|custom",
+    "dtim_ng": "^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "dtim_na": "^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$",
+    "minrate_ng_enabled": "true|false",
+    "minrate_ng_data_rate_kbps": "^[0-9]*$",
+    "minrate_ng_beacon_rate_kbps": "^[0-9]*$",
+    "minrate_ng_mgmt_rate_kbps": "^[0-9]*$",
+    "minrate_ng_advertising_rates": "true|false",
+    "minrate_ng_cck_rates_enabled": "true|false",
+    "minrate_na_enabled": "true|false",
+    "minrate_na_data_rate_kbps": "^[0-9]*$",
+    "minrate_na_beacon_rate_kbps": "^[0-9]*$",
+    "minrate_na_mgmt_rate_kbps": "^[0-9]*$",
+    "minrate_na_advertising_rates": "true|false",
+    "mac_filter_enabled": "true|false",
+    "mac_filter_policy": "allow|deny",
+    "mac_filter_list": ["^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$"],
+    "bc_filter_enabled": "true|false",
+    "bc_filter_list": ["^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$"],
+    "hotspot2conf_enabled": "true|false",
+    "hotspot2conf_id": "",
+    "fast_roaming_enabled": "true|false",
+    "rrm_enabled":"true|false",
+    "radius_das_enabled": "true|false",
+    "radius_mac_auth_enabled": "true|false",
+    "radius_macacl_format": "none_lower|hyphen_lower|colon_lower|none_upper|hyphen_upper|colon_upper",
+    "radius_macacl_empty_password": "true|false",
+    "mcastenhance_enabled": "true|false",
+    "no2ghz_oui": "true|false",
+    "pmf_mode": "disabled|optional|required",
+    "element_adopt": "true|false",
+    "country_beacon": "true|false",
+    "b_supported": "true|false",
+    "wlan_band": "2g|5g|both",
+    "ap_group_ids": [""]
+}
diff --git a/fields/6.0.23/WlanGroup.json b/fields/6.0.23/WlanGroup.json
new file mode 100644
index 0000000..329dce3
--- /dev/null
+++ b/fields/6.0.23/WlanGroup.json
@@ -0,0 +1,3 @@
+{
+    "name":".{1,128}"
+}
diff --git a/fields/api.go.tmpl b/fields/api.go.tmpl
index 1d6b545..58ff32d 100644
--- a/fields/api.go.tmpl
+++ b/fields/api.go.tmpl
@@ -46,7 +46,7 @@ func (c *Client) list{{ .StructName }}(ctx context.Context, site string) ([]{{ .
 		Data []{{ .StructName }} `json:"data"`
 	}
 
-	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/{{ if eq .StructName "Device" }}stat{{ else }}rest{{ end }}/{{ .ResourcePath }}", site), nil, &respBody)
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/{{ if eq .StructName "Device" }}stat/{{else if eq .StructName "APGroup" }}{{ else }}rest/{{ end }}{{ .ResourcePath }}", site), nil, &respBody)
 	if err != nil {
 		return nil, err
 	}
diff --git a/fields/settings.sh b/fields/cleanupjson.sh
old mode 100755
new mode 100644
similarity index 100%
rename from fields/settings.sh
rename to fields/cleanupjson.sh
diff --git a/fields/getjson.sh b/fields/getjson.sh
index eb2a107..c708e07 100644
--- a/fields/getjson.sh
+++ b/fields/getjson.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 deburl="https://dl.ui.com/unifi/$1/unifi_sysvinit_all.deb"
 wkdir="$(mktemp -d)"
@@ -16,7 +16,7 @@ mkdir -p "$1"
 
 cp ./ace/api/fields/*.json "./$1/"
 
-./settings.sh "$1"
+./cleanupjson.sh "$1"
 
 rm -rf ace ace.jar
 
diff --git a/fields/main.go b/fields/main.go
index f02d4be..3e8e32c 100644
--- a/fields/main.go
+++ b/fields/main.go
@@ -83,6 +83,7 @@ var fileReps = []replacement{
 	{"NetworkConf", "Network"},
 	{"PortConf", "PortProfile"},
 	{"RadiusProfile", "RADIUSProfile"},
+	{"ApGroups", "APGroup"},
 }
 
 var embedTypes bool
@@ -134,17 +135,17 @@ func NewResource(structName string, resourcePath string) *Resource {
 		" _Spacer": nil,
 	}
 
-	if resource.IsSetting() {
+	switch {
+	case resource.IsSetting():
 		resource.ResourcePath = strcase.ToSnake(strings.TrimPrefix(structName, "Setting"))
 		baseType.Fields[" Key"] = NewFieldInfo("Key", "key", "string", "", false, false)
-	}
-
-	if resource.StructName == "Device" {
+	case resource.StructName == "Device":
 		baseType.Fields[" MAC"] = NewFieldInfo("MAC", "mac", "string", "", true, false)
-	}
-
-	if resource.StructName == "User" {
+	case resource.StructName == "User":
 		baseType.Fields[" IP"] = NewFieldInfo("IP", "ip", "string", "non-generated field", true, false)
+	case resource.StructName == "WLAN":
+		// this field removed in v6, retaining for backwards compatibility
+		baseType.Fields["WLANGroupID"] = NewFieldInfo("WLANGroupID", "wlangroup_id", "string", "", false, false)
 	}
 
 	return resource
@@ -178,7 +179,7 @@ func main() {
 
 	flag.Usage = usage
 
-	noEmbeddedTypes := flag.Bool("no-embedded-types", false, "Whether to generate top-level type definitions for embedded type definitions")
+	noEmbeddedTypes := flag.Bool("no-embedded-types", true, "Whether to generate top-level type definitions for embedded type definitions")
 	flag.Parse()
 
 	versionDir := flag.Arg(0)
diff --git a/go.mod b/go.mod
index cda951c..c0b200d 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/paultyng/go-unifi
 
-go 1.12
+go 1.15
 
 require (
 	github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334
diff --git a/go.sum b/go.sum
index 3ffd19b..2a000af 100644
--- a/go.sum
+++ b/go.sum
@@ -13,6 +13,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/paultyng/jclass v1.3.0 h1:2M8056GAGwckEoeQnmymFXwHxmZx8ziCEugWKnTKCgw=
+github.com/paultyng/jclass v1.3.0/go.mod h1:QZPvzIixsJrr5qvRykv6svQsB7nzBQyMiGE4emqpU+0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
diff --git a/unifi/ap_group.go b/unifi/ap_group.go
new file mode 100644
index 0000000..66496a9
--- /dev/null
+++ b/unifi/ap_group.go
@@ -0,0 +1,95 @@
+package unifi
+
+import (
+	"context"
+	"fmt"
+)
+
+// just to fix compile issues with the import
+var (
+	_ fmt.Formatter
+	_ context.Context
+)
+
+// This is a v2 API object, so manually coded for now, need to figure out generation...
+
+type APGroup struct {
+	ID string `json:"_id,omitempty"`
+
+	Hidden   bool   `json:"attr_hidden,omitempty"`
+	HiddenID string `json:"attr_hidden_id,omitempty"`
+	NoDelete bool   `json:"attr_no_delete,omitempty"`
+	NoEdit   bool   `json:"attr_no_edit,omitempty"`
+
+	Name       string   `json:"name"`
+	DeviceMACs []string `json:"device_macs"`
+}
+
+func (c *Client) ListAPGroup(ctx context.Context, site string) ([]APGroup, error) {
+	var respBody []APGroup
+
+	err := c.do(ctx, "GET", fmt.Sprintf("/v2/api/site/%s/apgroups", site), nil, &respBody)
+	if err != nil {
+		return nil, err
+	}
+
+	return respBody, nil
+}
+
+// func (c *Client) getWLANGroup(ctx context.Context, site, id string) (*WLANGroup, error) {
+// 	var respBody struct {
+// 		Meta meta        `json:"meta"`
+// 		Data []WLANGroup `json:"data"`
+// 	}
+
+// 	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/rest/wlangroup/%s", site, id), nil, &respBody)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	if len(respBody.Data) != 1 {
+// 		return nil, &NotFoundError{}
+// 	}
+
+// 	d := respBody.Data[0]
+// 	return &d, nil
+// }
+
+// func (c *Client) deleteWLANGroup(ctx context.Context, site, id string) error {
+// 	err := c.do(ctx, "DELETE", fmt.Sprintf("s/%s/rest/wlangroup/%s", site, id), struct{}{}, nil)
+// 	if err != nil {
+// 		return err
+// 	}
+// 	return nil
+// }
+
+func (c *Client) CreateAPGroup(ctx context.Context, site string, d *APGroup) (*APGroup, error) {
+	var respBody APGroup
+
+	err := c.do(ctx, "POST", fmt.Sprintf("/v2/api/site/%s/apgroups", site), d, &respBody)
+	if err != nil {
+		return nil, err
+	}
+
+	return &respBody, nil
+}
+
+// func (c *Client) updateWLANGroup(ctx context.Context, site string, d *WLANGroup) (*WLANGroup, error) {
+// 	var respBody struct {
+// 		Meta meta        `json:"meta"`
+// 		Data []WLANGroup `json:"data"`
+// 	}
+
+// 	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/rest/wlangroup/%s", site, d.ID), d, &respBody)
+// 	if err != nil {
+// 		return nil, err
+// 	}
+
+// 	if len(respBody.Data) != 1 {
+// 		return nil, &NotFoundError{}
+// 	}
+
+// 	new := respBody.Data[0]
+
+// 	return &new, nil
+// }
diff --git a/unifi/device.generated.go b/unifi/device.generated.go
index cb6ff30..051cbed 100644
--- a/unifi/device.generated.go
+++ b/unifi/device.generated.go
@@ -147,7 +147,9 @@ type DeviceRadioTable struct {
 	BackupChannel         int    `json:"backup_channel,omitempty"` // [0-9]|[1][0-4]|16|34|36|38|40|42|44|46|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165|183|184|185|187|188|189|192|196|auto
 	Channel               int    `json:"channel,omitempty"`        // [0-9]|[1][0-4]|4.5|16|34|36|38|40|42|44|46|48|52|56|60|64|100|104|108|112|116|120|124|128|132|136|140|144|149|153|157|161|165|183|184|185|187|188|189|192|196|auto
 	HardNoiseFloorEnabled bool   `json:"hard_noise_floor_enabled,omitempty"`
-	Ht                    string `json:"ht,omitempty"`       // 20|40|80|160|1080|2160
+	Ht                    string `json:"ht,omitempty"` // 20|40|80|160|1080|2160
+	LoadbalanceEnabled    bool   `json:"loadbalance_enabled,omitempty"`
+	Maxsta                int    `json:"maxsta,omitempty"`   // [1-9]|[1-9][0-9]|1[0-9]{2}|200|^$
 	MinRssi               int    `json:"min_rssi,omitempty"` // ^-([1-9]|[1-8][0-9]|9[0-4])$
 	MinRssiEnabled        bool   `json:"min_rssi_enabled,omitempty"`
 	Name                  string `json:"name,omitempty"`
@@ -157,7 +159,6 @@ type DeviceRadioTable struct {
 	TxPower               int    `json:"tx_power,omitempty"`      // [\d]+|auto
 	TxPowerMode           string `json:"tx_power_mode,omitempty"` // auto|medium|high|low|custom
 	VwireEnabled          bool   `json:"vwire_enabled,omitempty"`
-	WLANGroupID           string `json:"wlangroup_id,omitempty"` // [\d\w]+
 }
 
 type DeviceRpsOverride struct {
diff --git a/unifi/hotspot_package.generated.go b/unifi/hotspot_package.generated.go
index d5cdd35..5f5af6f 100644
--- a/unifi/hotspot_package.generated.go
+++ b/unifi/hotspot_package.generated.go
@@ -38,7 +38,6 @@ type HotspotPackage struct {
 	PaymentFieldsAddressRequired   bool    `json:"payment_fields_address_required"`
 	PaymentFieldsCityEnabled       bool    `json:"payment_fields_city_enabled"`
 	PaymentFieldsCityRequired      bool    `json:"payment_fields_city_required"`
-	PaymentFieldsCountryDefault    string  `json:"payment_fields_country_default,omitempty"`
 	PaymentFieldsCountryEnabled    bool    `json:"payment_fields_country_enabled"`
 	PaymentFieldsCountryRequired   bool    `json:"payment_fields_country_required"`
 	PaymentFieldsEmailEnabled      bool    `json:"payment_fields_email_enabled"`
@@ -51,6 +50,7 @@ type HotspotPackage struct {
 	PaymentFieldsStateRequired     bool    `json:"payment_fields_state_required"`
 	PaymentFieldsZipEnabled        bool    `json:"payment_fields_zip_enabled"`
 	PaymentFieldsZipRequired       bool    `json:"payment_fields_zip_required"`
+	TrialDurationMinutes           int     `json:"trial_duration_minutes,omitempty"`
 	TrialReset                     float64 `json:"trial_reset,omitempty"`
 }
 
diff --git a/unifi/network.generated.go b/unifi/network.generated.go
index 4a60092..f153706 100644
--- a/unifi/network.generated.go
+++ b/unifi/network.generated.go
@@ -23,145 +23,152 @@ type Network struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
-	DHCPDBootEnabled        bool                    `json:"dhcpd_boot_enabled"`
-	DHCPDBootFilename       string                  `json:"dhcpd_boot_filename,omitempty"` // .{1,256}
-	DHCPDBootServer         string                  `json:"dhcpd_boot_server"`             // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$|(?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)|[a-zA-Z0-9-]{1,63}|^$
-	DHCPDDNS1               string                  `json:"dhcpd_dns_1"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDDNS2               string                  `json:"dhcpd_dns_2"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDDNS3               string                  `json:"dhcpd_dns_3"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDDNS4               string                  `json:"dhcpd_dns_4"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDDNSEnabled         bool                    `json:"dhcpd_dns_enabled"`
-	DHCPDEnabled            bool                    `json:"dhcpd_enabled"`
-	DHCPDGateway            string                  `json:"dhcpd_gateway"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDGatewayEnabled     bool                    `json:"dhcpd_gateway_enabled"`
-	DHCPDIP1                string                  `json:"dhcpd_ip_1"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDIP2                string                  `json:"dhcpd_ip_2"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDIP3                string                  `json:"dhcpd_ip_3"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDLeaseTime          int                     `json:"dhcpd_leasetime,omitempty"`
-	DHCPDMAC1               string                  `json:"dhcpd_mac_1"` // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
-	DHCPDMAC2               string                  `json:"dhcpd_mac_2"` // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
-	DHCPDMAC3               string                  `json:"dhcpd_mac_3"` // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
-	DHCPDNtp1               string                  `json:"dhcpd_ntp_1"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDNtp2               string                  `json:"dhcpd_ntp_2"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDNtpEnabled         bool                    `json:"dhcpd_ntp_enabled"`
-	DHCPDStart              string                  `json:"dhcpd_start"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDStop               string                  `json:"dhcpd_stop"`  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDTFTPServer         string                  `json:"dhcpd_tftp_server,omitempty"`
-	DHCPDTimeOffset         int                     `json:"dhcpd_time_offset,omitempty"` // ^0$|^-?([1-9]([0-9]{1,3})?|[1-7][0-9]{4}|[8][0-5][0-9]{3}|86[0-3][0-9]{2}|86400)$
-	DHCPDTimeOffsetEnabled  bool                    `json:"dhcpd_time_offset_enabled"`
-	DHCPDUnifiController    string                  `json:"dhcpd_unifi_controller"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDV6DNS1             string                  `json:"dhcpdv6_dns_1,omitempty"`
-	DHCPDV6DNS2             string                  `json:"dhcpdv6_dns_2,omitempty"`
-	DHCPDV6DNS3             string                  `json:"dhcpdv6_dns_3,omitempty"`
-	DHCPDV6DNS4             string                  `json:"dhcpdv6_dns_4,omitempty"`
-	DHCPDV6DNSAuto          bool                    `json:"dhcpdv6_dns_auto"`
-	DHCPDV6Enabled          bool                    `json:"dhcpdv6_enabled"`
-	DHCPDV6LeaseTime        int                     `json:"dhcpdv6_leasetime,omitempty"`
-	DHCPDV6Start            string                  `json:"dhcpdv6_start,omitempty"`
-	DHCPDV6Stop             string                  `json:"dhcpdv6_stop,omitempty"`
-	DHCPDWPAdUrl            string                  `json:"dhcpd_wpad_url,omitempty"`
-	DHCPDWins1              string                  `json:"dhcpd_wins_1"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDWins2              string                  `json:"dhcpd_wins_2"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DHCPDWinsEnabled        bool                    `json:"dhcpd_wins_enabled"`
-	DHCPRelayEnabled        bool                    `json:"dhcp_relay_enabled"`
-	DHCPguardEnabled        bool                    `json:"dhcpguard_enabled"`
-	DPIEnabled              bool                    `json:"dpi_enabled"`
-	DPIgroupID              string                  `json:"dpigroup_id"` // [\d\w]+|^$
-	DomainName              string                  `json:"domain_name"` // (?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)|^$|[a-zA-Z0-9-]{1,63}
-	Enabled                 bool                    `json:"enabled"`
-	ExposedToSiteVPN        bool                    `json:"exposed_to_site_vpn"`
-	GatewayDevice           string                  `json:"gateway_device"`         // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
-	GatewayType             string                  `json:"gateway_type,omitempty"` // default|switch
-	IGMPFastleave           bool                    `json:"igmp_fastleave"`
-	IGMPGroupmembership     int                     `json:"igmp_groupmembership,omitempty"` // [2-9]|[1-9][0-9]{1,2}|[1-2][0-9]{3}|3[0-5][0-9]{2}|3600|^$
-	IGMPMaxresponse         int                     `json:"igmp_maxresponse,omitempty"`     // [1-9]|1[0-9]|2[0-5]|^$
-	IGMPMcrtrexpiretime     int                     `json:"igmp_mcrtrexpiretime,omitempty"` // [0-9]|[1-9][0-9]{1,2}|[1-2][0-9]{3}|3[0-5][0-9]{2}|3600|^$
-	IGMPQuerier             string                  `json:"igmp_querier"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	IGMPSnooping            bool                    `json:"igmp_snooping"`
-	IGMPSupression          bool                    `json:"igmp_supression"`
-	IPSecDhGroup            int                     `json:"ipsec_dh_group,omitempty"` // 2|5|14|15|16|19|20|21|25|26
-	IPSecDynamicRouting     bool                    `json:"ipsec_dynamic_routing"`
-	IPSecEncryption         string                  `json:"ipsec_encryption,omitempty"`   // aes128|aes192|aes256|3des
-	IPSecEspDhGroup         int                     `json:"ipsec_esp_dh_group,omitempty"` // 1|2|5|14|15|16|17|18
-	IPSecHash               string                  `json:"ipsec_hash,omitempty"`         // sha1|md5|sha256|sha384|sha512
-	IPSecIkeDhGroup         int                     `json:"ipsec_ike_dh_group,omitempty"` // 1|2|5|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32
-	IPSecInterface          string                  `json:"ipsec_interface,omitempty"`    // wan|wan2
-	IPSecKeyExchange        string                  `json:"ipsec_key_exchange,omitempty"` // ikev1|ikev2
-	IPSecLocalIP            string                  `json:"ipsec_local_ip,omitempty"`     // ^any$|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
-	IPSecPeerIP             string                  `json:"ipsec_peer_ip,omitempty"`      // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
-	IPSecPfs                bool                    `json:"ipsec_pfs"`
-	IPSecProfile            string                  `json:"ipsec_profile,omitempty"`       // customized|azure_dynamic|azure_static
-	IPSubnet                string                  `json:"ip_subnet,omitempty"`           // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([1-9]|[1-2][0-9]|30)$
-	IPV6InterfaceType       string                  `json:"ipv6_interface_type,omitempty"` // static|pd|none
-	IPV6PDInterface         string                  `json:"ipv6_pd_interface,omitempty"`   // wan|wan2
-	IPV6PDPrefixid          string                  `json:"ipv6_pd_prefixid"`              // ^$|[a-fA-F0-9]{1,4}
-	IPV6PDStart             string                  `json:"ipv6_pd_start,omitempty"`
-	IPV6PDStop              string                  `json:"ipv6_pd_stop,omitempty"`
-	IPV6RaEnabled           bool                    `json:"ipv6_ra_enabled"`
-	IPV6RaPreferredLifetime int                     `json:"ipv6_ra_preferred_lifetime,omitempty"` // ^([0-9]|[1-8][0-9]|9[0-9]|[1-8][0-9]{2}|9[0-8][0-9]|99[0-9]|[1-8][0-9]{3}|9[0-8][0-9]{2}|99[0-8][0-9]|999[0-9]|[1-8][0-9]{4}|9[0-8][0-9]{3}|99[0-8][0-9]{2}|999[0-8][0-9]|9999[0-9]|[1-8][0-9]{5}|9[0-8][0-9]{4}|99[0-8][0-9]{3}|999[0-8][0-9]{2}|9999[0-8][0-9]|99999[0-9]|[1-8][0-9]{6}|9[0-8][0-9]{5}|99[0-8][0-9]{4}|999[0-8][0-9]{3}|9999[0-8][0-9]{2}|99999[0-8][0-9]|999999[0-9]|[12][0-9]{7}|30[0-9]{6}|31[0-4][0-9]{5}|315[0-2][0-9]{4}|3153[0-5][0-9]{3}|31536000)$|^$
-	IPV6RaPriority          string                  `json:"ipv6_ra_priority,omitempty"`           // high|medium|low
-	IPV6RaValidLifetime     int                     `json:"ipv6_ra_valid_lifetime,omitempty"`     // ^([0-9]|[1-8][0-9]|9[0-9]|[1-8][0-9]{2}|9[0-8][0-9]|99[0-9]|[1-8][0-9]{3}|9[0-8][0-9]{2}|99[0-8][0-9]|999[0-9]|[1-8][0-9]{4}|9[0-8][0-9]{3}|99[0-8][0-9]{2}|999[0-8][0-9]|9999[0-9]|[1-8][0-9]{5}|9[0-8][0-9]{4}|99[0-8][0-9]{3}|999[0-8][0-9]{2}|9999[0-8][0-9]|99999[0-9]|[1-8][0-9]{6}|9[0-8][0-9]{5}|99[0-8][0-9]{4}|999[0-8][0-9]{3}|9999[0-8][0-9]{2}|99999[0-8][0-9]|999999[0-9]|[12][0-9]{7}|30[0-9]{6}|31[0-4][0-9]{5}|315[0-2][0-9]{4}|3153[0-5][0-9]{3}|31536000)$|^$
-	IPV6Subnet              string                  `json:"ipv6_subnet,omitempty"`
-	IsNAT                   bool                    `json:"is_nat"`
-	L2TpInterface           string                  `json:"l2tp_interface,omitempty"` // wan|wan2
-	LteLanEnabled           bool                    `json:"lte_lan_enabled"`
-	NATOutboundIP           string                  `json:"nat_outbound_ip,omitempty"`
-	Name                    string                  `json:"name,omitempty"`                   // .{1,128}
-	NetworkGroup            string                  `json:"networkgroup,omitempty"`           // LAN[2-8]?
-	OpenVPNLocalAddress     string                  `json:"openvpn_local_address,omitempty"`  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
-	OpenVPNLocalPort        int                     `json:"openvpn_local_port,omitempty"`     // ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$
-	OpenVPNMode             string                  `json:"openvpn_mode,omitempty"`           // site-to-site|client|server
-	OpenVPNRemoteAddress    string                  `json:"openvpn_remote_address,omitempty"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
-	OpenVPNRemoteHost       string                  `json:"openvpn_remote_host,omitempty"`    // [^\"\' ]+|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
-	OpenVPNRemotePort       int                     `json:"openvpn_remote_port,omitempty"`    // ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$
-	PptpcRequireMppe        bool                    `json:"pptpc_require_mppe"`
-	PptpcRouteDistance      int                     `json:"pptpc_route_distance,omitempty"` // ^[1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]$|^$
-	PptpcServerIP           string                  `json:"pptpc_server_ip,omitempty"`      // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|(?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)|^[a-zA-Z0-9-]{1,63}$
-	PptpcUsername           string                  `json:"pptpc_username,omitempty"`       // [^\"\' ]+
-	Priority                int                     `json:"priority,omitempty"`             // [1-4]
-	Purpose                 string                  `json:"purpose,omitempty"`              // corporate|guest|remote-user-vpn|site-vpn|vlan-only|vpn-client|wan
-	RADIUSProfileID         string                  `json:"radiusprofile_id"`
-	RemoteSiteID            string                  `json:"remote_site_id"`
-	RemoteSiteSubnets       []string                `json:"remote_site_subnets,omitempty"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([1-9]|[1-2][0-9]|30)$|^$
-	RemoteVPNSubnets        []string                `json:"remote_vpn_subnets,omitempty"`  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([1-9]|[1-2][0-9]|30)$|^$
-	ReportWANEvent          bool                    `json:"report_wan_event"`
-	RequireMschapv2         bool                    `json:"require_mschapv2"`
-	RouteDistance           int                     `json:"route_distance,omitempty"` // ^[1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]$|^$
-	UpnpLanEnabled          bool                    `json:"upnp_lan_enabled"`
-	UserGroupID             string                  `json:"usergroup_id"`
-	VLAN                    int                     `json:"vlan,omitempty"` // [2-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|400[0-9]|^$
-	VLANEnabled             bool                    `json:"vlan_enabled"`
-	VPNClientDefaultRoute   bool                    `json:"vpn_client_default_route"`
-	VPNClientPullDNS        bool                    `json:"vpn_client_pull_dns"`
-	VPNType                 string                  `json:"vpn_type,omitempty"` // auto|ipsec-vpn|openvpn-vpn|pptp-client|l2tp-server|pptp-server|uid-server
-	WANDHCPOptions          []NetworkWANDHCPOptions `json:"wan_dhcp_options,omitempty"`
-	WANDHCPv6PDSize         int                     `json:"wan_dhcpv6_pd_size,omitempty"`      // ^(4[89]|5[0-9]|6[0-4])$|^$
-	WANDNS1                 string                  `json:"wan_dns1"`                          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	WANDNS2                 string                  `json:"wan_dns2"`                          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	WANDNS3                 string                  `json:"wan_dns3"`                          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	WANDNS4                 string                  `json:"wan_dns4"`                          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	WANEgressQOS            int                     `json:"wan_egress_qos,omitempty"`          // [1-7]|^$
-	WANGateway              string                  `json:"wan_gateway"`                       // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	WANGatewayV6            string                  `json:"wan_gateway_v6"`                    // ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$|^$
-	WANIP                   string                  `json:"wan_ip,omitempty"`                  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
-	WANIPV6                 string                  `json:"wan_ipv6"`                          // ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$|^$
-	WANLoadBalanceType      string                  `json:"wan_load_balance_type,omitempty"`   // failover-only|weighted
-	WANLoadBalanceWeight    int                     `json:"wan_load_balance_weight,omitempty"` // [1-9]|[1-9][0-9]
-	WANNetmask              string                  `json:"wan_netmask,omitempty"`             // ^((128|192|224|240|248|252|254)\.0\.0\.0)|(255\.(((0|128|192|224|240|248|252|254)\.0\.0)|(255\.(((0|128|192|224|240|248|252|254)\.0)|255\.(0|128|192|224|240|248|252|254)))))$
-	WANNetworkGroup         string                  `json:"wan_networkgroup,omitempty"`        // WAN[2]?|WAN_LTE_FAILOVER
-	WANPrefixlen            int                     `json:"wan_prefixlen,omitempty"`           // ^([1-9]|[1-8][0-9]|9[0-9]|1[01][0-9]|12[0-8])$|^$
-	WANSmartqDownRate       int                     `json:"wan_smartq_down_rate,omitempty"`    // [0-9]{1,6}|1000000
-	WANSmartqEnabled        bool                    `json:"wan_smartq_enabled"`
-	WANSmartqUpRate         int                     `json:"wan_smartq_up_rate,omitempty"` // [0-9]{1,6}|1000000
-	WANType                 string                  `json:"wan_type,omitempty"`           // disabled|dhcp|static|pppoe
-	WANTypeV6               string                  `json:"wan_type_v6,omitempty"`        // disabled|dhcpv6|static
-	WANUsername             string                  `json:"wan_username,omitempty"`       // [^"' ]+
-	WANVLAN                 int                     `json:"wan_vlan,omitempty"`           // [0-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-8][0-9]|409[0-4]|^$
-	WANVLANEnabled          bool                    `json:"wan_vlan_enabled"`
-	XIPSecPreSharedKey      string                  `json:"x_ipsec_pre_shared_key,omitempty"`      // [^\"\' ]+
-	XOpenVPNSharedSecretKey string                  `json:"x_openvpn_shared_secret_key,omitempty"` // [0-9A-Fa-f]{512}
-	XPptpcPassword          string                  `json:"x_pptpc_password,omitempty"`            // [^\"\' ]+
-	XWANPassword            string                  `json:"x_wan_password,omitempty"`              // [^"' ]+
+	AutoScaleEnabled        bool                            `json:"auto_scale_enabled"`
+	DHCPDBootEnabled        bool                            `json:"dhcpd_boot_enabled"`
+	DHCPDBootFilename       string                          `json:"dhcpd_boot_filename,omitempty"` // .{1,256}
+	DHCPDBootServer         string                          `json:"dhcpd_boot_server"`             // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$|(?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)|[a-zA-Z0-9-]{1,63}|^$
+	DHCPDDNS1               string                          `json:"dhcpd_dns_1"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDDNS2               string                          `json:"dhcpd_dns_2"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDDNS3               string                          `json:"dhcpd_dns_3"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDDNS4               string                          `json:"dhcpd_dns_4"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDDNSEnabled         bool                            `json:"dhcpd_dns_enabled"`
+	DHCPDEnabled            bool                            `json:"dhcpd_enabled"`
+	DHCPDGateway            string                          `json:"dhcpd_gateway"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDGatewayEnabled     bool                            `json:"dhcpd_gateway_enabled"`
+	DHCPDIP1                string                          `json:"dhcpd_ip_1"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDIP2                string                          `json:"dhcpd_ip_2"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDIP3                string                          `json:"dhcpd_ip_3"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDLeaseTime          int                             `json:"dhcpd_leasetime,omitempty"`
+	DHCPDMAC1               string                          `json:"dhcpd_mac_1"` // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
+	DHCPDMAC2               string                          `json:"dhcpd_mac_2"` // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
+	DHCPDMAC3               string                          `json:"dhcpd_mac_3"` // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
+	DHCPDNtp1               string                          `json:"dhcpd_ntp_1"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDNtp2               string                          `json:"dhcpd_ntp_2"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDNtpEnabled         bool                            `json:"dhcpd_ntp_enabled"`
+	DHCPDStart              string                          `json:"dhcpd_start"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDStop               string                          `json:"dhcpd_stop"`  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDTFTPServer         string                          `json:"dhcpd_tftp_server,omitempty"`
+	DHCPDTimeOffset         int                             `json:"dhcpd_time_offset,omitempty"` // ^0$|^-?([1-9]([0-9]{1,3})?|[1-7][0-9]{4}|[8][0-5][0-9]{3}|86[0-3][0-9]{2}|86400)$
+	DHCPDTimeOffsetEnabled  bool                            `json:"dhcpd_time_offset_enabled"`
+	DHCPDUnifiController    string                          `json:"dhcpd_unifi_controller"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDV6DNS1             string                          `json:"dhcpdv6_dns_1,omitempty"`
+	DHCPDV6DNS2             string                          `json:"dhcpdv6_dns_2,omitempty"`
+	DHCPDV6DNS3             string                          `json:"dhcpdv6_dns_3,omitempty"`
+	DHCPDV6DNS4             string                          `json:"dhcpdv6_dns_4,omitempty"`
+	DHCPDV6DNSAuto          bool                            `json:"dhcpdv6_dns_auto"`
+	DHCPDV6Enabled          bool                            `json:"dhcpdv6_enabled"`
+	DHCPDV6LeaseTime        int                             `json:"dhcpdv6_leasetime,omitempty"`
+	DHCPDV6Start            string                          `json:"dhcpdv6_start,omitempty"`
+	DHCPDV6Stop             string                          `json:"dhcpdv6_stop,omitempty"`
+	DHCPDWPAdUrl            string                          `json:"dhcpd_wpad_url,omitempty"`
+	DHCPDWins1              string                          `json:"dhcpd_wins_1"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDWins2              string                          `json:"dhcpd_wins_2"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DHCPDWinsEnabled        bool                            `json:"dhcpd_wins_enabled"`
+	DHCPRelayEnabled        bool                            `json:"dhcp_relay_enabled"`
+	DHCPguardEnabled        bool                            `json:"dhcpguard_enabled"`
+	DPIEnabled              bool                            `json:"dpi_enabled"`
+	DPIgroupID              string                          `json:"dpigroup_id"` // [\d\w]+|^$
+	DomainName              string                          `json:"domain_name"` // (?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)|^$|[a-zA-Z0-9-]{1,63}
+	Enabled                 bool                            `json:"enabled"`
+	ExposedToSiteVPN        bool                            `json:"exposed_to_site_vpn"`
+	GatewayDevice           string                          `json:"gateway_device"`         // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
+	GatewayType             string                          `json:"gateway_type,omitempty"` // default|switch
+	IGMPFastleave           bool                            `json:"igmp_fastleave"`
+	IGMPGroupmembership     int                             `json:"igmp_groupmembership,omitempty"` // [2-9]|[1-9][0-9]{1,2}|[1-2][0-9]{3}|3[0-5][0-9]{2}|3600|^$
+	IGMPMaxresponse         int                             `json:"igmp_maxresponse,omitempty"`     // [1-9]|1[0-9]|2[0-5]|^$
+	IGMPMcrtrexpiretime     int                             `json:"igmp_mcrtrexpiretime,omitempty"` // [0-9]|[1-9][0-9]{1,2}|[1-2][0-9]{3}|3[0-5][0-9]{2}|3600|^$
+	IGMPQuerier             string                          `json:"igmp_querier"`                   // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	IGMPSnooping            bool                            `json:"igmp_snooping"`
+	IGMPSupression          bool                            `json:"igmp_supression"`
+	IPSecDhGroup            int                             `json:"ipsec_dh_group,omitempty"` // 2|5|14|15|16|19|20|21|25|26
+	IPSecDynamicRouting     bool                            `json:"ipsec_dynamic_routing"`
+	IPSecEncryption         string                          `json:"ipsec_encryption,omitempty"`   // aes128|aes192|aes256|3des
+	IPSecEspDhGroup         int                             `json:"ipsec_esp_dh_group,omitempty"` // 1|2|5|14|15|16|17|18
+	IPSecHash               string                          `json:"ipsec_hash,omitempty"`         // sha1|md5|sha256|sha384|sha512
+	IPSecIkeDhGroup         int                             `json:"ipsec_ike_dh_group,omitempty"` // 1|2|5|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32
+	IPSecInterface          string                          `json:"ipsec_interface,omitempty"`    // wan|wan2
+	IPSecKeyExchange        string                          `json:"ipsec_key_exchange,omitempty"` // ikev1|ikev2
+	IPSecLocalIP            string                          `json:"ipsec_local_ip,omitempty"`     // ^any$|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
+	IPSecPeerIP             string                          `json:"ipsec_peer_ip,omitempty"`      // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
+	IPSecPfs                bool                            `json:"ipsec_pfs"`
+	IPSecProfile            string                          `json:"ipsec_profile,omitempty"`       // customized|azure_dynamic|azure_static
+	IPSubnet                string                          `json:"ip_subnet,omitempty"`           // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([1-9]|[1-2][0-9]|30)$
+	IPV6InterfaceType       string                          `json:"ipv6_interface_type,omitempty"` // static|pd|none
+	IPV6PDInterface         string                          `json:"ipv6_pd_interface,omitempty"`   // wan|wan2
+	IPV6PDPrefixid          string                          `json:"ipv6_pd_prefixid"`              // ^$|[a-fA-F0-9]{1,4}
+	IPV6PDStart             string                          `json:"ipv6_pd_start,omitempty"`
+	IPV6PDStop              string                          `json:"ipv6_pd_stop,omitempty"`
+	IPV6RaEnabled           bool                            `json:"ipv6_ra_enabled"`
+	IPV6RaPreferredLifetime int                             `json:"ipv6_ra_preferred_lifetime,omitempty"` // ^([0-9]|[1-8][0-9]|9[0-9]|[1-8][0-9]{2}|9[0-8][0-9]|99[0-9]|[1-8][0-9]{3}|9[0-8][0-9]{2}|99[0-8][0-9]|999[0-9]|[1-8][0-9]{4}|9[0-8][0-9]{3}|99[0-8][0-9]{2}|999[0-8][0-9]|9999[0-9]|[1-8][0-9]{5}|9[0-8][0-9]{4}|99[0-8][0-9]{3}|999[0-8][0-9]{2}|9999[0-8][0-9]|99999[0-9]|[1-8][0-9]{6}|9[0-8][0-9]{5}|99[0-8][0-9]{4}|999[0-8][0-9]{3}|9999[0-8][0-9]{2}|99999[0-8][0-9]|999999[0-9]|[12][0-9]{7}|30[0-9]{6}|31[0-4][0-9]{5}|315[0-2][0-9]{4}|3153[0-5][0-9]{3}|31536000)$|^$
+	IPV6RaPriority          string                          `json:"ipv6_ra_priority,omitempty"`           // high|medium|low
+	IPV6RaValidLifetime     int                             `json:"ipv6_ra_valid_lifetime,omitempty"`     // ^([0-9]|[1-8][0-9]|9[0-9]|[1-8][0-9]{2}|9[0-8][0-9]|99[0-9]|[1-8][0-9]{3}|9[0-8][0-9]{2}|99[0-8][0-9]|999[0-9]|[1-8][0-9]{4}|9[0-8][0-9]{3}|99[0-8][0-9]{2}|999[0-8][0-9]|9999[0-9]|[1-8][0-9]{5}|9[0-8][0-9]{4}|99[0-8][0-9]{3}|999[0-8][0-9]{2}|9999[0-8][0-9]|99999[0-9]|[1-8][0-9]{6}|9[0-8][0-9]{5}|99[0-8][0-9]{4}|999[0-8][0-9]{3}|9999[0-8][0-9]{2}|99999[0-8][0-9]|999999[0-9]|[12][0-9]{7}|30[0-9]{6}|31[0-4][0-9]{5}|315[0-2][0-9]{4}|3153[0-5][0-9]{3}|31536000)$|^$
+	IPV6Subnet              string                          `json:"ipv6_subnet,omitempty"`
+	IsNAT                   bool                            `json:"is_nat"`
+	L2TpInterface           string                          `json:"l2tp_interface,omitempty"` // wan|wan2
+	LteLanEnabled           bool                            `json:"lte_lan_enabled"`
+	NATOutboundIPAddresses  []NetworkNATOutboundIPAddresses `json:"nat_outbound_ip_addresses,omitempty"`
+	Name                    string                          `json:"name,omitempty"`                   // .{1,128}
+	NetworkGroup            string                          `json:"networkgroup,omitempty"`           // LAN[2-8]?
+	OpenVPNLocalAddress     string                          `json:"openvpn_local_address,omitempty"`  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
+	OpenVPNLocalPort        int                             `json:"openvpn_local_port,omitempty"`     // ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$
+	OpenVPNMode             string                          `json:"openvpn_mode,omitempty"`           // site-to-site|client|server
+	OpenVPNRemoteAddress    string                          `json:"openvpn_remote_address,omitempty"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
+	OpenVPNRemoteHost       string                          `json:"openvpn_remote_host,omitempty"`    // [^\"\' ]+|^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
+	OpenVPNRemotePort       int                             `json:"openvpn_remote_port,omitempty"`    // ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])$
+	PptpcRequireMppe        bool                            `json:"pptpc_require_mppe"`
+	PptpcRouteDistance      int                             `json:"pptpc_route_distance,omitempty"` // ^[1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]$|^$
+	PptpcServerIP           string                          `json:"pptpc_server_ip,omitempty"`      // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|(?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)|^[a-zA-Z0-9-]{1,63}$
+	PptpcUsername           string                          `json:"pptpc_username,omitempty"`       // [^\"\' ]+
+	Priority                int                             `json:"priority,omitempty"`             // [1-4]
+	Purpose                 string                          `json:"purpose,omitempty"`              // corporate|guest|remote-user-vpn|site-vpn|vlan-only|vpn-client|wan
+	RADIUSProfileID         string                          `json:"radiusprofile_id"`
+	RemoteSiteID            string                          `json:"remote_site_id"`
+	RemoteSiteSubnets       []string                        `json:"remote_site_subnets,omitempty"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([1-9]|[1-2][0-9]|30)$|^$
+	RemoteVPNSubnets        []string                        `json:"remote_vpn_subnets,omitempty"`  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([1-9]|[1-2][0-9]|30)$|^$
+	ReportWANEvent          bool                            `json:"report_wan_event"`
+	RequireMschapv2         bool                            `json:"require_mschapv2"`
+	RouteDistance           int                             `json:"route_distance,omitempty"` // ^[1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]$|^$
+	UpnpLanEnabled          bool                            `json:"upnp_lan_enabled"`
+	UserGroupID             string                          `json:"usergroup_id"`
+	VLAN                    int                             `json:"vlan,omitempty"` // [2-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|400[0-9]|^$
+	VLANEnabled             bool                            `json:"vlan_enabled"`
+	VPNClientDefaultRoute   bool                            `json:"vpn_client_default_route"`
+	VPNClientPullDNS        bool                            `json:"vpn_client_pull_dns"`
+	VPNType                 string                          `json:"vpn_type,omitempty"` // auto|ipsec-vpn|openvpn-vpn|pptp-client|l2tp-server|pptp-server|uid-server
+	WANDHCPOptions          []NetworkWANDHCPOptions         `json:"wan_dhcp_options,omitempty"`
+	WANDHCPv6PDSize         int                             `json:"wan_dhcpv6_pd_size,omitempty"`      // ^(4[89]|5[0-9]|6[0-4])$|^$
+	WANDNS1                 string                          `json:"wan_dns1"`                          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	WANDNS2                 string                          `json:"wan_dns2"`                          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	WANDNS3                 string                          `json:"wan_dns3"`                          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	WANDNS4                 string                          `json:"wan_dns4"`                          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	WANEgressQOS            int                             `json:"wan_egress_qos,omitempty"`          // [1-7]|^$
+	WANGateway              string                          `json:"wan_gateway"`                       // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	WANGatewayV6            string                          `json:"wan_gateway_v6"`                    // ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$|^$
+	WANIP                   string                          `json:"wan_ip,omitempty"`                  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
+	WANIPAliases            []string                        `json:"wan_ip_aliases,omitempty"`          // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\/([1-9]|[1-2][0-9]|30)$|^$
+	WANIPV6                 string                          `json:"wan_ipv6"`                          // ^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))$|^$
+	WANLoadBalanceType      string                          `json:"wan_load_balance_type,omitempty"`   // failover-only|weighted
+	WANLoadBalanceWeight    int                             `json:"wan_load_balance_weight,omitempty"` // [1-9]|[1-9][0-9]
+	WANNetmask              string                          `json:"wan_netmask,omitempty"`             // ^((128|192|224|240|248|252|254)\.0\.0\.0)|(255\.(((0|128|192|224|240|248|252|254)\.0\.0)|(255\.(((0|128|192|224|240|248|252|254)\.0)|255\.(0|128|192|224|240|248|252|254)))))$
+	WANNetworkGroup         string                          `json:"wan_networkgroup,omitempty"`        // WAN[2]?|WAN_LTE_FAILOVER
+	WANPrefixlen            int                             `json:"wan_prefixlen,omitempty"`           // ^([1-9]|[1-8][0-9]|9[0-9]|1[01][0-9]|12[0-8])$|^$
+	WANSmartqDownRate       int                             `json:"wan_smartq_down_rate,omitempty"`    // [0-9]{1,6}|1000000
+	WANSmartqEnabled        bool                            `json:"wan_smartq_enabled"`
+	WANSmartqUpRate         int                             `json:"wan_smartq_up_rate,omitempty"` // [0-9]{1,6}|1000000
+	WANType                 string                          `json:"wan_type,omitempty"`           // disabled|dhcp|static|pppoe
+	WANTypeV6               string                          `json:"wan_type_v6,omitempty"`        // disabled|dhcpv6|static
+	WANUsername             string                          `json:"wan_username,omitempty"`       // [^"' ]+
+	WANVLAN                 int                             `json:"wan_vlan,omitempty"`           // [0-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-8][0-9]|409[0-4]|^$
+	WANVLANEnabled          bool                            `json:"wan_vlan_enabled"`
+	XIPSecPreSharedKey      string                          `json:"x_ipsec_pre_shared_key,omitempty"`      // [^\"\' ]+
+	XOpenVPNSharedSecretKey string                          `json:"x_openvpn_shared_secret_key,omitempty"` // [0-9A-Fa-f]{512}
+	XPptpcPassword          string                          `json:"x_pptpc_password,omitempty"`            // [^\"\' ]+
+	XWANPassword            string                          `json:"x_wan_password,omitempty"`              // [^"' ]+
+}
+
+type NetworkNATOutboundIPAddresses struct {
+	IPAddress       string `json:"ip_address"`                  // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	WANNetworkGroup string `json:"wan_network_group,omitempty"` // WAN|WAN2
 }
 
 type NetworkWANDHCPOptions struct {
diff --git a/unifi/port_forward.generated.go b/unifi/port_forward.generated.go
index 7ef210c..1629005 100644
--- a/unifi/port_forward.generated.go
+++ b/unifi/port_forward.generated.go
@@ -23,7 +23,8 @@ type PortForward struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
-	DstPort       string `json:"dst_port,omitempty"` // (([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]))+(,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])){0,14}
+	DestinationIP string `json:"destination_ip,omitempty"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^any$
+	DstPort       string `json:"dst_port,omitempty"`       // (([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]))+(,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])){0,14}
 	Enabled       bool   `json:"enabled"`
 	Fwd           string `json:"fwd,omitempty"`      // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
 	FwdPort       string `json:"fwd_port,omitempty"` // (([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5]))+(,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])|,([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])-([1-9][0-9]{0,3}|[1-5][0-9]{4}|[6][0-4][0-9]{3}|[6][5][0-4][0-9]{2}|[6][5][5][0-2][0-9]|[6][5][5][3][0-5])){0,14}
diff --git a/unifi/setting_guest_access.generated.go b/unifi/setting_guest_access.generated.go
index 314bdb0..96c9252 100644
--- a/unifi/setting_guest_access.generated.go
+++ b/unifi/setting_guest_access.generated.go
@@ -26,7 +26,7 @@ type SettingGuestAccess struct {
 	Key string `json:"key"`
 
 	AllowedSubnet                          string   `json:"allowed_subnet_,omitempty"`
-	Auth                                   string   `json:"auth,omitempty"` // none|password|hotspot|facebook_wifi|custom
+	Auth                                   string   `json:"auth,omitempty"` // none|hotspot|facebook_wifi|custom
 	AuthorizeUseSandbox                    bool     `json:"authorize_use_sandbox"`
 	CustomIP                               string   `json:"custom_ip"` // ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
 	EcEnabled                              bool     `json:"ec_enabled"`
@@ -46,6 +46,7 @@ type SettingGuestAccess struct {
 	GoogleScopeEmail                       bool     `json:"google_scope_email"`
 	IPpayUseSandbox                        bool     `json:"ippay_use_sandbox"`
 	MerchantwarriorUseSandbox              bool     `json:"merchantwarrior_use_sandbox"`
+	PasswordEnabled                        bool     `json:"password_enabled"`
 	PaymentEnabled                         bool     `json:"payment_enabled"`
 	PaypalUseSandbox                       bool     `json:"paypal_use_sandbox"`
 	PortalCustomized                       bool     `json:"portal_customized"`
diff --git a/unifi/setting_ips.generated.go b/unifi/setting_ips.generated.go
index 3cba426..934846e 100644
--- a/unifi/setting_ips.generated.go
+++ b/unifi/setting_ips.generated.go
@@ -27,7 +27,7 @@ type SettingIps struct {
 
 	DNSFiltering        bool                   `json:"dns_filtering"`
 	DNSFilters          []SettingIpsDNSFilters `json:"dns_filters,omitempty"`
-	EnabledCategories   []string               `json:"enabled_categories,omitempty"` // emerging-activex|emerging-attackresponse|botcc|emerging-chat|ciarmy|compromised|emerging-dns|emerging-dos|dshield|emerging-exploit|emerging-ftp|emerging-games|emerging-icmp|emerging-icmpinfo|emerging-imap|emerging-inappropriate|emerging-info|emerging-malware|emerging-misc|emerging-mobile|emerging-netbios|emerging-p2p|emerging-policy|emerging-pop3|emerging-rpc|emerging-scada|emerging-scan|emerging-shellcode|emerging-smtp|emerging-snmp|spamhaus|emerging-sql|emerging-telnet|emerging-tftp|tor|emerging-trojan|emerging-useragent|emerging-voip|emerging-webapps|emerging-webclient|emerging-webserver|emerging-worm
+	EnabledCategories   []string               `json:"enabled_categories,omitempty"` // emerging-activex|emerging-attackresponse|botcc|emerging-chat|ciarmy|compromised|emerging-dns|emerging-dos|dshield|emerging-exploit|emerging-ftp|emerging-games|emerging-icmp|emerging-icmpinfo|emerging-imap|emerging-inappropriate|emerging-info|emerging-malware|emerging-misc|emerging-mobile|emerging-netbios|emerging-p2p|emerging-policy|emerging-pop3|emerging-rpc|emerging-scada|emerging-scan|emerging-shellcode|emerging-smtp|emerging-snmp|emerging-sql|emerging-telnet|emerging-tftp|tor|emerging-trojan|emerging-useragent|emerging-voip|emerging-webapps|emerging-webclient|emerging-webserver|emerging-worm
 	EndpointScanning    bool                   `json:"endpoint_scanning"`
 	Honeypot            []SettingIpsHoneypot   `json:"honeypot,omitempty"`
 	HoneypotEnabled     bool                   `json:"honeypot_enabled"`
@@ -52,7 +52,7 @@ type SettingIpsDNSFilters struct {
 	BlockedSites []string `json:"blocked_sites,omitempty"` // ^[a-zA-Z0-9.-]+$|^$
 	BlockedTld   []string `json:"blocked_tld,omitempty"`   // ^[a-zA-Z0-9.-]+$|^$
 	Description  string   `json:"description,omitempty"`
-	Filter       string   `json:"filter,omitempty"` // none|security|adult|family
+	Filter       string   `json:"filter,omitempty"` // none|work|family
 	Name         string   `json:"name,omitempty"`
 	NetworkID    string   `json:"network_id"`
 	Version      string   `json:"version,omitempty"` // v4|v6
diff --git a/unifi/setting_mgmt.generated.go b/unifi/setting_mgmt.generated.go
index a21465f..b6a1b71 100644
--- a/unifi/setting_mgmt.generated.go
+++ b/unifi/setting_mgmt.generated.go
@@ -32,6 +32,7 @@ type SettingMgmt struct {
 	LedEnabled              bool     `json:"led_enabled"`
 	OutdoorModeEnabled      bool     `json:"outdoor_mode_enabled"`
 	UnifiIDpEnabled         bool     `json:"unifi_idp_enabled"`
+	WifimanEnabled          bool     `json:"wifiman_enabled"`
 	XMgmtKey                string   `json:"x_mgmt_key,omitempty"` // [0-9a-f]{32}
 	XSshAuthPasswordEnabled bool     `json:"x_ssh_auth_password_enabled"`
 	XSshBindWildcard        bool     `json:"x_ssh_bind_wildcard"`
diff --git a/unifi/setting_radius.generated.go b/unifi/setting_radius.generated.go
index d43084c..45ca18c 100644
--- a/unifi/setting_radius.generated.go
+++ b/unifi/setting_radius.generated.go
@@ -32,7 +32,7 @@ type SettingRadius struct {
 	Enabled               bool   `json:"enabled"`
 	InterimUpdateInterval int    `json:"interim_update_interval,omitempty"` // ^([6-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9][0-9]|86400)$
 	TunneledReply         bool   `json:"tunneled_reply"`
-	XSecret               string `json:"x_secret,omitempty"` // [^\"\' ]{1,128}
+	XSecret               string `json:"x_secret,omitempty"` // [^\"\' ]{1,48}
 }
 
 func (c *Client) getSettingRadius(ctx context.Context, site string) (*SettingRadius, error) {
diff --git a/unifi/unifi.go b/unifi/unifi.go
index 2bfe71e..ece6092 100644
--- a/unifi/unifi.go
+++ b/unifi/unifi.go
@@ -49,12 +49,18 @@ type Client struct {
 	loginPath string
 
 	csrf string
+
+	version string
 }
 
 func (c *Client) CSRFToken() string {
 	return c.csrf
 }
 
+func (c *Client) Version() string {
+	return c.version
+}
+
 func (c *Client) SetBaseURL(base string) error {
 	var err error
 	c.baseURL, err = url.Parse(base)
@@ -128,6 +134,18 @@ func (c *Client) Login(ctx context.Context, user, pass string) error {
 		return fmt.Errorf("unable to determine API URL style: %w", err)
 	}
 
+	var status struct {
+		Meta struct {
+			ServerVersion string `json:"server_version"`
+			UUID          string `json:"uuid"`
+		} `json:"meta"`
+	}
+	err = c.do(ctx, "GET", "/status", nil, &status)
+	if err != nil {
+		return err
+	}
+	c.version = status.Meta.ServerVersion
+
 	err = c.do(ctx, "POST", c.loginPath, &struct {
 		Username string `json:"username"`
 		Password string `json:"password"`
diff --git a/unifi/wlan.generated.go b/unifi/wlan.generated.go
index bb23759..f9b4371 100644
--- a/unifi/wlan.generated.go
+++ b/unifi/wlan.generated.go
@@ -23,72 +23,85 @@ type WLAN struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
-	AuthCache                 bool     `json:"auth_cache"`
-	BroadcastFilterEnabled    bool     `json:"bc_filter_enabled"`
-	BroadcastFilterList       []string `json:"bc_filter_list,omitempty"` // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$
-	BssTransition             bool     `json:"bss_transition"`
-	CountryBeacon             bool     `json:"country_beacon"`
-	DPIEnabled                bool     `json:"dpi_enabled"`
-	DPIgroupID                string   `json:"dpigroup_id"`         // [\d\w]+|^$
-	DTIMMode                  string   `json:"dtim_mode,omitempty"` // default|custom
-	DTIMNa                    int      `json:"dtim_na,omitempty"`   // ^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	DTIMNg                    int      `json:"dtim_ng,omitempty"`   // ^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
-	ElementAdopt              bool     `json:"element_adopt"`
-	Enabled                   bool     `json:"enabled"`
-	FastRoamingEnabled        bool     `json:"fast_roaming_enabled"`
-	GroupRekey                int      `json:"group_rekey,omitempty"` // ^(0|[6-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9][0-9]|86400)$
-	HideSSID                  bool     `json:"hide_ssid"`
-	Hotspot2ConfEnabled       bool     `json:"hotspot2conf_enabled"`
-	Hotspot2ConfID            string   `json:"hotspot2conf_id"`
-	IappEnabled               bool     `json:"iapp_enabled"`
-	IsGuest                   bool     `json:"is_guest"`
-	L2Isolation               bool     `json:"l2_isolation"`
-	MACFilterEnabled          bool     `json:"mac_filter_enabled"`
-	MACFilterList             []string `json:"mac_filter_list,omitempty"`   // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$
-	MACFilterPolicy           string   `json:"mac_filter_policy,omitempty"` // allow|deny
-	MinrateNaAdvertisingRates bool     `json:"minrate_na_advertising_rates"`
-	MinrateNaBeaconRateKbps   int      `json:"minrate_na_beacon_rate_kbps,omitempty"`
-	MinrateNaDataRateKbps     int      `json:"minrate_na_data_rate_kbps,omitempty"`
-	MinrateNaEnabled          bool     `json:"minrate_na_enabled"`
-	MinrateNaMgmtRateKbps     int      `json:"minrate_na_mgmt_rate_kbps,omitempty"`
-	MinrateNgAdvertisingRates bool     `json:"minrate_ng_advertising_rates"`
-	MinrateNgBeaconRateKbps   int      `json:"minrate_ng_beacon_rate_kbps,omitempty"`
-	MinrateNgCckRatesEnabled  bool     `json:"minrate_ng_cck_rates_enabled"`
-	MinrateNgDataRateKbps     int      `json:"minrate_ng_data_rate_kbps,omitempty"`
-	MinrateNgEnabled          bool     `json:"minrate_ng_enabled"`
-	MinrateNgMgmtRateKbps     int      `json:"minrate_ng_mgmt_rate_kbps,omitempty"`
-	MulticastEnhanceEnabled   bool     `json:"mcastenhance_enabled"`
-	Name                      string   `json:"name,omitempty"` // .{1,32}
-	NameCombineEnabled        bool     `json:"name_combine_enabled"`
-	NameCombineSuffix         string   `json:"name_combine_suffix,omitempty"` // .{0,8}
-	No2GhzOui                 bool     `json:"no2ghz_oui"`
-	P2P                       bool     `json:"p2p"`
-	P2PCrossConnect           bool     `json:"p2p_cross_connect"`
-	Priority                  string   `json:"priority,omitempty"` // medium|high|low
-	ProxyArp                  bool     `json:"proxy_arp"`
-	RADIUSDasEnabled          bool     `json:"radius_das_enabled"`
-	RADIUSMACAuthEnabled      bool     `json:"radius_mac_auth_enabled"`
-	RADIUSMACaclEmptyPassword bool     `json:"radius_macacl_empty_password"`
-	RADIUSMACaclFormat        string   `json:"radius_macacl_format,omitempty"` // none_lower|hyphen_lower|colon_lower|none_upper|hyphen_upper|colon_upper
-	RADIUSProfileID           string   `json:"radiusprofile_id"`
-	RoamClusterID             int      `json:"roam_cluster_id,omitempty"` // [0-9]|[1-2][0-9]|[3][0-1]|^$
-	RrmEnabled                bool     `json:"rrm_enabled"`
-	Schedule                  []string `json:"schedule,omitempty"` // (sun|mon|tue|wed|thu|fri|sat)(\-(sun|mon|tue|wed|thu|fri|sat))?\|([0-2][0-9][0-5][0-9])\-([0-2][0-9][0-5][0-9])
-	ScheduleEnabled           bool     `json:"schedule_enabled"`
-	ScheduleReversed          bool     `json:"schedule_reversed"`
-	Security                  string   `json:"security,omitempty"` // open|wpapsk|wep|wpaeap|osen
-	TdlsProhibit              bool     `json:"tdls_prohibit"`
-	UapsdEnabled              bool     `json:"uapsd_enabled"`
-	UserGroupID               string   `json:"usergroup_id"`
-	VLAN                      int      `json:"vlan,omitempty"` // [2-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-8][0-9]|409[0-5]|^$
-	VLANEnabled               bool     `json:"vlan_enabled"`
-	WEPIDX                    int      `json:"wep_idx,omitempty"` // [1-4]
-	WLANGroupID               string   `json:"wlangroup_id"`
-	WPAEnc                    string   `json:"wpa_enc,omitempty"`      // auto|ccmp
-	WPAMode                   string   `json:"wpa_mode,omitempty"`     // auto|wpa1|wpa2
-	XIappKey                  string   `json:"x_iapp_key,omitempty"`   // [0-9A-Fa-f]{32}
-	XPassphrase               string   `json:"x_passphrase,omitempty"` // [\x20-\x7E]{8,63}|[0-9a-fA-F]{64}
-	XWEP                      string   `json:"x_wep,omitempty"`
+	ApGroupIDs                []string                   `json:"ap_group_ids,omitempty"`
+	AuthCache                 bool                       `json:"auth_cache"`
+	BSupported                bool                       `json:"b_supported"`
+	BroadcastFilterEnabled    bool                       `json:"bc_filter_enabled"`
+	BroadcastFilterList       []string                   `json:"bc_filter_list,omitempty"` // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$
+	BssTransition             bool                       `json:"bss_transition"`
+	CountryBeacon             bool                       `json:"country_beacon"`
+	DPIEnabled                bool                       `json:"dpi_enabled"`
+	DPIgroupID                string                     `json:"dpigroup_id"`         // [\d\w]+|^$
+	DTIMMode                  string                     `json:"dtim_mode,omitempty"` // default|custom
+	DTIMNa                    int                        `json:"dtim_na,omitempty"`   // ^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	DTIMNg                    int                        `json:"dtim_ng,omitempty"`   // ^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$
+	ElementAdopt              bool                       `json:"element_adopt"`
+	Enabled                   bool                       `json:"enabled"`
+	FastRoamingEnabled        bool                       `json:"fast_roaming_enabled"`
+	GroupRekey                int                        `json:"group_rekey,omitempty"` // ^(0|[6-9][0-9]|[1-9][0-9]{2,3}|[1-7][0-9]{4}|8[0-5][0-9]{3}|86[0-3][0-9][0-9]|86400)$
+	HideSSID                  bool                       `json:"hide_ssid"`
+	Hotspot2ConfEnabled       bool                       `json:"hotspot2conf_enabled"`
+	Hotspot2ConfID            string                     `json:"hotspot2conf_id"`
+	IappEnabled               bool                       `json:"iapp_enabled"`
+	IsGuest                   bool                       `json:"is_guest"`
+	L2Isolation               bool                       `json:"l2_isolation"`
+	MACFilterEnabled          bool                       `json:"mac_filter_enabled"`
+	MACFilterList             []string                   `json:"mac_filter_list,omitempty"`   // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$
+	MACFilterPolicy           string                     `json:"mac_filter_policy,omitempty"` // allow|deny
+	MinrateNaAdvertisingRates bool                       `json:"minrate_na_advertising_rates"`
+	MinrateNaBeaconRateKbps   int                        `json:"minrate_na_beacon_rate_kbps,omitempty"`
+	MinrateNaDataRateKbps     int                        `json:"minrate_na_data_rate_kbps,omitempty"`
+	MinrateNaEnabled          bool                       `json:"minrate_na_enabled"`
+	MinrateNaMgmtRateKbps     int                        `json:"minrate_na_mgmt_rate_kbps,omitempty"`
+	MinrateNgAdvertisingRates bool                       `json:"minrate_ng_advertising_rates"`
+	MinrateNgBeaconRateKbps   int                        `json:"minrate_ng_beacon_rate_kbps,omitempty"`
+	MinrateNgCckRatesEnabled  bool                       `json:"minrate_ng_cck_rates_enabled"`
+	MinrateNgDataRateKbps     int                        `json:"minrate_ng_data_rate_kbps,omitempty"`
+	MinrateNgEnabled          bool                       `json:"minrate_ng_enabled"`
+	MinrateNgMgmtRateKbps     int                        `json:"minrate_ng_mgmt_rate_kbps,omitempty"`
+	MulticastEnhanceEnabled   bool                       `json:"mcastenhance_enabled"`
+	Name                      string                     `json:"name,omitempty"` // .{1,32}
+	NameCombineEnabled        bool                       `json:"name_combine_enabled"`
+	NameCombineSuffix         string                     `json:"name_combine_suffix,omitempty"` // .{0,8}
+	NetworkID                 string                     `json:"networkconf_id"`
+	No2GhzOui                 bool                       `json:"no2ghz_oui"`
+	P2P                       bool                       `json:"p2p"`
+	P2PCrossConnect           bool                       `json:"p2p_cross_connect"`
+	PMFMode                   string                     `json:"pmf_mode,omitempty"` // disabled|optional|required
+	Priority                  string                     `json:"priority,omitempty"` // medium|high|low
+	ProxyArp                  bool                       `json:"proxy_arp"`
+	RADIUSDasEnabled          bool                       `json:"radius_das_enabled"`
+	RADIUSMACAuthEnabled      bool                       `json:"radius_mac_auth_enabled"`
+	RADIUSMACaclEmptyPassword bool                       `json:"radius_macacl_empty_password"`
+	RADIUSMACaclFormat        string                     `json:"radius_macacl_format,omitempty"` // none_lower|hyphen_lower|colon_lower|none_upper|hyphen_upper|colon_upper
+	RADIUSProfileID           string                     `json:"radiusprofile_id"`
+	RoamClusterID             int                        `json:"roam_cluster_id,omitempty"` // [0-9]|[1-2][0-9]|[3][0-1]|^$
+	RrmEnabled                bool                       `json:"rrm_enabled"`
+	Schedule                  []string                   `json:"schedule,omitempty"` // (sun|mon|tue|wed|thu|fri|sat)(\-(sun|mon|tue|wed|thu|fri|sat))?\|([0-2][0-9][0-5][0-9])\-([0-2][0-9][0-5][0-9])
+	ScheduleEnabled           bool                       `json:"schedule_enabled"`
+	ScheduleReversed          bool                       `json:"schedule_reversed"`
+	ScheduleWithDuration      []WLANScheduleWithDuration `json:"schedule_with_duration,omitempty"`
+	Security                  string                     `json:"security,omitempty"` // open|wpapsk|wep|wpaeap|osen
+	TdlsProhibit              bool                       `json:"tdls_prohibit"`
+	UapsdEnabled              bool                       `json:"uapsd_enabled"`
+	UserGroupID               string                     `json:"usergroup_id"`
+	VLAN                      int                        `json:"vlan,omitempty"` // [2-9]|[1-9][0-9]{1,2}|[1-3][0-9]{3}|40[0-8][0-9]|409[0-5]|^$
+	VLANEnabled               bool                       `json:"vlan_enabled"`
+	WEPIDX                    int                        `json:"wep_idx,omitempty"`   // [1-4]
+	WLANBand                  string                     `json:"wlan_band,omitempty"` // 2g|5g|both
+	WLANGroupID               string                     `json:"wlangroup_id"`
+	WPAEnc                    string                     `json:"wpa_enc,omitempty"`      // auto|ccmp
+	WPAMode                   string                     `json:"wpa_mode,omitempty"`     // auto|wpa1|wpa2
+	XIappKey                  string                     `json:"x_iapp_key,omitempty"`   // [0-9A-Fa-f]{32}
+	XPassphrase               string                     `json:"x_passphrase,omitempty"` // [\x20-\x7E]{8,63}|[0-9a-fA-F]{64}
+	XWEP                      string                     `json:"x_wep,omitempty"`
+}
+
+type WLANScheduleWithDuration struct {
+	DurationMinutes int      `json:"duration_minutes,omitempty"`   // ^[1-9][0-9]*$
+	StartDaysOfWeek []string `json:"start_days_of_week,omitempty"` // ^(sun|mon|tue|wed|thu|fri|sat)$
+	StartHour       int      `json:"start_hour,omitempty"`         // ^(1?[0-9])|(2[0-3])$
+	StartMinute     int      `json:"start_minute,omitempty"`       // ^[0-5]?[0-9]$
 }
 
 func (c *Client) listWLAN(ctx context.Context, site string) ([]WLAN, error) {
diff --git a/unifi/wlan_group.generated.go b/unifi/wlan_group.generated.go
index 0aee93b..2541dcd 100644
--- a/unifi/wlan_group.generated.go
+++ b/unifi/wlan_group.generated.go
@@ -23,13 +23,7 @@ type WLANGroup struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
-	BSupported         bool   `json:"b_supported"`
-	LoadbalanceEnabled bool   `json:"loadbalance_enabled"`
-	Maxsta             int    `json:"maxsta,omitempty"` // [1-9]|[1-9][0-9]|1[0-9]{2}|200|^$
-	MinRSSI            string `json:"minrssi,omitempty"`
-	MinRSSIEnabled     bool   `json:"minrssi_enabled"`
-	Name               string `json:"name,omitempty"`     // .{1,128}
-	PMFMode            string `json:"pmf_mode,omitempty"` // disabled|optional|required
+	Name string `json:"name,omitempty"` // .{1,128}
 }
 
 func (c *Client) listWLANGroup(ctx context.Context, site string) ([]WLANGroup, error) {
diff --git a/unifi/wlan_group.go b/unifi/wlan_group.go
index c83b5d6..5ad3558 100644
--- a/unifi/wlan_group.go
+++ b/unifi/wlan_group.go
@@ -2,28 +2,8 @@ package unifi
 
 import (
 	"context"
-	"encoding/json"
 )
 
-func (n *WLANGroup) UnmarshalJSON(b []byte) error {
-	type Alias WLANGroup
-	aux := &struct {
-		Maxsta emptyStringInt `json:"maxsta"`
-		*Alias
-	}{
-		Alias: (*Alias)(n),
-	}
-
-	err := json.Unmarshal(b, &aux)
-	if err != nil {
-		return err
-	}
-
-	n.Maxsta = int(aux.Maxsta)
-
-	return nil
-}
-
 func (c *Client) ListWLANGroup(ctx context.Context, site string) ([]WLANGroup, error) {
 	return c.listWLANGroup(ctx, site)
 }