diff --git a/fields/5.14.23/Account.json b/fields/5.14.23/Account.json
new file mode 100644
index 0000000..9f104aa
--- /dev/null
+++ b/fields/5.14.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/5.14.23/AuthenticationRequest.json b/fields/5.14.23/AuthenticationRequest.json
new file mode 100644
index 0000000..8e88f6e
--- /dev/null
+++ b/fields/5.14.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/5.14.23/BroadcastGroup.json b/fields/5.14.23/BroadcastGroup.json
new file mode 100644
index 0000000..677d265
--- /dev/null
+++ b/fields/5.14.23/BroadcastGroup.json
@@ -0,0 +1,4 @@
+{
+    "name": "",
+    "member_table": [""]
+}
diff --git a/fields/5.14.23/ChannelPlan.json b/fields/5.14.23/ChannelPlan.json
new file mode 100644
index 0000000..a790643
--- /dev/null
+++ b/fields/5.14.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/5.14.23/Dashboard.json b/fields/5.14.23/Dashboard.json
new file mode 100644
index 0000000..eb5bc1f
--- /dev/null
+++ b/fields/5.14.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/5.14.23/Device.json b/fields/5.14.23/Device.json
new file mode 100644
index 0000000..ac5bd9b
--- /dev/null
+++ b/fields/5.14.23/Device.json
@@ -0,0 +1,143 @@
+{
+    "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]",
+        "wlangroup_id": "[\\d\\w]+",
+        "vwire_enabled":"true|false"
+    }],
+    "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/5.14.23/DhcpOption.json b/fields/5.14.23/DhcpOption.json
new file mode 100644
index 0000000..63f9c8d
--- /dev/null
+++ b/fields/5.14.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/5.14.23/DpiApp.json b/fields/5.14.23/DpiApp.json
new file mode 100644
index 0000000..55760c2
--- /dev/null
+++ b/fields/5.14.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/5.14.23/DpiGroup.json b/fields/5.14.23/DpiGroup.json
new file mode 100644
index 0000000..de915a1
--- /dev/null
+++ b/fields/5.14.23/DpiGroup.json
@@ -0,0 +1,5 @@
+{
+    "name":".{1,128}",
+    "enabled": "false|true",
+    "dpiapp_ids": [ "[\\d\\w]+" ]
+}
diff --git a/fields/5.14.23/DynamicDNS.json b/fields/5.14.23/DynamicDNS.json
new file mode 100644
index 0000000..b866f64
--- /dev/null
+++ b/fields/5.14.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/5.14.23/FirewallGroup.json b/fields/5.14.23/FirewallGroup.json
new file mode 100644
index 0000000..a148c69
--- /dev/null
+++ b/fields/5.14.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/5.14.23/FirewallRule.json b/fields/5.14.23/FirewallRule.json
new file mode 100644
index 0000000..9e3f7df
--- /dev/null
+++ b/fields/5.14.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/5.14.23/HeatMap.json b/fields/5.14.23/HeatMap.json
new file mode 100644
index 0000000..eaa6021
--- /dev/null
+++ b/fields/5.14.23/HeatMap.json
@@ -0,0 +1,6 @@
+{
+    "map_id": "",
+    "type": "download|upload",
+    "name": ".*[^\\s]+.*",
+    "description": ""
+}
diff --git a/fields/5.14.23/HeatMapPoint.json b/fields/5.14.23/HeatMapPoint.json
new file mode 100644
index 0000000..f119f69
--- /dev/null
+++ b/fields/5.14.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/5.14.23/Hotspot2Conf.json b/fields/5.14.23/Hotspot2Conf.json
new file mode 100644
index 0000000..8344c7a
--- /dev/null
+++ b/fields/5.14.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/5.14.23/HotspotOp.json b/fields/5.14.23/HotspotOp.json
new file mode 100644
index 0000000..aa464df
--- /dev/null
+++ b/fields/5.14.23/HotspotOp.json
@@ -0,0 +1,5 @@
+{
+    "name": ".{1,256}",
+    "x_password": ".{1,256}",
+    "note": ""
+}
diff --git a/fields/5.14.23/HotspotPackage.json b/fields/5.14.23/HotspotPackage.json
new file mode 100644
index 0000000..840ae4a
--- /dev/null
+++ b/fields/5.14.23/HotspotPackage.json
@@ -0,0 +1,31 @@
+{
+    "name": "",
+    "charged_as": "",
+    "amount": "^([\\d]+[.]?[\\d]*)$",
+    "currency": "[A-Z]{3}",
+    "hours": "[\\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_country_default": "",
+    "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/5.14.23/Map.json b/fields/5.14.23/Map.json
new file mode 100644
index 0000000..0fa5c6d
--- /dev/null
+++ b/fields/5.14.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/5.14.23/MediaFile.json b/fields/5.14.23/MediaFile.json
new file mode 100644
index 0000000..7c98cf6
--- /dev/null
+++ b/fields/5.14.23/MediaFile.json
@@ -0,0 +1,3 @@
+{
+    "name": ""
+}
diff --git a/fields/5.14.23/NetworkConf.json b/fields/5.14.23/NetworkConf.json
new file mode 100644
index 0000000..c26e9d7
--- /dev/null
+++ b/fields/5.14.23/NetworkConf.json
@@ -0,0 +1,145 @@
+{
+    "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": "",
+    "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_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"
+}
diff --git a/fields/5.14.23/PortConf.json b/fields/5.14.23/PortConf.json
new file mode 100644
index 0000000..5beb225
--- /dev/null
+++ b/fields/5.14.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/5.14.23/PortForward.json b/fields/5.14.23/PortForward.json
new file mode 100644
index 0000000..ca6b93d
--- /dev/null
+++ b/fields/5.14.23/PortForward.json
@@ -0,0 +1,11 @@
+{
+    "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}",
+    "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/5.14.23/RadiusProfile.json b/fields/5.14.23/RadiusProfile.json
new file mode 100644
index 0000000..0409302
--- /dev/null
+++ b/fields/5.14.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/5.14.23/Routing.json b/fields/5.14.23/Routing.json
new file mode 100644
index 0000000..398a751
--- /dev/null
+++ b/fields/5.14.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/5.14.23/ScheduleTask.json b/fields/5.14.23/ScheduleTask.json
new file mode 100644
index 0000000..2233782
--- /dev/null
+++ b/fields/5.14.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/5.14.23/Setting.json b/fields/5.14.23/Setting.json
new file mode 100644
index 0000000..5960bb3
--- /dev/null
+++ b/fields/5.14.23/Setting.json
@@ -0,0 +1,420 @@
+{
+    "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",
+        "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|password|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",
+        "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,128}"
+    },
+    "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|spamhaus|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|security|adult|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/5.14.23/SettingAutoSpeedtest.json b/fields/5.14.23/SettingAutoSpeedtest.json
new file mode 100644
index 0000000..92ab674
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingBaresip.json b/fields/5.14.23/SettingBaresip.json
new file mode 100644
index 0000000..a0c696a
--- /dev/null
+++ b/fields/5.14.23/SettingBaresip.json
@@ -0,0 +1,6 @@
+{
+  "enabled": "true|false",
+  "server": "",
+  "outbound_proxy": "",
+  "package_url": ""
+}
diff --git a/fields/5.14.23/SettingBroadcast.json b/fields/5.14.23/SettingBroadcast.json
new file mode 100644
index 0000000..219dfc4
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingConnectivity.json b/fields/5.14.23/SettingConnectivity.json
new file mode 100644
index 0000000..4ddf9b2
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingCountry.json b/fields/5.14.23/SettingCountry.json
new file mode 100644
index 0000000..81fa84d
--- /dev/null
+++ b/fields/5.14.23/SettingCountry.json
@@ -0,0 +1,3 @@
+{
+  "code": "[\\d]{1,3}"
+}
diff --git a/fields/5.14.23/SettingDpi.json b/fields/5.14.23/SettingDpi.json
new file mode 100644
index 0000000..809a4a4
--- /dev/null
+++ b/fields/5.14.23/SettingDpi.json
@@ -0,0 +1,4 @@
+{
+  "enabled": "false|true",
+  "fingerprintingEnabled": "false|true"
+}
diff --git a/fields/5.14.23/SettingElementAdopt.json b/fields/5.14.23/SettingElementAdopt.json
new file mode 100644
index 0000000..80ed166
--- /dev/null
+++ b/fields/5.14.23/SettingElementAdopt.json
@@ -0,0 +1,5 @@
+{
+  "enabled": "true|false",
+  "x_element_essid": "",
+  "x_element_psk": ""
+}
diff --git a/fields/5.14.23/SettingGuestAccess.json b/fields/5.14.23/SettingGuestAccess.json
new file mode 100644
index 0000000..51d42f3
--- /dev/null
+++ b/fields/5.14.23/SettingGuestAccess.json
@@ -0,0 +1,94 @@
+{
+  "portal_enabled": "true|false",
+  "auth": "none|password|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",
+  "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/5.14.23/SettingIps.json b/fields/5.14.23/SettingIps.json
new file mode 100644
index 0000000..c8969cf
--- /dev/null
+++ b/fields/5.14.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|spamhaus|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|security|adult|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/5.14.23/SettingLcm.json b/fields/5.14.23/SettingLcm.json
new file mode 100644
index 0000000..9021cf3
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingLocale.json b/fields/5.14.23/SettingLocale.json
new file mode 100644
index 0000000..408bb9c
--- /dev/null
+++ b/fields/5.14.23/SettingLocale.json
@@ -0,0 +1,3 @@
+{
+  "timezone": ""
+}
diff --git a/fields/5.14.23/SettingMgmt.json b/fields/5.14.23/SettingMgmt.json
new file mode 100644
index 0000000..8b91949
--- /dev/null
+++ b/fields/5.14.23/SettingMgmt.json
@@ -0,0 +1,20 @@
+{
+  "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",
+  "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/5.14.23/SettingNetworkOptimization.json b/fields/5.14.23/SettingNetworkOptimization.json
new file mode 100644
index 0000000..4bf5bbc
--- /dev/null
+++ b/fields/5.14.23/SettingNetworkOptimization.json
@@ -0,0 +1,3 @@
+{
+  "enabled": "true|false"
+}
diff --git a/fields/5.14.23/SettingNtp.json b/fields/5.14.23/SettingNtp.json
new file mode 100644
index 0000000..45fcc15
--- /dev/null
+++ b/fields/5.14.23/SettingNtp.json
@@ -0,0 +1,6 @@
+{
+  "ntp_server_1": "",
+  "ntp_server_2": "",
+  "ntp_server_3": "",
+  "ntp_server_4": ""
+}
diff --git a/fields/5.14.23/SettingPorta.json b/fields/5.14.23/SettingPorta.json
new file mode 100644
index 0000000..0123c2e
--- /dev/null
+++ b/fields/5.14.23/SettingPorta.json
@@ -0,0 +1,3 @@
+{
+  "ugw3_wan2_enabled": "false|true"
+}
diff --git a/fields/5.14.23/SettingProviderCapabilities.json b/fields/5.14.23/SettingProviderCapabilities.json
new file mode 100644
index 0000000..8564c06
--- /dev/null
+++ b/fields/5.14.23/SettingProviderCapabilities.json
@@ -0,0 +1,5 @@
+{
+  "enabled": "false|true",
+  "download": "^[1-9][0-9]*$",
+  "upload": "^[1-9][0-9]*$"
+}
diff --git a/fields/5.14.23/SettingRadioAi.json b/fields/5.14.23/SettingRadioAi.json
new file mode 100644
index 0000000..66de90b
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingRadius.json b/fields/5.14.23/SettingRadius.json
new file mode 100644
index 0000000..1b0bd48
--- /dev/null
+++ b/fields/5.14.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,128}"
+}
diff --git a/fields/5.14.23/SettingRsyslogd.json b/fields/5.14.23/SettingRsyslogd.json
new file mode 100644
index 0000000..442bd91
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingSnmp.json b/fields/5.14.23/SettingSnmp.json
new file mode 100644
index 0000000..b6cee6a
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingSuperCloudaccess.json b/fields/5.14.23/SettingSuperCloudaccess.json
new file mode 100644
index 0000000..9332c4f
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingSuperEvents.json b/fields/5.14.23/SettingSuperEvents.json
new file mode 100644
index 0000000..418cc2f
--- /dev/null
+++ b/fields/5.14.23/SettingSuperEvents.json
@@ -0,0 +1,3 @@
+{
+  "_ignored": ""
+}
diff --git a/fields/5.14.23/SettingSuperFwupdate.json b/fields/5.14.23/SettingSuperFwupdate.json
new file mode 100644
index 0000000..a809ce5
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingSuperIdentity.json b/fields/5.14.23/SettingSuperIdentity.json
new file mode 100644
index 0000000..92a9932
--- /dev/null
+++ b/fields/5.14.23/SettingSuperIdentity.json
@@ -0,0 +1,4 @@
+{
+  "name": "",
+  "hostname": ""
+}
diff --git a/fields/5.14.23/SettingSuperMail.json b/fields/5.14.23/SettingSuperMail.json
new file mode 100644
index 0000000..6ab219a
--- /dev/null
+++ b/fields/5.14.23/SettingSuperMail.json
@@ -0,0 +1,3 @@
+{
+  "provider": "smtp|cloud|disabled"
+}
diff --git a/fields/5.14.23/SettingSuperMgmt.json b/fields/5.14.23/SettingSuperMgmt.json
new file mode 100644
index 0000000..e4457a7
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingSuperSdn.json b/fields/5.14.23/SettingSuperSdn.json
new file mode 100644
index 0000000..7dba94f
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingSuperSmtp.json b/fields/5.14.23/SettingSuperSmtp.json
new file mode 100644
index 0000000..3d2cad6
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingUsg.json b/fields/5.14.23/SettingUsg.json
new file mode 100644
index 0000000..edd4972
--- /dev/null
+++ b/fields/5.14.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/5.14.23/SettingUsw.json b/fields/5.14.23/SettingUsw.json
new file mode 100644
index 0000000..f1cd979
--- /dev/null
+++ b/fields/5.14.23/SettingUsw.json
@@ -0,0 +1,3 @@
+{
+  "dhcp_snoop": "true|false"
+}
diff --git a/fields/5.14.23/SpatialRecord.json b/fields/5.14.23/SpatialRecord.json
new file mode 100644
index 0000000..3597403
--- /dev/null
+++ b/fields/5.14.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/5.14.23/Tag.json b/fields/5.14.23/Tag.json
new file mode 100644
index 0000000..677d265
--- /dev/null
+++ b/fields/5.14.23/Tag.json
@@ -0,0 +1,4 @@
+{
+    "name": "",
+    "member_table": [""]
+}
diff --git a/fields/5.14.23/User.json b/fields/5.14.23/User.json
new file mode 100644
index 0000000..4e23d0b
--- /dev/null
+++ b/fields/5.14.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/5.14.23/UserGroup.json b/fields/5.14.23/UserGroup.json
new file mode 100644
index 0000000..24dd313
--- /dev/null
+++ b/fields/5.14.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/5.14.23/VirtualDevice.json b/fields/5.14.23/VirtualDevice.json
new file mode 100644
index 0000000..89c900f
--- /dev/null
+++ b/fields/5.14.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/5.14.23/Wall.json b/fields/5.14.23/Wall.json
new file mode 100644
index 0000000..b14dfc1
--- /dev/null
+++ b/fields/5.14.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/5.14.23/WlanConf.json b/fields/5.14.23/WlanConf.json
new file mode 100644
index 0000000..196eb89
--- /dev/null
+++ b/fields/5.14.23/WlanConf.json
@@ -0,0 +1,68 @@
+{
+    "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": "",
+    "wlangroup_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])" ],
+    "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",
+    "element_adopt": "true|false",
+    "country_beacon": "true|false"
+}
diff --git a/fields/5.14.23/WlanGroup.json b/fields/5.14.23/WlanGroup.json
new file mode 100644
index 0000000..dbe6a81
--- /dev/null
+++ b/fields/5.14.23/WlanGroup.json
@@ -0,0 +1,10 @@
+{
+    "name":".{1,128}",
+    "loadbalance_enabled": "false|true",
+    "minrssi": "",
+    "minrssi_enabled": "true|false",
+    "loadbalance_enabled": "true|false",
+    "maxsta": "[1-9]|[1-9][0-9]|1[0-9]{2}|200|^$",
+    "b_supported": "false|true",
+    "pmf_mode": "disabled|optional|required"
+}
diff --git a/fields/api.go.tmpl b/fields/api.go.tmpl
new file mode 100644
index 0000000..1d6b545
--- /dev/null
+++ b/fields/api.go.tmpl
@@ -0,0 +1,131 @@
+{{- $structName := .StructName }}
+
+{{ define "field" }}
+	{{ .FieldName }} {{ if .IsArray }}[]{{end}}{{ .FieldType }} `json:"{{ .JSONName }}{{ if .OmitEmpty }},omitempty{{ end }}"` {{ if .FieldValidation }}// {{ .FieldValidation }}{{ end }} {{- end }}
+{{ define "field-embed" }}
+	{{ .FieldName }} {{ if .IsArray }}[]{{end}}{{ if not .Fields }}{{ .FieldType }}{{ else }}struct {
+	{{ range $fk, $fv := .Fields }}{{ if not $fv }}
+	{{ else }}{{- template "field-embed" $fv }}{{ end }}{{ end }}
+}{{ end }} `json:"{{ .JSONName }}{{ if .OmitEmpty }},omitempty{{ end }}"` {{ if .FieldValidation }}// {{ .FieldValidation }}{{ end }} {{- end }}
+// Code generated from ace.jar fields *.json files
+// DO NOT EDIT.
+
+package unifi
+
+import (
+	"context"
+	"fmt"
+)
+
+// just to fix compile issues with the import
+var (
+	_ fmt.Formatter
+	_ context.Context
+)
+
+{{ if embedTypes -}}
+{{- $k := .StructName -}}
+{{- $v :=index .Types .StructName -}}
+type {{ $k }} struct {
+	{{ range $fk, $fv := $v.Fields }}{{ if not $fv }}
+	{{ else }}{{- template "field-embed" $fv }}{{ end }}{{ end }}
+}
+{{- else -}}
+{{ range $k, $v := .Types }}
+type {{ $k }} struct {
+	{{ range $fk, $fv := $v.Fields }}{{ if not $fv }}
+	{{ else }}{{- template "field" $fv }}{{ end }}{{ end }}
+}
+{{ end }}
+{{- end -}}
+
+{{ if not .IsSetting }}
+func (c *Client) list{{ .StructName }}(ctx context.Context, site string) ([]{{ .StructName }}, error) {
+	var respBody struct {
+		Meta meta `json:"meta"`
+		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)
+	if err != nil {
+		return nil, err
+	}
+
+	return respBody.Data, nil
+}
+{{- end }}
+
+func (c *Client) get{{ .StructName }}(ctx context.Context, site{{ if not .IsSetting }}, id{{ end }} string) (*{{ .StructName }}, error) {
+	var respBody struct {
+		Meta meta `json:"meta"`
+		Data []{{ .StructName }} `json:"data"`
+	}
+{{ if .IsSetting }}
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/{{ .ResourcePath }}", site), nil, &respBody)
+{{- else }}
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/{{ if eq .StructName "Device" }}stat{{ else }}rest{{ end }}/{{ .ResourcePath }}/%s", site, id), nil, &respBody)
+{{- end }}
+	if err != nil {
+		return nil, err
+	}
+
+	if len(respBody.Data) != 1 {
+		return nil, &NotFoundError{}
+	}
+
+	d := respBody.Data[0]
+	return &d, nil
+}
+
+{{ if not .IsSetting }}
+func (c *Client) delete{{ .StructName }}(ctx context.Context, site, id string) error {
+	err := c.do(ctx, "DELETE", fmt.Sprintf("s/%s/rest/{{ .ResourcePath }}/%s", site, id), struct{}{}, nil)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *Client) create{{ .StructName }}(ctx context.Context, site string, d *{{ .StructName }}) (*{{ .StructName }}, error) {
+	var respBody struct {
+		Meta meta      `json:"meta"`
+		Data []{{ .StructName }} `json:"data"`
+	}
+
+	err := c.do(ctx, "POST", fmt.Sprintf("s/%s/rest/{{ .ResourcePath }}", site), d, &respBody)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(respBody.Data) != 1 {
+		return nil, &NotFoundError{}
+	}
+
+	new := respBody.Data[0]
+
+	return &new, nil
+}
+{{- end }}
+
+func (c *Client) update{{ .StructName }}(ctx context.Context, site string, d *{{ .StructName }}) (*{{ .StructName }}, error) {
+	var respBody struct {
+		Meta meta      `json:"meta"`
+		Data []{{ .StructName }} `json:"data"`
+	}
+{{ if .IsSetting }}
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/{{ .ResourcePath }}", site), d, &respBody)
+{{- else }}
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/rest/{{ .ResourcePath }}/%s", site, d.ID), d, &respBody)
+{{- end }}
+	if err != nil {
+		return nil, err
+	}
+
+	if len(respBody.Data) != 1 {
+		return nil, &NotFoundError{}
+	}
+
+	new := respBody.Data[0]
+
+	return &new, nil
+}
diff --git a/fields/main.go b/fields/main.go
index d3329d5..14756af 100644
--- a/fields/main.go
+++ b/fields/main.go
@@ -1,15 +1,19 @@
 package main
 
 import (
+	"bytes"
 	"encoding/json"
+	"flag"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"regexp"
-	"sort"
 	"strconv"
 	"strings"
+	"text/template"
 
 	"github.com/iancoleman/strcase"
 )
@@ -79,6 +83,76 @@ var fileReps = []replacement{
 	{"RadiusProfile", "RADIUSProfile"},
 }
 
+var embedTypes bool
+
+type Resource struct {
+	StructName   string
+	ResourcePath string
+	Types        map[string]*FieldInfo
+}
+
+type FieldInfo struct {
+	FieldName       string
+	JSONName        string
+	FieldType       string
+	FieldValidation string
+	OmitEmpty       bool
+	IsArray         bool
+	Fields          map[string]*FieldInfo
+}
+
+func NewResource(structName string, resourcePath string) *Resource {
+	baseType := NewFieldInfo(structName, resourcePath, "struct", "", false, false)
+	resource := &Resource{
+		StructName:   structName,
+		ResourcePath: resourcePath,
+		Types: map[string]*FieldInfo{
+			structName: baseType,
+		},
+	}
+
+	// Since template files iterate through map keys in sorted order, these initial fields
+	// are named such that they stay at the top for consistency. The spacer items create a
+	// blank line in the resulting generated file.
+	//
+	// This hack is here for stability of the generatd code, but can be removed if desired.
+	baseType.Fields = map[string]*FieldInfo{
+		"   ID":      NewFieldInfo("ID", "_id", "string", "", true, false),
+		"   SiteID":  NewFieldInfo("SiteID", "site_id", "string", "", true, false),
+		"   _Spacer": nil,
+
+		"  Hidden":   NewFieldInfo("Hidden", "attr_hidden", "bool", "", true, false),
+		"  HiddenID": NewFieldInfo("HiddenID", "attr_hidden_id", "string", "", true, false),
+		"  NoDelete": NewFieldInfo("NoDelete", "attr_no_delete", "bool", "", true, false),
+		"  NoEdit":   NewFieldInfo("NoEdit", "attr_no_edit", "bool", "", true, false),
+		"  _Spacer":  nil,
+
+		" _Spacer": nil,
+	}
+
+	if resource.IsSetting() {
+		resource.ResourcePath = strcase.ToSnake(strings.TrimPrefix(structName, "Setting"))
+		baseType.Fields[" Key"] = NewFieldInfo("Key", "key", "string", "", false, false)
+	}
+
+	if resource.StructName == "User" {
+		baseType.Fields[" IP"] = NewFieldInfo("IP", "ip", "string", "non-generated field", true, false)
+	}
+
+	return resource
+}
+
+func NewFieldInfo(fieldName string, jsonName string, fieldType string, fieldValidation string, omitempty bool, isArray bool) *FieldInfo {
+	return &FieldInfo{
+		FieldName:       fieldName,
+		JSONName:        jsonName,
+		FieldType:       fieldType,
+		FieldValidation: fieldValidation,
+		OmitEmpty:       omitempty,
+		IsArray:         isArray,
+	}
+}
+
 func cleanName(name string, reps []replacement) string {
 	for _, rep := range reps {
 		name = strings.ReplaceAll(name, rep.Old, rep.New)
@@ -87,16 +161,41 @@ func cleanName(name string, reps []replacement) string {
 	return name
 }
 
+func usage() {
+	fmt.Printf("Usage: %s [OPTIONS] versionDir outputDir\n", path.Base(os.Args[0]))
+	flag.PrintDefaults()
+}
+
 func main() {
-	version := os.Args[1]
-	out := os.Args[2]
+
+	flag.Usage = usage
+
+	noEmbeddedTypes := flag.Bool("no-embedded-types", false, "Whether to generate top-level type definitions for embedded type definitions")
+	flag.Parse()
+
+	versionDir := flag.Arg(0)
+	outputDir := flag.Arg(1)
+	embedTypes = !*noEmbeddedTypes
+
+	if versionDir == "" {
+		fmt.Print("error: no version directory specified\n\n")
+		usage()
+		os.Exit(1)
+	}
+
+	if outputDir == "" {
+		fmt.Print("error: no output directory specified\n\n")
+		usage()
+		os.Exit(1)
+	}
+
 	wd, err := os.Getwd()
 	if err != nil {
 		panic(err)
 	}
 
-	fieldsDir := filepath.Join(wd, version)
-	outDir := filepath.Join(wd, out)
+	fieldsDir := filepath.Join(wd, versionDir)
+	outDir := filepath.Join(wd, outputDir)
 
 	fieldsFiles, err := ioutil.ReadDir(fieldsDir)
 	if err != nil {
@@ -105,38 +204,39 @@ func main() {
 
 	for _, fieldsFile := range fieldsFiles {
 		name := fieldsFile.Name()
-
-		// if name != "WlanConf.json" {
-		// 	continue
-		// }
-
 		ext := filepath.Ext(name)
 
+		switch name {
+		case "AuthenticationRequest.json", "Setting.json", "Wall.json":
+			continue
+		}
+
 		if filepath.Ext(name) != ".json" {
 			continue
 		}
 
-		if name == "Setting.json" {
-			continue
-		}
-
-		if name == "Wall.json" {
-			continue
-		}
-
 		name = name[:len(name)-len(ext)]
 
 		urlPath := strings.ToLower(name)
 		structName := cleanName(name, fileReps)
 
 		goFile := strcase.ToSnake(structName) + ".generated.go"
-		code, err := generateCode(filepath.Join(fieldsDir, fieldsFile.Name()), structName, urlPath)
+		fieldsFilePath := filepath.Join(fieldsDir, fieldsFile.Name())
+		b, err := ioutil.ReadFile(fieldsFilePath)
 		if err != nil {
 			fmt.Printf("skipping file %s: %s", fieldsFile.Name(), err)
 			continue
-			// panic(err)
 		}
 
+		resource := NewResource(structName, urlPath)
+		err = resource.processJSON(b)
+		if err != nil {
+			fmt.Printf("skipping file %s: %s", fieldsFile.Name(), err)
+			continue
+		}
+
+		code, _ := resource.generateCode()
+
 		_ = os.Remove(filepath.Join(outDir, goFile))
 		ioutil.WriteFile(filepath.Join(outDir, goFile), ([]byte)(code), 0644)
 	}
@@ -144,174 +244,144 @@ func main() {
 	fmt.Printf("%s\n", outDir)
 }
 
-func generateCode(fieldsFile string, structName string, urlPath string) (string, error) {
-	b, err := ioutil.ReadFile(fieldsFile)
-	if err != nil {
-		return "", err
-	}
+func (r *Resource) IsSetting() bool {
+	return strings.HasPrefix(r.StructName, "Setting")
+}
 
-	var fields map[string]interface{}
-	err = json.Unmarshal(b, &fields)
-	if err != nil {
-		return "", err
-	}
-
-	code := fmt.Sprintf(`// Code generated from ace.jar fields *.json files
-// DO NOT EDIT.
-
-package unifi
-
-import (
-	"context"
-	"fmt"
-)
-
-// just to fix compile issues with the import
-var (
-	_ fmt.Formatter
-	_ context.Context
-)
-
-type %s struct {
-	ID     string `+"`json:\"_id,omitempty\"`"+`
-	SiteID string `+"`json:\"site_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\"`"+`
-
-`, structName)
-
-	fieldNames := []string{}
-	for name := range fields {
-		fieldNames = append(fieldNames, name)
-	}
-
-	// TODO: sort by normalized name, not this name
-	sort.Strings(fieldNames)
-
-	for _, name := range fieldNames {
-		switch {
-		case structName == "Account" && name == "ip":
-			code += "\tIP string `json:\"ip,omitempty\"`\n"
-			continue
-		case structName == "SettingUsg" && strings.HasSuffix(name, "_timeout"):
-			field := strcase.ToCamel(name)
-			field = cleanName(field, fieldReps)
-			code += fmt.Sprintf("\t%s int `json:\"%s,omitempty\"`\n", field, name)
-			continue
-		case structName == "User" && name == "blocked":
-			code += "\tBlocked bool `json:\"blocked,omitempty\"`\n"
-			continue
-		case structName == "User" && name == "last_seen":
-			code += "\tLastSeen int `json:\"last_seen,omitempty\"`\n"
-			continue
-		}
-
-		validation := fields[name]
-		fieldCode, err := generateField(name, validation)
+func (r *Resource) processFields(fields map[string]interface{}) {
+	t := r.Types[r.StructName]
+	for name, validation := range fields {
+		fieldInfo, err := r.fieldInfoFromValidation(name, validation)
 		if err != nil {
-			return "", err
+			continue
 		}
-		code += fieldCode + "\n"
+
+		switch {
+		case r.StructName == "Account" && name == "ip":
+			fieldInfo.OmitEmpty = true
+		case r.StructName == "Device" && name == "stp_priority":
+			fieldInfo.OmitEmpty = true
+			fieldInfo.FieldType = "string"
+		case r.StructName == "Device" && (name == "x" || name == "y"):
+			fieldInfo.OmitEmpty = true
+			fieldInfo.FieldType = "int"
+		case r.StructName == "Device":
+			fieldInfo.OmitEmpty = true
+		case r.StructName == "SettingUsg" && strings.HasSuffix(name, "_timeout") && name != "arp_cache_timeout":
+			fieldInfo.FieldType = "int"
+		case r.StructName == "User" && name == "blocked":
+			fieldInfo.FieldType = "bool"
+		case r.StructName == "User" && name == "last_seen":
+			fieldInfo.FieldType = "int"
+		}
+
+		t.Fields[fieldInfo.FieldName] = fieldInfo
 	}
-
-	switch structName {
-	case "User":
-		code += "\t// non-generated fields\n\tIP string `json:\"ip,omitempty\"`\n"
-	}
-
-	code = code + "}\n"
-
-	if strings.HasPrefix(structName, "Setting") {
-		return code, nil
-	}
-
-	code = code + fmt.Sprintf(`
-func (c *Client) list%[1]s(ctx context.Context, site string) ([]%[1]s, error) {
-	var respBody struct {
-		Meta meta `+"`"+`json:"meta"`+"`"+`
-		Data []%[1]s `+"`"+`json:"data"`+"`"+`
-	}
-
-	err := c.do(ctx, "GET", fmt.Sprintf("s/%%s/rest/%[2]s", site), nil, &respBody)
-	if err != nil {
-		return nil, err
-	}
-
-	return respBody.Data, nil
 }
 
-func (c *Client) get%[1]s(ctx context.Context, site, id string) (*%[1]s, error) {
-	var respBody struct {
-		Meta meta `+"`"+`json:"meta"`+"`"+`
-		Data []%[1]s `+"`"+`json:"data"`+"`"+`
+func (r *Resource) fieldInfoFromValidation(name string, validation interface{}) (f *FieldInfo, err error) {
+	fieldName := strcase.ToCamel(name)
+	fieldName = cleanName(fieldName, fieldReps)
+
+	empty := &FieldInfo{}
+
+	switch validation := validation.(type) {
+	case []interface{}:
+		if len(validation) == 0 {
+			return NewFieldInfo(fieldName, name, "string", "", false, true), nil
+		}
+		if len(validation) > 1 {
+			return empty, fmt.Errorf("unknown validation %#v", validation)
+		}
+
+		fieldInfo, err := r.fieldInfoFromValidation(name, validation[0])
+		if err != nil {
+			return empty, err
+		}
+
+		fieldInfo.OmitEmpty = true
+		fieldInfo.IsArray = true
+
+		return fieldInfo, nil
+	case map[string]interface{}:
+		typeName := r.StructName + "_" + fieldName
+
+		result := NewFieldInfo(fieldName, name, typeName, "", true, false)
+		result.Fields = make(map[string]*FieldInfo)
+
+		for name, fv := range validation {
+			child, err := r.fieldInfoFromValidation(name, fv)
+			if err != nil {
+				return empty, err
+			}
+
+			result.Fields[child.FieldName] = child
+		}
+
+		r.Types[typeName] = result
+		return result, nil
+
+	case string:
+		fieldValidation := validation
+		normalized := normalizeValidation(validation)
+
+		omitEmpty := r.StructName == "Device"
+
+		switch {
+		case normalized == "falsetrue" || normalized == "truefalse":
+			return NewFieldInfo(fieldName, name, "bool", "", omitEmpty, false), nil
+		default:
+			if _, err := strconv.ParseFloat(normalized, 64); err == nil {
+				if normalized == "09" || normalized == "09.09" {
+					fieldValidation = ""
+				}
+
+				if strings.Contains(normalized, ".") {
+					if strings.Contains(validation, "\\.){3}") {
+						break
+					}
+
+					return NewFieldInfo(fieldName, name, "float64", fieldValidation, true, false), nil
+				}
+
+				return NewFieldInfo(fieldName, name, "int", fieldValidation, true, false), nil
+			}
+		}
+		if validation != "" && normalized != "" {
+			fmt.Printf("normalize %q to %q\n", validation, normalized)
+		}
+
+		omitEmpty = omitEmpty || (!strings.Contains(validation, "^$") && !strings.HasSuffix(fieldName, "ID"))
+		return NewFieldInfo(fieldName, name, "string", fieldValidation, omitEmpty, false), nil
 	}
 
-	err := c.do(ctx, "GET", fmt.Sprintf("s/%%s/rest/%[2]s/%%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
+	return empty, fmt.Errorf("unable to determine type from validation %q", validation)
 }
 
-func (c *Client) delete%[1]s(ctx context.Context, site, id string) error {
-	err := c.do(ctx, "DELETE", fmt.Sprintf("s/%%s/rest/%[2]s/%%s", site, id), struct{}{}, nil)
+func (r *Resource) processJSON(b []byte) error {
+	var fields map[string]interface{}
+	err := json.Unmarshal(b, &fields)
 	if err != nil {
 		return err
 	}
+
+	r.processFields(fields)
+
 	return nil
 }
 
-func (c *Client) create%[1]s(ctx context.Context, site string, d *%[1]s) (*%[1]s, error) {
-	var respBody struct {
-		Meta meta `+"`"+`json:"meta"`+"`"+`
-		Data []%[1]s `+"`"+`json:"data"`+"`"+`
-	}
+func (r *Resource) generateCode() (string, error) {
+	var err error
+	var buf bytes.Buffer
+	writer := io.Writer(&buf)
 
-	err := c.do(ctx, "POST", fmt.Sprintf("s/%%s/rest/%[2]s", site), d, &respBody)
-	if err != nil {
-		return nil, err
-	}
+	tpl := template.Must(template.New("api.go.tmpl").Funcs(template.FuncMap{
+		"embedTypes": func() bool { return embedTypes },
+	}).ParseFiles("api.go.tmpl"))
 
-	if len(respBody.Data) != 1 {
-		return nil, &NotFoundError{}
-	}
+	tpl.Execute(writer, r)
 
-	new := respBody.Data[0]
-
-	return &new, nil
-}
-
-func (c *Client) update%[1]s(ctx context.Context, site string, d *%[1]s) (*%[1]s, error) {
-	var respBody struct {
-		Meta meta `+"`"+`json:"meta"`+"`"+`
-		Data []%[1]s `+"`"+`json:"data"`+"`"+`
-	}
-
-	err := c.do(ctx, "PUT", fmt.Sprintf("s/%%s/rest/%[2]s/%%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
-}
-`, structName, urlPath)
-
-	return code, nil
+	return buf.String(), err
 }
 
 func normalizeValidation(re string) string {
@@ -333,96 +403,3 @@ func normalizeValidation(re string) string {
 
 	return re
 }
-
-func typeFromValidation(validation interface{}) (ty string, comment string, omitempty bool, err error) {
-	switch validation := validation.(type) {
-	case []interface{}:
-		if len(validation) == 0 {
-			return "[]string", "", false, nil
-		}
-		if len(validation) > 1 {
-			return "", "", false, fmt.Errorf("unknown validation %#v", validation)
-		}
-		elementType, elementComment, _, err := typeFromValidation(validation[0])
-		if err != nil {
-			return "", "", false, err
-		}
-		return fmt.Sprintf("[]%s", elementType), elementComment, true, nil
-	case map[string]interface{}:
-		fieldNames := []string{}
-		fieldCodes := map[string]string{}
-		for name, fv := range validation {
-			fieldNames = append(fieldNames, name)
-			fieldCode, err := generateField(name, fv)
-			if err != nil {
-				return "", "", false, err
-			}
-			fieldCodes[name] = fieldCode
-		}
-
-		// TODO: sort by normalized name, not this name
-		sort.Strings(fieldNames)
-
-		code := "struct {\n"
-		for _, name := range fieldNames {
-			code += fieldCodes[name] + "\n"
-		}
-		code += "\n}"
-
-		return code, "", false, nil
-	case string:
-		comment := validation
-		normalized := normalizeValidation(validation)
-		allowEmpty := strings.HasSuffix(validation, "|^$") || strings.HasPrefix(validation, "^$|")
-		switch {
-		case normalized == "falsetrue" || normalized == "truefalse":
-			return "bool", "", false, nil
-		default:
-			if _, err := strconv.ParseFloat(normalized, 64); err == nil {
-				if normalized == "09" || normalized == "09.09" {
-					comment = ""
-				}
-
-				if strings.Contains(normalized, ".") {
-					if strings.Contains(validation, "\\.){3}") {
-						break
-					}
-
-					return "float64", comment, true, nil
-				}
-
-				return "int", comment, true, nil
-			}
-		}
-		if validation != "" && normalized != "" {
-			fmt.Printf("normalize %q to %q\n", validation, normalized)
-		}
-		return "string", validation, !allowEmpty, nil
-	}
-	return "", "", false, fmt.Errorf("unable to determine type from validation %q", validation)
-}
-
-func generateField(name string, validation interface{}) (string, error) {
-	field := strcase.ToCamel(name)
-	field = cleanName(field, fieldReps)
-	fieldType, comment, omitempty, err := typeFromValidation(validation)
-	if err != nil {
-		return "", err
-	}
-
-	comment = strings.TrimSpace(fmt.Sprintf("// %s", comment))
-	if comment == "//" {
-		comment = ""
-	}
-
-	if fieldType == "string" && strings.HasSuffix(field, "ID") {
-		omitempty = false
-	}
-
-	omitemptyCode := ""
-	if omitempty {
-		omitemptyCode = ",omitempty"
-	}
-
-	return fmt.Sprintf("\t%s %s `json:\"%s%s\"` %s", field, fieldType, name, omitemptyCode, comment), nil
-}
diff --git a/fields/main_test.go b/fields/main_test.go
index 28a924c..31d5040 100644
--- a/fields/main_test.go
+++ b/fields/main_test.go
@@ -2,10 +2,11 @@ package main
 
 import (
 	"fmt"
+	assert "github.com/stretchr/testify/assert"
 	"testing"
 )
 
-func TestTypeFromValidation(t *testing.T) {
+func TestFieldInfoFromValidation(t *testing.T) {
 	for i, c := range []struct {
 		expectedType      string
 		expectedComment   string
@@ -17,7 +18,7 @@ func TestTypeFromValidation(t *testing.T) {
 		{"string", ".{0,32}", true, ".{0,32}"},
 		{"string", "^(([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])$|^$", false, "^(([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])$|^$"},
 
-		{"int", "^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$", false, "^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$"},
+		{"int", "^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$", true, "^([1-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^$"},
 		{"int", "", true, "^[0-9]*$"},
 
 		{"float64", "", true, "[-+]?[0-9]*\\.?[0-9]+"},
@@ -29,19 +30,113 @@ func TestTypeFromValidation(t *testing.T) {
 		{"bool", "", false, "true|false"},
 	} {
 		t.Run(fmt.Sprintf("%d %s %s", i, c.expectedType, c.validation), func(t *testing.T) {
-			actualType, actualComment, actualOmitEmpty, err := typeFromValidation(c.validation)
+			resource := &Resource{StructName: "TestType", Types: make(map[string]*FieldInfo)}
+			fieldInfo, err := resource.fieldInfoFromValidation("fieldName", c.validation)
+			//actualType, actualComment, actualOmitEmpty, err := fieldInfoFromValidation(c.validation)
 			if err != nil {
 				t.Fatal(err)
 			}
-			if actualType != c.expectedType {
-				t.Fatalf("expected type %q got %q", c.expectedType, actualType)
+			if fieldInfo.FieldType != c.expectedType {
+				t.Fatalf("expected type %q got %q", c.expectedType, fieldInfo.FieldType)
 			}
-			if actualComment != c.expectedComment {
-				t.Fatalf("expected comment %q got %q", c.expectedComment, actualComment)
+			if fieldInfo.FieldValidation != c.expectedComment {
+				t.Fatalf("expected comment %q got %q", c.expectedComment, fieldInfo.FieldValidation)
 			}
-			if actualOmitEmpty != c.expectedOmitEmpty {
-				t.Fatalf("expected omitempty %t got %t", c.expectedOmitEmpty, actualOmitEmpty)
+			if fieldInfo.OmitEmpty != c.expectedOmitEmpty {
+				t.Fatalf("expected omitempty %t got %t", c.expectedOmitEmpty, fieldInfo.OmitEmpty)
 			}
 		})
 	}
 }
+
+func TestResourceTypes(t *testing.T) {
+	testData := `
+{
+  "note": ".{0,1024}",
+  "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?$",
+  "mac": "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$",
+  "number": "\\d+",
+  "boolean": "true|false",
+	"nested_type": {
+    "nested_field": "^$"
+  },
+  "nested_type_array": [{
+    "nested_field": "^$"
+  }]
+}
+	`
+	expectedFields := map[string]*FieldInfo{
+		"Note":    NewFieldInfo("Note", "note", "string", ".{0,1024}", true, false),
+		"Date":    NewFieldInfo("Date", "date", "string", "^$|^(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?$", false, false),
+		"MAC":     NewFieldInfo("MAC", "mac", "string", "^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$", true, false),
+		"Number":  NewFieldInfo("Number", "number", "int", "", true, false),
+		"Boolean": NewFieldInfo("Boolean", "boolean", "bool", "", false, false),
+		"NestedType": &FieldInfo{
+			FieldName:       "NestedType",
+			JSONName:        "nested_type",
+			FieldType:       "Struct_NestedType",
+			FieldValidation: "",
+			OmitEmpty:       true,
+			IsArray:         false,
+			Fields: map[string]*FieldInfo{
+				"NestedField": NewFieldInfo("NestedField", "nested_field", "string", "^$", false, false),
+			},
+		},
+		"NestedTypeArray": &FieldInfo{
+			FieldName:       "NestedTypeArray",
+			JSONName:        "nested_type_array",
+			FieldType:       "Struct_NestedTypeArray",
+			FieldValidation: "",
+			OmitEmpty:       true,
+			IsArray:         true,
+			Fields: map[string]*FieldInfo{
+				"NestedField": NewFieldInfo("NestedField", "nested_field", "string", "^$", false, false),
+			},
+		},
+	}
+
+	expectedStruct := map[string]*FieldInfo{
+		"Struct": &FieldInfo{
+			FieldName:       "Struct",
+			JSONName:        "path",
+			FieldType:       "struct",
+			FieldValidation: "",
+			OmitEmpty:       false,
+			IsArray:         false,
+			Fields: map[string]*FieldInfo{
+				"   ID":      NewFieldInfo("ID", "_id", "string", "", true, false),
+				"   SiteID":  NewFieldInfo("SiteID", "site_id", "string", "", true, false),
+				"   _Spacer": nil,
+				"  Hidden":   NewFieldInfo("Hidden", "attr_hidden", "bool", "", true, false),
+				"  HiddenID": NewFieldInfo("HiddenID", "attr_hidden_id", "string", "", true, false),
+				"  NoDelete": NewFieldInfo("NoDelete", "attr_no_delete", "bool", "", true, false),
+				"  NoEdit":   NewFieldInfo("NoEdit", "attr_no_edit", "bool", "", true, false),
+				"  _Spacer":  nil,
+				" _Spacer":   nil,
+			},
+		},
+	}
+
+	for k, v := range expectedFields {
+		expectedStruct["Struct"].Fields[k] = v
+	}
+
+	expectation := &Resource{
+		StructName:   "Struct",
+		ResourcePath: "path",
+
+		Types: map[string]*FieldInfo{
+			"Struct":                 expectedStruct["Struct"],
+			"Struct_NestedType":      expectedStruct["Struct"].Fields["NestedType"],
+			"Struct_NestedTypeArray": expectedStruct["Struct"].Fields["NestedTypeArray"],
+		},
+	}
+
+	t.Run("structural test", func(t *testing.T) {
+		resource := NewResource("Struct", "path")
+		err := resource.processJSON(([]byte)(testData))
+
+		assert.Empty(t, err, "No error processing JSON")
+		assert.Equal(t, expectation, resource)
+	})
+}
diff --git a/fields/settings.sh b/fields/settings.sh
old mode 100644
new mode 100755
index 8196406..90d865c
--- a/fields/settings.sh
+++ b/fields/settings.sh
@@ -1,10 +1,11 @@
-#! /bin/bash
+#!/usr/bin/env bash
 
 ver="$1"
 keys=$(jq -r keys[] "$ver/Setting.json")
 
 while IFS= read -r key; do
-    fn="$(echo $key | sed -r 's/(^|_)([a-z])/\U\2/g')"
+    readarray -td ' ' arr <<< "${key//_/ }"
+    fn=$(printf %s "${arr[@]^}")
     echo "... $key $fn ..."
     jq ".$key" "$ver/Setting.json" > "$ver/Setting$fn.json"
-done <<< "$keys"
\ No newline at end of file
+done <<< "$keys"
diff --git a/go.mod b/go.mod
index 711b22b..cda951c 100644
--- a/go.mod
+++ b/go.mod
@@ -4,5 +4,7 @@ go 1.12
 
 require (
 	github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334
+	github.com/stretchr/testify v1.6.1
 	github.com/tj/assert v0.0.3
+	golang.org/x/tools/gopls v0.4.4 // indirect
 )
diff --git a/go.sum b/go.sum
index 80d3d8a..3ffd19b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,19 +1,79 @@
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 h1:VHgatEHNcBFEB7inlalqfNqw65aNkM1lGX2yt3NmbS8=
 github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+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/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=
+github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk=
 github.com/tj/assert v0.0.3/go.mod h1:Ne6X72Q+TB1AteidzQncjw9PabbMp4PBMZ1k+vd1Pvk=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200729181040-64cdafbe085c h1:jLQLIAedRoS9I2Py7l/ZAGGzUxLFsdg42JXEpS/a+ow=
+golang.org/x/tools v0.0.0-20200729181040-64cdafbe085c/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65 h1:DajXNh69ob79PCQz1N7OHxmqq6ASZC5xAnJJWIQGR6I=
+golang.org/x/tools/gopls v0.4.4 h1:8djGYsaZ0ByP0vaXg4T+mnyfDcHpWKSZ+tpQSGv9ahk=
+golang.org/x/tools/gopls v0.4.4/go.mod h1:zhyGzA+CAtREUwwq/btQxEx2FHnGzDwJvGs5YqdVCbE=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
 gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f h1:gi7cb8HTDZ6q8VqsUpkdoFi3vxwHMneQ6+Q5Ap5hjPE=
+mvdan.cc/gofumpt v0.0.0-20200709182408-4fd085cb6d5f/go.mod h1:9VQ397fNXEnF84t90W4r4TRCQK+pg9f8ugVfyj+S26w=
+mvdan.cc/xurls/v2 v2.2.0 h1:NSZPykBXJFCetGZykLAxaL6SIpvbVy/UFEniIfHAa8A=
+mvdan.cc/xurls/v2 v2.2.0/go.mod h1:EV1RMtya9D6G5DMYPGD8zTQzaHet6Jh8gFlRgGRJeO8=
diff --git a/unifi/account.generated.go b/unifi/account.generated.go
index 494d183..6419fe8 100644
--- a/unifi/account.generated.go
+++ b/unifi/account.generated.go
@@ -23,7 +23,7 @@ type Account struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
-	IP               string `json:"ip,omitempty"`
+	IP               string `json:"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])$|^$
 	Name             string `json:"name,omitempty"`               // ^[^"' ]+$
 	TunnelConfigType string `json:"tunnel_config_type,omitempty"` // vpn|802.1x|custom
 	TunnelMediumType int    `json:"tunnel_medium_type,omitempty"` // [1-9]|1[0-5]|^$
diff --git a/unifi/channel_plan.generated.go b/unifi/channel_plan.generated.go
index 863e7d7..cc71614 100644
--- a/unifi/channel_plan.generated.go
+++ b/unifi/channel_plan.generated.go
@@ -27,14 +27,12 @@ type ChannelPlan struct {
 		Channel   int    `json:"channel,omitempty"`   // 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
 		MAC       string `json:"mac,omitempty"`       // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$
 		Timestamp int    `json:"timestamp,omitempty"` // [1-9][0-9]{12}
-
 	} `json:"ap_blacklisted_channels,omitempty"`
 	ConfSource string `json:"conf_source,omitempty"` // manual|radio-ai
 	Coupling   []struct {
 		Rssi   int    `json:"rssi,omitempty"`
 		Source string `json:"source,omitempty"` // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2}).*$
 		Target string `json:"target,omitempty"` // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2}).*$
-
 	} `json:"coupling,omitempty"`
 	Date       string  `json:"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    float64 `json:"fitness,omitempty"`
@@ -48,7 +46,6 @@ type ChannelPlan struct {
 		TxPower       string `json:"tx_power,omitempty"`       // [\d]+|auto
 		TxPowerMode   string `json:"tx_power_mode,omitempty"`  // auto|medium|high|low|custom
 		Width         int    `json:"width,omitempty"`          // 20|40|80|160
-
 	} `json:"radio_table,omitempty"`
 	Satisfaction      float64 `json:"satisfaction,omitempty"`
 	SatisfactionTable []struct {
@@ -58,7 +55,6 @@ type ChannelPlan struct {
 	SiteBlacklistedChannels []struct {
 		Channel   int `json:"channel,omitempty"`   // 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 int `json:"timestamp,omitempty"` // [1-9][0-9]{12}
-
 	} `json:"site_blacklisted_channels,omitempty"`
 }
 
diff --git a/unifi/device.generated.go b/unifi/device.generated.go
index 261286b..c2c669f 100644
--- a/unifi/device.generated.go
+++ b/unifi/device.generated.go
@@ -23,114 +23,111 @@ type Device struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
-	AtfEnabled       bool   `json:"atf_enabled"`
+	AtfEnabled       bool   `json:"atf_enabled,omitempty"`
 	BandsteeringMode string `json:"bandsteering_mode,omitempty"` // off|equal|prefer_5g
 	BaresipAuthUser  string `json:"baresip_auth_user,omitempty"` // ^\+?[a-zA-Z0-9_.\-!~*'()]*
-	BaresipEnabled   bool   `json:"baresip_enabled"`
+	BaresipEnabled   bool   `json:"baresip_enabled,omitempty"`
 	BaresipExtension string `json:"baresip_extension,omitempty"` // ^\+?[a-zA-Z0-9_.\-!~*'()]*
 	ConfigNetwork    struct {
-		BondingEnabled bool   `json:"bonding_enabled"`
-		DNS1           string `json:"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           string `json:"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]))$|^$
+		BondingEnabled bool   `json:"bonding_enabled,omitempty"`
+		DNS1           string `json:"dns1,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])$|^(([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           string `json:"dns2,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])$|^(([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      string `json:"dnssuffix,omitempty"`
-		Gateway        string `json:"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])$|^$
+		Gateway        string `json:"gateway,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])$|^$
 		IP             string `json:"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])$
 		Netmask        string `json:"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)))))$
 		Type           string `json:"type,omitempty"`    // dhcp|static
-
-	} `json:"config_network"`
-	Disabled               bool   `json:"disabled"`
-	Dot1XFallbackNetworkID string `json:"dot1x_fallback_networkconf_id"` // [\d\w]+|
-	Dot1XPortctrlEnabled   bool   `json:"dot1x_portctrl_enabled"`
-	DPIEnabled             bool   `json:"dpi_enabled"`
+	} `json:"config_network,omitempty"`
+	DPIEnabled             bool   `json:"dpi_enabled,omitempty"`
+	Disabled               bool   `json:"disabled,omitempty"`
+	Dot1XFallbackNetworkID string `json:"dot1x_fallback_networkconf_id,omitempty"` // [\d\w]+|
+	Dot1XPortctrlEnabled   bool   `json:"dot1x_portctrl_enabled,omitempty"`
 	EthernetOverrides      []struct {
 		Ifname       string `json:"ifname,omitempty"`       // eth[0-9]{1,2}
 		NetworkGroup string `json:"networkgroup,omitempty"` // LAN[2-8]?|WAN[2]?
-
 	} `json:"ethernet_overrides,omitempty"`
-	FlowctrlEnabled            bool    `json:"flowctrl_enabled"`
+	FlowctrlEnabled            bool    `json:"flowctrl_enabled,omitempty"`
 	HeightInMeters             float64 `json:"heightInMeters,omitempty"`
-	JumboframeEnabled          bool    `json:"jumboframe_enabled"`
+	JumboframeEnabled          bool    `json:"jumboframe_enabled,omitempty"`
 	LcmBrightness              int     `json:"lcm_brightness,omitempty"` // [1-9]|[1-9][0-9]|100
-	LcmBrightnessOverride      bool    `json:"lcm_brightness_override"`
+	LcmBrightnessOverride      bool    `json:"lcm_brightness_override,omitempty"`
 	LcmIDleTimeout             int     `json:"lcm_idle_timeout,omitempty"` // [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
-	LcmIDleTimeoutOverride     bool    `json:"lcm_idle_timeout_override"`
-	LcmTrackerEnabled          bool    `json:"lcm_tracker_enabled"`
+	LcmIDleTimeoutOverride     bool    `json:"lcm_idle_timeout_override,omitempty"`
+	LcmTrackerEnabled          bool    `json:"lcm_tracker_enabled,omitempty"`
 	LcmTrackerSeed             string  `json:"lcm_tracker_seed,omitempty"`              // .{0,50}
 	LedOverride                string  `json:"led_override,omitempty"`                  // default|on|off
 	LedOverrideColor           string  `json:"led_override_color,omitempty"`            // ^#(?:[0-9a-fA-F]{3}){1,2}$
 	LedOverrideColorBrightness int     `json:"led_override_color_brightness,omitempty"` // ^[0-9][0-9]?$|^100$
-	Locked                     bool    `json:"locked"`
-	LteExtAnt                  bool    `json:"lte_ext_ant"`
-	LtePoe                     bool    `json:"lte_poe"`
+	Locked                     bool    `json:"locked,omitempty"`
+	LteExtAnt                  bool    `json:"lte_ext_ant,omitempty"`
+	LtePoe                     bool    `json:"lte_poe,omitempty"`
 	LteSoftLimit               int     `json:"lte_soft_limit,omitempty"`
-	MapID                      string  `json:"map_id"`
-	MeshStaVapEnabled          bool    `json:"mesh_sta_vap_enabled"`
-	MgmtNetworkID              string  `json:"mgmt_network_id"`                 // [\d\w]+
+	MapID                      string  `json:"map_id,omitempty"`
+	MeshStaVapEnabled          bool    `json:"mesh_sta_vap_enabled,omitempty"`
+	MgmtNetworkID              string  `json:"mgmt_network_id,omitempty"`       // [\d\w]+
 	Name                       string  `json:"name,omitempty"`                  // .{1,128}
 	OutdoorModeOverride        string  `json:"outdoor_mode_override,omitempty"` // default|on|off
-	OutletCycleEnabled         bool    `json:"outlet_cycle_enabled"`
+	OutletCycleEnabled         bool    `json:"outlet_cycle_enabled,omitempty"`
 	OutletOverrides            []struct {
 		Index      int  `json:"index,omitempty"`
-		RelayState bool `json:"relay_state"`
+		RelayState bool `json:"relay_state,omitempty"`
 	} `json:"outlet_overrides,omitempty"`
 	PortOverrides []struct {
 		AggregateNumPorts            int      `json:"aggregate_num_ports,omitempty"` // [2-6]
-		Autoneg                      bool     `json:"autoneg"`
+		Autoneg                      bool     `json:"autoneg,omitempty"`
 		Dot1XCtrl                    string   `json:"dot1x_ctrl,omitempty"`             // auto|force_authorized|force_unauthorized|mac_based|multi_host
 		EgressRateLimitKbps          int      `json:"egress_rate_limit_kbps,omitempty"` // 6[4-9]|[7-9][0-9]|[1-9][0-9]{2,6}
-		EgressRateLimitKbpsEnabled   bool     `json:"egress_rate_limit_kbps_enabled"`
-		FullDuplex                   bool     `json:"full_duplex"`
-		Isolation                    bool     `json:"isolation"`
-		LldpmedEnabled               bool     `json:"lldpmed_enabled"`
-		LldpmedNotifyEnabled         bool     `json:"lldpmed_notify_enabled"`
+		EgressRateLimitKbpsEnabled   bool     `json:"egress_rate_limit_kbps_enabled,omitempty"`
+		FullDuplex                   bool     `json:"full_duplex,omitempty"`
+		Isolation                    bool     `json:"isolation,omitempty"`
+		LldpmedEnabled               bool     `json:"lldpmed_enabled,omitempty"`
+		LldpmedNotifyEnabled         bool     `json:"lldpmed_notify_enabled,omitempty"`
 		MirrorPortIDX                int      `json:"mirror_port_idx,omitempty"` // [1-9]|[1-4][0-9]|5[0-2]
 		Name                         string   `json:"name,omitempty"`            // .{0,128}
 		OpMode                       string   `json:"op_mode,omitempty"`         // switch|mirror|aggregate
 		PoeMode                      string   `json:"poe_mode,omitempty"`        // auto|pasv24|passthrough|off
 		PortIDX                      int      `json:"port_idx,omitempty"`        // [1-9]|[1-4][0-9]|5[0-2]
-		PortSecurityEnabled          bool     `json:"port_security_enabled"`
+		PortSecurityEnabled          bool     `json:"port_security_enabled,omitempty"`
 		PortSecurityMACAddress       []string `json:"port_security_mac_address,omitempty"` // ^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$
-		PortconfID                   string   `json:"portconf_id"`                         // [\d\w]+
+		PortconfID                   string   `json:"portconf_id,omitempty"`               // [\d\w]+
 		PriorityQueue1Level          int      `json:"priority_queue1_level,omitempty"`     // [0-9]|[1-9][0-9]|100
 		PriorityQueue2Level          int      `json:"priority_queue2_level,omitempty"`     // [0-9]|[1-9][0-9]|100
 		PriorityQueue3Level          int      `json:"priority_queue3_level,omitempty"`     // [0-9]|[1-9][0-9]|100
 		PriorityQueue4Level          int      `json:"priority_queue4_level,omitempty"`     // [0-9]|[1-9][0-9]|100
 		Speed                        int      `json:"speed,omitempty"`                     // 10|100|1000|2500|5000|10000|20000|25000|40000|50000|100000
-		StormctrlBroadcastastEnabled bool     `json:"stormctrl_bcast_enabled"`
+		StormctrlBroadcastastEnabled bool     `json:"stormctrl_bcast_enabled,omitempty"`
 		StormctrlBroadcastastLevel   int      `json:"stormctrl_bcast_level,omitempty"` // [0-9]|[1-9][0-9]|100
 		StormctrlBroadcastastRate    int      `json:"stormctrl_bcast_rate,omitempty"`  // [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
-		StormctrlMcastEnabled        bool     `json:"stormctrl_mcast_enabled"`
+		StormctrlMcastEnabled        bool     `json:"stormctrl_mcast_enabled,omitempty"`
 		StormctrlMcastLevel          int      `json:"stormctrl_mcast_level,omitempty"` // [0-9]|[1-9][0-9]|100
 		StormctrlMcastRate           int      `json:"stormctrl_mcast_rate,omitempty"`  // [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
 		StormctrlType                string   `json:"stormctrl_type,omitempty"`        // level|rate
-		StormctrlUcastEnabled        bool     `json:"stormctrl_ucast_enabled"`
+		StormctrlUcastEnabled        bool     `json:"stormctrl_ucast_enabled,omitempty"`
 		StormctrlUcastLevel          int      `json:"stormctrl_ucast_level,omitempty"` // [0-9]|[1-9][0-9]|100
 		StormctrlUcastRate           int      `json:"stormctrl_ucast_rate,omitempty"`  // [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
-		StpPortMode                  bool     `json:"stp_port_mode"`
+		StpPortMode                  bool     `json:"stp_port_mode,omitempty"`
 	} `json:"port_overrides,omitempty"`
 	PowerSourceCtrl        string `json:"power_source_ctrl,omitempty"` // auto|8023af|8023at|8023bt-type3|8023bt-type4|pasv24|poe-injector|ac|adapter|dc|rps
-	PowerSourceCtrlEnabled bool   `json:"power_source_ctrl_enabled"`
+	PowerSourceCtrlEnabled bool   `json:"power_source_ctrl_enabled,omitempty"`
+	RADIUSProfileID        string `json:"radiusprofile_id,omitempty"`
 	RadioTable             []struct {
 		AntennaGain           int    `json:"antenna_gain,omitempty"`   // ^-?([0-9]|[1-9][0-9])
 		AntennaID             int    `json:"antenna_id,omitempty"`     // -1|[0-9]
 		BackupChannel         string `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               string `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"`
+		HardNoiseFloorEnabled bool   `json:"hard_noise_floor_enabled,omitempty"`
 		Ht                    int    `json:"ht,omitempty"`       // 20|40|80|160|1080|2160
 		MinRssi               int    `json:"min_rssi,omitempty"` // ^-([1-9]|[1-8][0-9]|9[0-4])$
-		MinRssiEnabled        bool   `json:"min_rssi_enabled"`
+		MinRssiEnabled        bool   `json:"min_rssi_enabled,omitempty"`
 		Name                  string `json:"name,omitempty"`
 		Radio                 string `json:"radio,omitempty"`      // ng|na|ad
 		SensLevel             int    `json:"sens_level,omitempty"` // ^-([5-8][0-9]|90)$
-		SensLevelEnabled      bool   `json:"sens_level_enabled"`
+		SensLevelEnabled      bool   `json:"sens_level_enabled,omitempty"`
 		TxPower               string `json:"tx_power,omitempty"`      // [\d]+|auto
 		TxPowerMode           string `json:"tx_power_mode,omitempty"` // auto|medium|high|low|custom
-		VwireEnabled          bool   `json:"vwire_enabled"`
-		WLANGroupID           string `json:"wlangroup_id"` // [\d\w]+
-
+		VwireEnabled          bool   `json:"vwire_enabled,omitempty"`
+		WLANGroupID           string `json:"wlangroup_id,omitempty"` // [\d\w]+
 	} `json:"radio_table,omitempty"`
-	RADIUSProfileID string `json:"radiusprofile_id"`
 	ResetbtnEnabled string `json:"resetbtn_enabled,omitempty"` // on|off
 	RpsOverride     struct {
 		PowerManagementMode string `json:"power_management_mode,omitempty"` // dynamic|static
@@ -138,32 +135,30 @@ type Device struct {
 			Name     string `json:"name,omitempty"`      // .{0,32}
 			PortIDX  int    `json:"port_idx,omitempty"`  // [1-6]
 			PortMode string `json:"port_mode,omitempty"` // auto|force_active|manual|disabled
-
 		} `json:"rps_port_table,omitempty"`
-	} `json:"rps_override"`
+	} `json:"rps_override,omitempty"`
 	SnmpContact       string `json:"snmp_contact,omitempty"`  // .{0,255}
 	SnmpLocation      string `json:"snmp_location,omitempty"` // .{0,255}
-	StpPriority       int    `json:"stp_priority,omitempty"`  // 0|4096|8192|12288|16384|20480|24576|28672|32768|36864|40960|45056|49152|53248|57344|61440
+	StpPriority       string `json:"stp_priority,omitempty"`  // 0|4096|8192|12288|16384|20480|24576|28672|32768|36864|40960|45056|49152|53248|57344|61440
 	StpVersion        string `json:"stp_version,omitempty"`   // stp|rstp|disabled
-	SwitchVLANEnabled bool   `json:"switch_vlan_enabled"`
+	SwitchVLANEnabled bool   `json:"switch_vlan_enabled,omitempty"`
 	UbbPairName       string `json:"ubb_pair_name,omitempty"` // .{1,128}
 	Volume            int    `json:"volume,omitempty"`        // [0-9]|[1-9][0-9]|100
 	WLANOverrides     []struct {
-		Enabled            bool   `json:"enabled"`
+		Enabled            bool   `json:"enabled,omitempty"`
 		Name               string `json:"name,omitempty"` // .{1,32}
-		NameCombineEnabled bool   `json:"name_combine_enabled"`
+		NameCombineEnabled bool   `json:"name_combine_enabled,omitempty"`
 		NameCombineSuffix  string `json:"name_combine_suffix,omitempty"` // .{0,8}
 		Radio              string `json:"radio,omitempty"`               // ng|na
 		RadioName          string `json:"radio_name,omitempty"`
 		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"`
-		WLANID             string `json:"wlan_id"`                // [\d\w]+
+		VLANEnabled        bool   `json:"vlan_enabled,omitempty"`
+		WLANID             string `json:"wlan_id,omitempty"`      // [\d\w]+
 		XPassphrase        string `json:"x_passphrase,omitempty"` // [\x20-\x7E]{8,63}|[0-9a-fA-F]{64}
-
 	} `json:"wlan_overrides,omitempty"`
-	X                string `json:"x,omitempty"`
+	X                int    `json:"x,omitempty"`
 	XBaresipPassword string `json:"x_baresip_password,omitempty"` // ^[a-zA-Z0-9_.\-!~*'()]*
-	Y                string `json:"y,omitempty"`
+	Y                int    `json:"y,omitempty"`
 }
 
 func (c *Client) listDevice(ctx context.Context, site string) ([]Device, error) {
@@ -172,7 +167,7 @@ func (c *Client) listDevice(ctx context.Context, site string) ([]Device, error)
 		Data []Device `json:"data"`
 	}
 
-	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/rest/device", site), nil, &respBody)
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/stat/device", site), nil, &respBody)
 	if err != nil {
 		return nil, err
 	}
@@ -186,7 +181,7 @@ func (c *Client) getDevice(ctx context.Context, site, id string) (*Device, error
 		Data []Device `json:"data"`
 	}
 
-	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/rest/device/%s", site, id), nil, &respBody)
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/stat/device/%s", site, id), nil, &respBody)
 	if err != nil {
 		return nil, err
 	}
diff --git a/unifi/hotspot_2_conf.generated.go b/unifi/hotspot_2_conf.generated.go
index 8f66097..b29c744 100644
--- a/unifi/hotspot_2_conf.generated.go
+++ b/unifi/hotspot_2_conf.generated.go
@@ -28,13 +28,11 @@ type Hotspot2Conf struct {
 		Port     string `json:"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}
 		Protocol string `json:"protocol,omitempty"` // icmp|tcp_udp|tcp|udp
 		Status   string `json:"status,omitempty"`   // closed|open|unknown
-
 	} `json:"capab,omitempty"`
 	CellularNetworkList []struct {
 		Mcc  int    `json:"mcc,omitempty"`
 		Mnc  int    `json:"mnc,omitempty"`
 		Name string `json:"name,omitempty"` // .{1,128}
-
 	} `json:"cellular_network_list,omitempty"`
 	DeauthReqTimeout int      `json:"deauth_req_timeout,omitempty"` // [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
 	DisableDgaf      bool     `json:"disable_dgaf"`
@@ -42,7 +40,6 @@ type Hotspot2Conf struct {
 	FriendlyName     []struct {
 		Language string `json:"language,omitempty"` // [a-z]{3}
 		Text     string `json:"text,omitempty"`     // .{1,128}
-
 	} `json:"friendly_name,omitempty"`
 	GasComebackDelay int    `json:"gas_comeback_delay,omitempty"` // [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]|300
 	Hessid           string `json:"hessid"`                       // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$|^$
@@ -81,16 +78,13 @@ type Hotspot2Conf struct {
 		Description []struct {
 			Language string `json:"language,omitempty"` // [a-z]{3}
 			Text     string `json:"text,omitempty"`     // .{1,128}
-
 		} `json:"description,omitempty"`
 		FriendlyName []struct {
 			Language string `json:"language,omitempty"` // [a-z]{3}
 			Text     string `json:"text,omitempty"`     // .{1,128}
-
 		} `json:"friendly_name,omitempty"`
 		Icon []struct {
 			Name string `json:"name,omitempty"` // .{1,128}
-
 		} `json:"icon,omitempty"`
 		MethodOmaDm      bool   `json:"method_oma_dm"`
 		MethodSoapXmlSpp bool   `json:"method_soap_xml_spp"`
@@ -109,13 +103,11 @@ type Hotspot2Conf struct {
 	QOSMapExceptions []struct {
 		Dcsp int `json:"dcsp,omitempty"`
 		Up   int `json:"up,omitempty"` // [0-7]
-
 	} `json:"qos_map_exceptions,omitempty"`
 	QOSMapStatus          bool `json:"qos_map_status"`
 	RoamingConsortiumList []struct {
 		Name string `json:"name,omitempty"` // .{1,128}
 		Oid  string `json:"oid,omitempty"`  // .{1,128}
-
 	} `json:"roaming_consortium_list,omitempty"`
 	TCFilename  string `json:"t_c_filename,omitempty"` // .{1,256}
 	TCTimestamp int    `json:"t_c_timestamp,omitempty"`
@@ -123,7 +115,6 @@ type Hotspot2Conf struct {
 	VenueName   []struct {
 		Language string `json:"language,omitempty"` // [a-z]{3}
 		Name     string `json:"name,omitempty"`     // .{1,128}
-
 	} `json:"venue_name,omitempty"`
 	VenueType int `json:"venue_type,omitempty"` // 0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15
 }
diff --git a/unifi/network.generated.go b/unifi/network.generated.go
index 8ac35e8..114f34e 100644
--- a/unifi/network.generated.go
+++ b/unifi/network.generated.go
@@ -23,7 +23,6 @@ type Network struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
-	DHCPRelayEnabled        bool     `json:"dhcp_relay_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}|^$
@@ -39,11 +38,11 @@ type Network struct {
 	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,omitempty"` // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
-	DHCPDMAC2               string   `json:"dhcpd_mac_2,omitempty"` // (^$|^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$)
-	DHCPDMAC3               string   `json:"dhcpd_mac_3,omitempty"` // (^$|^([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])$|^$
+	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])$|^$
@@ -51,10 +50,6 @@ type Network struct {
 	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])$|^$
-	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"`
-	DHCPDWPAdUrl            string   `json:"dhcpd_wpad_url,omitempty"`
 	DHCPDV6DNS1             string   `json:"dhcpdv6_dns_1,omitempty"`
 	DHCPDV6DNS2             string   `json:"dhcpdv6_dns_2,omitempty"`
 	DHCPDV6DNS3             string   `json:"dhcpdv6_dns_3,omitempty"`
@@ -64,10 +59,15 @@ type Network struct {
 	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"`
-	DomainName              string   `json:"domain_name,omitempty"` // (?=^.{3,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)|^$|[a-zA-Z0-9-]{1,63}
 	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"`
 	IGMPFastleave           bool     `json:"igmp_fastleave"`
@@ -77,7 +77,6 @@ type Network struct {
 	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"`
-	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)$
 	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
@@ -90,6 +89,7 @@ type Network struct {
 	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}
@@ -103,8 +103,8 @@ type Network struct {
 	IsNAT                   bool     `json:"is_nat"`
 	L2TpInterface           string   `json:"l2tp_interface,omitempty"` // wan|wan2
 	LteLanEnabled           bool     `json:"lte_lan_enabled"`
-	Name                    string   `json:"name,omitempty"` // .{1,128}
 	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])$
diff --git a/unifi/port_conf.generated.go b/unifi/port_conf.generated.go
index 86af138..0e7f204 100644
--- a/unifi/port_conf.generated.go
+++ b/unifi/port_conf.generated.go
@@ -32,8 +32,8 @@ type PortConf struct {
 	Isolation                    bool     `json:"isolation"`
 	LldpmedEnabled               bool     `json:"lldpmed_enabled"`
 	LldpmedNotifyEnabled         bool     `json:"lldpmed_notify_enabled"`
-	Name                         string   `json:"name,omitempty"`
 	NATiveNetworkID              string   `json:"native_networkconf_id"`
+	Name                         string   `json:"name,omitempty"`
 	OpMode                       string   `json:"op_mode,omitempty"`  // switch
 	PoeMode                      string   `json:"poe_mode,omitempty"` // auto|pasv24|passthrough|off
 	PortSecurityEnabled          bool     `json:"port_security_enabled"`
diff --git a/unifi/schedule_task.generated.go b/unifi/schedule_task.generated.go
index bff6508..3a57f1d 100644
--- a/unifi/schedule_task.generated.go
+++ b/unifi/schedule_task.generated.go
@@ -34,7 +34,6 @@ type ScheduleTask struct {
 	StreamType              string `json:"stream_type,omitempty"` // media|sample
 	UpgradeTargets          []struct {
 		MAC string `json:"mac,omitempty"` // ^([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})$
-
 	} `json:"upgrade_targets,omitempty"`
 }
 
diff --git a/unifi/setting_auto_speedtest.generated.go b/unifi/setting_auto_speedtest.generated.go
index 60fc5a0..d3ebe22 100644
--- a/unifi/setting_auto_speedtest.generated.go
+++ b/unifi/setting_auto_speedtest.generated.go
@@ -23,6 +23,47 @@ type SettingAutoSpeedtest struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Enabled  bool `json:"enabled"`
 	Interval int  `json:"interval,omitempty"` // ^(1[2-9]|[2-9][0-9]|[1-9][0-9]{2,3})$
 }
+
+func (c *Client) getSettingAutoSpeedtest(ctx context.Context, site string) (*SettingAutoSpeedtest, error) {
+	var respBody struct {
+		Meta meta                   `json:"meta"`
+		Data []SettingAutoSpeedtest `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/auto_speedtest", site), 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) updateSettingAutoSpeedtest(ctx context.Context, site string, d *SettingAutoSpeedtest) (*SettingAutoSpeedtest, error) {
+	var respBody struct {
+		Meta meta                   `json:"meta"`
+		Data []SettingAutoSpeedtest `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/auto_speedtest", site), 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/setting_baresip.generated.go b/unifi/setting_baresip.generated.go
index 30f2bb5..15de448 100644
--- a/unifi/setting_baresip.generated.go
+++ b/unifi/setting_baresip.generated.go
@@ -23,8 +23,49 @@ type SettingBaresip struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Enabled       bool   `json:"enabled"`
 	OutboundProxy string `json:"outbound_proxy,omitempty"`
 	PackageUrl    string `json:"package_url,omitempty"`
 	Server        string `json:"server,omitempty"`
 }
+
+func (c *Client) getSettingBaresip(ctx context.Context, site string) (*SettingBaresip, error) {
+	var respBody struct {
+		Meta meta             `json:"meta"`
+		Data []SettingBaresip `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/baresip", site), 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) updateSettingBaresip(ctx context.Context, site string, d *SettingBaresip) (*SettingBaresip, error) {
+	var respBody struct {
+		Meta meta             `json:"meta"`
+		Data []SettingBaresip `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/baresip", site), 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/setting_broadcast.generated.go b/unifi/setting_broadcast.generated.go
index d086ab4..3e559eb 100644
--- a/unifi/setting_broadcast.generated.go
+++ b/unifi/setting_broadcast.generated.go
@@ -23,6 +23,8 @@ type SettingBroadcast struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	SoundAfterEnabled   bool   `json:"sound_after_enabled"`
 	SoundAfterResource  string `json:"sound_after_resource,omitempty"`
 	SoundAfterType      string `json:"sound_after_type,omitempty"` // sample|media
@@ -30,3 +32,42 @@ type SettingBroadcast struct {
 	SoundBeforeResource string `json:"sound_before_resource,omitempty"`
 	SoundBeforeType     string `json:"sound_before_type,omitempty"` // sample|media
 }
+
+func (c *Client) getSettingBroadcast(ctx context.Context, site string) (*SettingBroadcast, error) {
+	var respBody struct {
+		Meta meta               `json:"meta"`
+		Data []SettingBroadcast `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/broadcast", site), 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) updateSettingBroadcast(ctx context.Context, site string, d *SettingBroadcast) (*SettingBroadcast, error) {
+	var respBody struct {
+		Meta meta               `json:"meta"`
+		Data []SettingBroadcast `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/broadcast", site), 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/setting_connectivity.generated.go b/unifi/setting_connectivity.generated.go
index 28b781e..dfdde3d 100644
--- a/unifi/setting_connectivity.generated.go
+++ b/unifi/setting_connectivity.generated.go
@@ -23,6 +23,8 @@ type SettingConnectivity struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	EnableIsolatedWLAN bool   `json:"enable_isolated_wlan"`
 	Enabled            bool   `json:"enabled"`
 	UplinkHost         string `json:"uplink_host,omitempty"`
@@ -30,3 +32,42 @@ type SettingConnectivity struct {
 	XMeshEssid         string `json:"x_mesh_essid,omitempty"`
 	XMeshPsk           string `json:"x_mesh_psk,omitempty"`
 }
+
+func (c *Client) getSettingConnectivity(ctx context.Context, site string) (*SettingConnectivity, error) {
+	var respBody struct {
+		Meta meta                  `json:"meta"`
+		Data []SettingConnectivity `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/connectivity", site), 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) updateSettingConnectivity(ctx context.Context, site string, d *SettingConnectivity) (*SettingConnectivity, error) {
+	var respBody struct {
+		Meta meta                  `json:"meta"`
+		Data []SettingConnectivity `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/connectivity", site), 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/setting_country.generated.go b/unifi/setting_country.generated.go
index 31b4ea4..8031553 100644
--- a/unifi/setting_country.generated.go
+++ b/unifi/setting_country.generated.go
@@ -23,5 +23,46 @@ type SettingCountry struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Code int `json:"code,omitempty"`
 }
+
+func (c *Client) getSettingCountry(ctx context.Context, site string) (*SettingCountry, error) {
+	var respBody struct {
+		Meta meta             `json:"meta"`
+		Data []SettingCountry `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/country", site), 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) updateSettingCountry(ctx context.Context, site string, d *SettingCountry) (*SettingCountry, error) {
+	var respBody struct {
+		Meta meta             `json:"meta"`
+		Data []SettingCountry `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/country", site), 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/setting_dpi.generated.go b/unifi/setting_dpi.generated.go
index 3493b02..284a5dd 100644
--- a/unifi/setting_dpi.generated.go
+++ b/unifi/setting_dpi.generated.go
@@ -23,6 +23,47 @@ type SettingDpi struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Enabled               bool `json:"enabled"`
 	FingerprintingEnabled bool `json:"fingerprintingEnabled"`
 }
+
+func (c *Client) getSettingDpi(ctx context.Context, site string) (*SettingDpi, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingDpi `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/dpi", site), 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) updateSettingDpi(ctx context.Context, site string, d *SettingDpi) (*SettingDpi, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingDpi `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/dpi", site), 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/setting_element_adopt.generated.go b/unifi/setting_element_adopt.generated.go
index bb083dd..6ecda5c 100644
--- a/unifi/setting_element_adopt.generated.go
+++ b/unifi/setting_element_adopt.generated.go
@@ -23,7 +23,48 @@ type SettingElementAdopt struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Enabled       bool   `json:"enabled"`
 	XElementEssid string `json:"x_element_essid,omitempty"`
 	XElementPsk   string `json:"x_element_psk,omitempty"`
 }
+
+func (c *Client) getSettingElementAdopt(ctx context.Context, site string) (*SettingElementAdopt, error) {
+	var respBody struct {
+		Meta meta                  `json:"meta"`
+		Data []SettingElementAdopt `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/element_adopt", site), 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) updateSettingElementAdopt(ctx context.Context, site string, d *SettingElementAdopt) (*SettingElementAdopt, error) {
+	var respBody struct {
+		Meta meta                  `json:"meta"`
+		Data []SettingElementAdopt `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/element_adopt", site), 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/setting_guest_access.generated.go b/unifi/setting_guest_access.generated.go
index 7a397cc..314bdb0 100644
--- a/unifi/setting_guest_access.generated.go
+++ b/unifi/setting_guest_access.generated.go
@@ -23,6 +23,8 @@ type SettingGuestAccess struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	AllowedSubnet                          string   `json:"allowed_subnet_,omitempty"`
 	Auth                                   string   `json:"auth,omitempty"` // none|password|hotspot|facebook_wifi|custom
 	AuthorizeUseSandbox                    bool     `json:"authorize_use_sandbox"`
@@ -112,3 +114,42 @@ type SettingGuestAccess struct {
 	XWechatAppSecret                       string   `json:"x_wechat_app_secret,omitempty"`
 	XWechatSecretKey                       string   `json:"x_wechat_secret_key,omitempty"`
 }
+
+func (c *Client) getSettingGuestAccess(ctx context.Context, site string) (*SettingGuestAccess, error) {
+	var respBody struct {
+		Meta meta                 `json:"meta"`
+		Data []SettingGuestAccess `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/guest_access", site), 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) updateSettingGuestAccess(ctx context.Context, site string, d *SettingGuestAccess) (*SettingGuestAccess, error) {
+	var respBody struct {
+		Meta meta                 `json:"meta"`
+		Data []SettingGuestAccess `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/guest_access", site), 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/setting_ips.generated.go b/unifi/setting_ips.generated.go
index b785d35..6b4244c 100644
--- a/unifi/setting_ips.generated.go
+++ b/unifi/setting_ips.generated.go
@@ -23,12 +23,13 @@ type SettingIps struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	DNSFiltering bool `json:"dns_filtering"`
 	DNSFilters   []struct {
 		Filter    string `json:"filter,omitempty"` // security|adult|family
 		NetworkID string `json:"network_id"`
 		Version   string `json:"version,omitempty"` // v4|v6
-
 	} `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
 	EndpointScanning  bool     `json:"endpoint_scanning"`
@@ -36,7 +37,6 @@ type SettingIps struct {
 		IPAddress string `json:"ip_address,omitempty"`
 		NetworkID string `json:"network_id"`
 		Version   string `json:"version,omitempty"` // v4|v6
-
 	} `json:"honeypot,omitempty"`
 	HoneypotEnabled     bool   `json:"honeypot_enabled"`
 	IPsMode             string `json:"ips_mode,omitempty"` // ids|ips|ipsInline|disabled
@@ -55,12 +55,50 @@ type SettingIps struct {
 				Value     string `json:"value,omitempty"`
 			} `json:"tracking,omitempty"`
 			Type string `json:"type,omitempty"` // all|track
-
 		} `json:"alerts,omitempty"`
 		Whitelist []struct {
 			Direction string `json:"direction,omitempty"` // both|src|dest
 			Mode      string `json:"mode,omitempty"`      // ip|subnet|network
 			Value     string `json:"value,omitempty"`
 		} `json:"whitelist,omitempty"`
-	} `json:"suppression"`
+	} `json:"suppression,omitempty"`
+}
+
+func (c *Client) getSettingIps(ctx context.Context, site string) (*SettingIps, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingIps `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/ips", site), 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) updateSettingIps(ctx context.Context, site string, d *SettingIps) (*SettingIps, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingIps `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/ips", site), 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/setting_lcm.generated.go b/unifi/setting_lcm.generated.go
index 361b743..9203acc 100644
--- a/unifi/setting_lcm.generated.go
+++ b/unifi/setting_lcm.generated.go
@@ -23,9 +23,50 @@ type SettingLcm struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Brightness  int  `json:"brightness,omitempty"` // [1-9]|[1-9][0-9]|100
 	Enabled     bool `json:"enabled"`
 	IDleTimeout int  `json:"idle_timeout,omitempty"` // [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
 	Sync        bool `json:"sync"`
 	TouchEvent  bool `json:"touch_event"`
 }
+
+func (c *Client) getSettingLcm(ctx context.Context, site string) (*SettingLcm, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingLcm `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/lcm", site), 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) updateSettingLcm(ctx context.Context, site string, d *SettingLcm) (*SettingLcm, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingLcm `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/lcm", site), 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/setting_locale.generated.go b/unifi/setting_locale.generated.go
index 40c9030..95a2084 100644
--- a/unifi/setting_locale.generated.go
+++ b/unifi/setting_locale.generated.go
@@ -23,5 +23,46 @@ type SettingLocale struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Timezone string `json:"timezone,omitempty"`
 }
+
+func (c *Client) getSettingLocale(ctx context.Context, site string) (*SettingLocale, error) {
+	var respBody struct {
+		Meta meta            `json:"meta"`
+		Data []SettingLocale `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/locale", site), 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) updateSettingLocale(ctx context.Context, site string, d *SettingLocale) (*SettingLocale, error) {
+	var respBody struct {
+		Meta meta            `json:"meta"`
+		Data []SettingLocale `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/locale", site), 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/setting_mgmt.generated.go b/unifi/setting_mgmt.generated.go
index 5e02768..a21465f 100644
--- a/unifi/setting_mgmt.generated.go
+++ b/unifi/setting_mgmt.generated.go
@@ -23,6 +23,8 @@ type SettingMgmt struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	AdvancedFeatureEnabled  bool     `json:"advanced_feature_enabled"`
 	AlertEnabled            bool     `json:"alert_enabled"`
 	AutoUpgrade             bool     `json:"auto_upgrade"`
@@ -40,3 +42,42 @@ type SettingMgmt struct {
 	XSshSha512Passwd        string   `json:"x_ssh_sha512passwd,omitempty"`
 	XSshUsername            string   `json:"x_ssh_username,omitempty"` // ^[_A-Za-z0-9][-_.A-Za-z0-9]{0,29}$
 }
+
+func (c *Client) getSettingMgmt(ctx context.Context, site string) (*SettingMgmt, error) {
+	var respBody struct {
+		Meta meta          `json:"meta"`
+		Data []SettingMgmt `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/mgmt", site), 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) updateSettingMgmt(ctx context.Context, site string, d *SettingMgmt) (*SettingMgmt, error) {
+	var respBody struct {
+		Meta meta          `json:"meta"`
+		Data []SettingMgmt `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/mgmt", site), 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/setting_network_optimization.generated.go b/unifi/setting_network_optimization.generated.go
index b9a6172..3016f5e 100644
--- a/unifi/setting_network_optimization.generated.go
+++ b/unifi/setting_network_optimization.generated.go
@@ -23,5 +23,46 @@ type SettingNetworkOptimization struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Enabled bool `json:"enabled"`
 }
+
+func (c *Client) getSettingNetworkOptimization(ctx context.Context, site string) (*SettingNetworkOptimization, error) {
+	var respBody struct {
+		Meta meta                         `json:"meta"`
+		Data []SettingNetworkOptimization `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/network_optimization", site), 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) updateSettingNetworkOptimization(ctx context.Context, site string, d *SettingNetworkOptimization) (*SettingNetworkOptimization, error) {
+	var respBody struct {
+		Meta meta                         `json:"meta"`
+		Data []SettingNetworkOptimization `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/network_optimization", site), 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/setting_ntp.generated.go b/unifi/setting_ntp.generated.go
index 346c74c..9c7e504 100644
--- a/unifi/setting_ntp.generated.go
+++ b/unifi/setting_ntp.generated.go
@@ -23,8 +23,49 @@ type SettingNtp struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	NtpServer1 string `json:"ntp_server_1,omitempty"`
 	NtpServer2 string `json:"ntp_server_2,omitempty"`
 	NtpServer3 string `json:"ntp_server_3,omitempty"`
 	NtpServer4 string `json:"ntp_server_4,omitempty"`
 }
+
+func (c *Client) getSettingNtp(ctx context.Context, site string) (*SettingNtp, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingNtp `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/ntp", site), 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) updateSettingNtp(ctx context.Context, site string, d *SettingNtp) (*SettingNtp, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingNtp `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/ntp", site), 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/setting_porta.generated.go b/unifi/setting_porta.generated.go
index a4b782f..cc3a967 100644
--- a/unifi/setting_porta.generated.go
+++ b/unifi/setting_porta.generated.go
@@ -23,5 +23,46 @@ type SettingPorta struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Ugw3WAN2Enabled bool `json:"ugw3_wan2_enabled"`
 }
+
+func (c *Client) getSettingPorta(ctx context.Context, site string) (*SettingPorta, error) {
+	var respBody struct {
+		Meta meta           `json:"meta"`
+		Data []SettingPorta `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/porta", site), 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) updateSettingPorta(ctx context.Context, site string, d *SettingPorta) (*SettingPorta, error) {
+	var respBody struct {
+		Meta meta           `json:"meta"`
+		Data []SettingPorta `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/porta", site), 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/setting_provider_capabilities.generated.go b/unifi/setting_provider_capabilities.generated.go
index bf722f7..dc859a3 100644
--- a/unifi/setting_provider_capabilities.generated.go
+++ b/unifi/setting_provider_capabilities.generated.go
@@ -23,7 +23,48 @@ type SettingProviderCapabilities struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Download int  `json:"download,omitempty"` // ^[1-9][0-9]*$
 	Enabled  bool `json:"enabled"`
 	Upload   int  `json:"upload,omitempty"` // ^[1-9][0-9]*$
 }
+
+func (c *Client) getSettingProviderCapabilities(ctx context.Context, site string) (*SettingProviderCapabilities, error) {
+	var respBody struct {
+		Meta meta                          `json:"meta"`
+		Data []SettingProviderCapabilities `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/provider_capabilities", site), 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) updateSettingProviderCapabilities(ctx context.Context, site string, d *SettingProviderCapabilities) (*SettingProviderCapabilities, error) {
+	var respBody struct {
+		Meta meta                          `json:"meta"`
+		Data []SettingProviderCapabilities `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/provider_capabilities", site), 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/setting_radio_ai.generated.go b/unifi/setting_radio_ai.generated.go
index b54b2b3..94dd6ed 100644
--- a/unifi/setting_radio_ai.generated.go
+++ b/unifi/setting_radio_ai.generated.go
@@ -23,6 +23,8 @@ type SettingRadioAi struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	ChannelsNa     []int    `json:"channels_na,omitempty"` // 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
 	ChannelsNg     []int    `json:"channels_ng,omitempty"` // 1|2|3|4|5|6|7|8|9|10|11|12|13|14
 	CronExpr       string   `json:"cron_expr,omitempty"`
@@ -35,3 +37,42 @@ type SettingRadioAi struct {
 	Radios         []string `json:"radios,omitempty"`          // na|ng
 	UseXY          bool     `json:"useXY"`
 }
+
+func (c *Client) getSettingRadioAi(ctx context.Context, site string) (*SettingRadioAi, error) {
+	var respBody struct {
+		Meta meta             `json:"meta"`
+		Data []SettingRadioAi `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/radio_ai", site), 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) updateSettingRadioAi(ctx context.Context, site string, d *SettingRadioAi) (*SettingRadioAi, error) {
+	var respBody struct {
+		Meta meta             `json:"meta"`
+		Data []SettingRadioAi `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/radio_ai", site), 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/setting_radius.generated.go b/unifi/setting_radius.generated.go
index 4a36556..d43084c 100644
--- a/unifi/setting_radius.generated.go
+++ b/unifi/setting_radius.generated.go
@@ -23,6 +23,8 @@ type SettingRadius struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	AccountingEnabled     bool   `json:"accounting_enabled"`
 	AcctPort              int    `json:"acct_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]
 	AuthPort              int    `json:"auth_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]
@@ -32,3 +34,42 @@ type SettingRadius struct {
 	TunneledReply         bool   `json:"tunneled_reply"`
 	XSecret               string `json:"x_secret,omitempty"` // [^\"\' ]{1,128}
 }
+
+func (c *Client) getSettingRadius(ctx context.Context, site string) (*SettingRadius, error) {
+	var respBody struct {
+		Meta meta            `json:"meta"`
+		Data []SettingRadius `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/radius", site), 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) updateSettingRadius(ctx context.Context, site string, d *SettingRadius) (*SettingRadius, error) {
+	var respBody struct {
+		Meta meta            `json:"meta"`
+		Data []SettingRadius `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/radius", site), 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/setting_rsyslogd.generated.go b/unifi/setting_rsyslogd.generated.go
index 15d05b9..ce8ebd4 100644
--- a/unifi/setting_rsyslogd.generated.go
+++ b/unifi/setting_rsyslogd.generated.go
@@ -23,6 +23,8 @@ type SettingRsyslogd struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Debug                       bool   `json:"debug"`
 	Enabled                     bool   `json:"enabled"`
 	IP                          string `json:"ip,omitempty"`
@@ -33,3 +35,42 @@ type SettingRsyslogd struct {
 	ThisController              bool   `json:"this_controller"`
 	ThisControllerEncryptedOnly bool   `json:"this_controller_encrypted_only"`
 }
+
+func (c *Client) getSettingRsyslogd(ctx context.Context, site string) (*SettingRsyslogd, error) {
+	var respBody struct {
+		Meta meta              `json:"meta"`
+		Data []SettingRsyslogd `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/rsyslogd", site), 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) updateSettingRsyslogd(ctx context.Context, site string, d *SettingRsyslogd) (*SettingRsyslogd, error) {
+	var respBody struct {
+		Meta meta              `json:"meta"`
+		Data []SettingRsyslogd `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/rsyslogd", site), 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/setting_snmp.generated.go b/unifi/setting_snmp.generated.go
index 0e07347..3910629 100644
--- a/unifi/setting_snmp.generated.go
+++ b/unifi/setting_snmp.generated.go
@@ -23,9 +23,50 @@ type SettingSnmp struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Community string `json:"community,omitempty"` // .{1,256}
 	Enabled   bool   `json:"enabled"`
 	EnabledV3 bool   `json:"enabledV3"`
 	Username  string `json:"username,omitempty"`   // [a-zA-Z0-9_-]{1,30}
 	XPassword string `json:"x_password,omitempty"` // [^'"]{8,32}
 }
+
+func (c *Client) getSettingSnmp(ctx context.Context, site string) (*SettingSnmp, error) {
+	var respBody struct {
+		Meta meta          `json:"meta"`
+		Data []SettingSnmp `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/snmp", site), 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) updateSettingSnmp(ctx context.Context, site string, d *SettingSnmp) (*SettingSnmp, error) {
+	var respBody struct {
+		Meta meta          `json:"meta"`
+		Data []SettingSnmp `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/snmp", site), 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/setting_super_cloudaccess.generated.go b/unifi/setting_super_cloudaccess.generated.go
index 1e03b29..24fc67d 100644
--- a/unifi/setting_super_cloudaccess.generated.go
+++ b/unifi/setting_super_cloudaccess.generated.go
@@ -23,6 +23,8 @@ type SettingSuperCloudaccess struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	DeviceAuth      string `json:"device_auth,omitempty"`
 	DeviceID        string `json:"device_id"`
 	Enabled         bool   `json:"enabled"`
@@ -31,3 +33,42 @@ type SettingSuperCloudaccess struct {
 	XCertificatePem string `json:"x_certificate_pem,omitempty"`
 	XPrivateKey     string `json:"x_private_key,omitempty"`
 }
+
+func (c *Client) getSettingSuperCloudaccess(ctx context.Context, site string) (*SettingSuperCloudaccess, error) {
+	var respBody struct {
+		Meta meta                      `json:"meta"`
+		Data []SettingSuperCloudaccess `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/super_cloudaccess", site), 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) updateSettingSuperCloudaccess(ctx context.Context, site string, d *SettingSuperCloudaccess) (*SettingSuperCloudaccess, error) {
+	var respBody struct {
+		Meta meta                      `json:"meta"`
+		Data []SettingSuperCloudaccess `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/super_cloudaccess", site), 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/setting_super_events.generated.go b/unifi/setting_super_events.generated.go
index c218de2..75ef0db 100644
--- a/unifi/setting_super_events.generated.go
+++ b/unifi/setting_super_events.generated.go
@@ -23,5 +23,46 @@ type SettingSuperEvents struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Ignored string `json:"_ignored,omitempty"`
 }
+
+func (c *Client) getSettingSuperEvents(ctx context.Context, site string) (*SettingSuperEvents, error) {
+	var respBody struct {
+		Meta meta                 `json:"meta"`
+		Data []SettingSuperEvents `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/super_events", site), 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) updateSettingSuperEvents(ctx context.Context, site string, d *SettingSuperEvents) (*SettingSuperEvents, error) {
+	var respBody struct {
+		Meta meta                 `json:"meta"`
+		Data []SettingSuperEvents `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/super_events", site), 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/setting_super_fwupdate.generated.go b/unifi/setting_super_fwupdate.generated.go
index 80a9ccc..df1a222 100644
--- a/unifi/setting_super_fwupdate.generated.go
+++ b/unifi/setting_super_fwupdate.generated.go
@@ -23,7 +23,48 @@ type SettingSuperFwupdate struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	ControllerChannel string `json:"controller_channel,omitempty"` // internal|alpha|beta|release-candidate|release
 	FirmwareChannel   string `json:"firmware_channel,omitempty"`   // internal|alpha|beta|release-candidate|release
 	SsoEnabled        bool   `json:"sso_enabled"`
 }
+
+func (c *Client) getSettingSuperFwupdate(ctx context.Context, site string) (*SettingSuperFwupdate, error) {
+	var respBody struct {
+		Meta meta                   `json:"meta"`
+		Data []SettingSuperFwupdate `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/super_fwupdate", site), 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) updateSettingSuperFwupdate(ctx context.Context, site string, d *SettingSuperFwupdate) (*SettingSuperFwupdate, error) {
+	var respBody struct {
+		Meta meta                   `json:"meta"`
+		Data []SettingSuperFwupdate `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/super_fwupdate", site), 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/setting_super_identity.generated.go b/unifi/setting_super_identity.generated.go
index 8d26885..3c6b5ee 100644
--- a/unifi/setting_super_identity.generated.go
+++ b/unifi/setting_super_identity.generated.go
@@ -23,6 +23,47 @@ type SettingSuperIdentity struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Hostname string `json:"hostname,omitempty"`
 	Name     string `json:"name,omitempty"`
 }
+
+func (c *Client) getSettingSuperIdentity(ctx context.Context, site string) (*SettingSuperIdentity, error) {
+	var respBody struct {
+		Meta meta                   `json:"meta"`
+		Data []SettingSuperIdentity `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/super_identity", site), 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) updateSettingSuperIdentity(ctx context.Context, site string, d *SettingSuperIdentity) (*SettingSuperIdentity, error) {
+	var respBody struct {
+		Meta meta                   `json:"meta"`
+		Data []SettingSuperIdentity `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/super_identity", site), 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/setting_super_mail.generated.go b/unifi/setting_super_mail.generated.go
index f264313..cd69697 100644
--- a/unifi/setting_super_mail.generated.go
+++ b/unifi/setting_super_mail.generated.go
@@ -23,5 +23,46 @@ type SettingSuperMail struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Provider string `json:"provider,omitempty"` // smtp|cloud|disabled
 }
+
+func (c *Client) getSettingSuperMail(ctx context.Context, site string) (*SettingSuperMail, error) {
+	var respBody struct {
+		Meta meta               `json:"meta"`
+		Data []SettingSuperMail `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/super_mail", site), 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) updateSettingSuperMail(ctx context.Context, site string, d *SettingSuperMail) (*SettingSuperMail, error) {
+	var respBody struct {
+		Meta meta               `json:"meta"`
+		Data []SettingSuperMail `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/super_mail", site), 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/setting_super_mgmt.generated.go b/unifi/setting_super_mgmt.generated.go
index a34116f..873ba71 100644
--- a/unifi/setting_super_mgmt.generated.go
+++ b/unifi/setting_super_mgmt.generated.go
@@ -23,6 +23,8 @@ type SettingSuperMgmt struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	AutoUpgrade                              bool     `json:"auto_upgrade"`
 	AutobackupCronExpr                       string   `json:"autobackup_cron_expr,omitempty"`
 	AutobackupDays                           int      `json:"autobackup_days,omitempty"`
@@ -69,3 +71,42 @@ type SettingSuperMgmt struct {
 	XSshPassword                             string   `json:"x_ssh_password,omitempty"`
 	XSshUsername                             string   `json:"x_ssh_username,omitempty"`
 }
+
+func (c *Client) getSettingSuperMgmt(ctx context.Context, site string) (*SettingSuperMgmt, error) {
+	var respBody struct {
+		Meta meta               `json:"meta"`
+		Data []SettingSuperMgmt `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/super_mgmt", site), 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) updateSettingSuperMgmt(ctx context.Context, site string, d *SettingSuperMgmt) (*SettingSuperMgmt, error) {
+	var respBody struct {
+		Meta meta               `json:"meta"`
+		Data []SettingSuperMgmt `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/super_mgmt", site), 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/setting_super_sdn.generated.go b/unifi/setting_super_sdn.generated.go
index 7bce123..e9f81c4 100644
--- a/unifi/setting_super_sdn.generated.go
+++ b/unifi/setting_super_sdn.generated.go
@@ -23,6 +23,8 @@ type SettingSuperSdn struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	AuthToken         string   `json:"auth_token,omitempty"`
 	DeviceID          string   `json:"device_id"`
 	Enabled           bool     `json:"enabled"`
@@ -34,3 +36,42 @@ type SettingSuperSdn struct {
 	UbicUuid          string   `json:"ubic_uuid,omitempty"`
 	XOauthAppSecret   string   `json:"x_oauth_app_secret,omitempty"`
 }
+
+func (c *Client) getSettingSuperSdn(ctx context.Context, site string) (*SettingSuperSdn, error) {
+	var respBody struct {
+		Meta meta              `json:"meta"`
+		Data []SettingSuperSdn `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/super_sdn", site), 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) updateSettingSuperSdn(ctx context.Context, site string, d *SettingSuperSdn) (*SettingSuperSdn, error) {
+	var respBody struct {
+		Meta meta              `json:"meta"`
+		Data []SettingSuperSdn `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/super_sdn", site), 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/setting_super_smtp.generated.go b/unifi/setting_super_smtp.generated.go
index 8ebfa04..fbf5729 100644
--- a/unifi/setting_super_smtp.generated.go
+++ b/unifi/setting_super_smtp.generated.go
@@ -23,6 +23,8 @@ type SettingSuperSmtp struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	Enabled   bool   `json:"enabled"`
 	Host      string `json:"host,omitempty"`
 	Port      int    `json:"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]|^$
@@ -33,3 +35,42 @@ type SettingSuperSmtp struct {
 	Username  string `json:"username,omitempty"`
 	XPassword string `json:"x_password,omitempty"`
 }
+
+func (c *Client) getSettingSuperSmtp(ctx context.Context, site string) (*SettingSuperSmtp, error) {
+	var respBody struct {
+		Meta meta               `json:"meta"`
+		Data []SettingSuperSmtp `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/super_smtp", site), 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) updateSettingSuperSmtp(ctx context.Context, site string, d *SettingSuperSmtp) (*SettingSuperSmtp, error) {
+	var respBody struct {
+		Meta meta               `json:"meta"`
+		Data []SettingSuperSmtp `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/super_smtp", site), 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/setting_usg.generated.go b/unifi/setting_usg.generated.go
index 65358e1..9599193 100644
--- a/unifi/setting_usg.generated.go
+++ b/unifi/setting_usg.generated.go
@@ -23,9 +23,13 @@ type SettingUsg struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	ArpCacheBaseReachable          int    `json:"arp_cache_base_reachable,omitempty"` // ^$|^[1-9]{1}[0-9]{0,4}$
-	ArpCacheTimeout                int    `json:"arp_cache_timeout,omitempty"`
+	ArpCacheTimeout                string `json:"arp_cache_timeout,omitempty"`        // normal|min-dhcp-lease|custom
 	BroadcastPing                  bool   `json:"broadcast_ping"`
+	DHCPDHostfileUpdate            bool   `json:"dhcpd_hostfile_update"`
+	DHCPDUseDNSmasq                bool   `json:"dhcpd_use_dnsmasq"`
 	DHCPRelayAgentsPackets         string `json:"dhcp_relay_agents_packets"`      // append|discard|forward|replace|^$
 	DHCPRelayHopCount              int    `json:"dhcp_relay_hop_count,omitempty"` // ([1-9]|[1-8][0-9]|9[0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])|^$
 	DHCPRelayMaxSize               int    `json:"dhcp_relay_max_size,omitempty"`  // (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)|^$
@@ -35,8 +39,6 @@ type SettingUsg struct {
 	DHCPRelayServer3               string `json:"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])$|^$
 	DHCPRelayServer4               string `json:"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])$|^$
 	DHCPRelayServer5               string `json:"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])$|^$
-	DHCPDHostfileUpdate            bool   `json:"dhcpd_hostfile_update"`
-	DHCPDUseDNSmasq                bool   `json:"dhcpd_use_dnsmasq"`
 	DNSmasqAllServers              bool   `json:"dnsmasq_all_servers"`
 	EchoServer                     string `json:"echo_server,omitempty"` // [^\"\' ]{1,255}
 	FirewallGuestDefaultLog        bool   `json:"firewall_guest_default_log"`
@@ -79,3 +81,42 @@ type SettingUsg struct {
 	UpnpSecureMode                 bool   `json:"upnp_secure_mode"`
 	UpnpWANInterface               string `json:"upnp_wan_interface,omitempty"` // WAN|WAN2
 }
+
+func (c *Client) getSettingUsg(ctx context.Context, site string) (*SettingUsg, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingUsg `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/usg", site), 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) updateSettingUsg(ctx context.Context, site string, d *SettingUsg) (*SettingUsg, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingUsg `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/usg", site), 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/setting_usw.generated.go b/unifi/setting_usw.generated.go
index dbe0646..8d90a08 100644
--- a/unifi/setting_usw.generated.go
+++ b/unifi/setting_usw.generated.go
@@ -23,5 +23,46 @@ type SettingUsw struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	Key string `json:"key"`
+
 	DHCPSnoop bool `json:"dhcp_snoop"`
 }
+
+func (c *Client) getSettingUsw(ctx context.Context, site string) (*SettingUsw, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingUsw `json:"data"`
+	}
+
+	err := c.do(ctx, "GET", fmt.Sprintf("s/%s/get/setting/usw", site), 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) updateSettingUsw(ctx context.Context, site string, d *SettingUsw) (*SettingUsw, error) {
+	var respBody struct {
+		Meta meta         `json:"meta"`
+		Data []SettingUsw `json:"data"`
+	}
+
+	err := c.do(ctx, "PUT", fmt.Sprintf("s/%s/set/setting/usw", site), 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/spatial_record.generated.go b/unifi/spatial_record.generated.go
index 1d8b57b..82b5926 100644
--- a/unifi/spatial_record.generated.go
+++ b/unifi/spatial_record.generated.go
@@ -29,8 +29,7 @@ type SpatialRecord struct {
 			X float64 `json:"x,omitempty"` // (^([-]?[\d]+)$)|(^([-]?[\d]+[.]?[\d]+)$)
 			Y float64 `json:"y,omitempty"` // (^([-]?[\d]+)$)|(^([-]?[\d]+[.]?[\d]+)$)
 			Z float64 `json:"z,omitempty"` // (^([-]?[\d]+)$)|(^([-]?[\d]+[.]?[\d]+)$)
-
-		} `json:"position"`
+		} `json:"position,omitempty"`
 	} `json:"devices,omitempty"`
 	Name string `json:"name,omitempty"` // .{1,128}
 }
diff --git a/unifi/user.generated.go b/unifi/user.generated.go
index 67580d1..f4bf2e3 100644
--- a/unifi/user.generated.go
+++ b/unifi/user.generated.go
@@ -23,6 +23,8 @@ type User struct {
 	NoDelete bool   `json:"attr_no_delete,omitempty"`
 	NoEdit   bool   `json:"attr_no_edit,omitempty"`
 
+	IP string `json:"ip,omitempty"` // non-generated field
+
 	Blocked     bool   `json:"blocked,omitempty"`
 	FixedIP     string `json:"fixed_ip,omitempty"`
 	Hostname    string `json:"hostname,omitempty"`
@@ -33,8 +35,6 @@ type User struct {
 	Note        string `json:"note,omitempty"`
 	UseFixedIP  bool   `json:"use_fixedip"`
 	UserGroupID string `json:"usergroup_id"`
-	// non-generated fields
-	IP string `json:"ip,omitempty"`
 }
 
 func (c *Client) listUser(ctx context.Context, site string) ([]User, error) {
diff --git a/unifi/wlan.generated.go b/unifi/wlan.generated.go
index 5add930..45d4d40 100644
--- a/unifi/wlan.generated.go
+++ b/unifi/wlan.generated.go
@@ -43,7 +43,6 @@ type WLAN struct {
 	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
-	MulticastEnhanceEnabled   bool     `json:"mcastenhance_enabled"`
 	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"`
@@ -55,6 +54,7 @@ type WLAN struct {
 	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}