diff --git a/src/BgApi.g.cs b/src/BgApi.g.cs
index 37f97e7..f33e3a8 100644
--- a/src/BgApi.g.cs
+++ b/src/BgApi.g.cs
@@ -1056,7 +1056,7 @@ public async Task<ble_msg_system_get_info_rsp_t> ble_cmd_system_get_info()
             return (ble_msg_system_get_info_rsp_t)response;
         }
 
-        public async Task<ble_msg_system_endpoint_tx_rsp_t> ble_cmd_system_endpoint_tx(int endpoint, byte[] data)
+        public async Task<ble_msg_system_endpoint_tx_rsp_t> ble_cmd_system_endpoint_tx(system_endpoints endpoint, byte[] data)
         {
             log("ble_cmd_system_endpoint_tx_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 1 + 1 + data.Length];
@@ -1078,7 +1078,7 @@ public async Task<ble_msg_system_endpoint_tx_rsp_t> ble_cmd_system_endpoint_tx(i
             return (ble_msg_system_endpoint_tx_rsp_t)response;
         }
 
-        public async Task<ble_msg_system_whitelist_append_rsp_t> ble_cmd_system_whitelist_append(bd_addr address, int address_type)
+        public async Task<ble_msg_system_whitelist_append_rsp_t> ble_cmd_system_whitelist_append(bd_addr address, gap_address_type address_type)
         {
             log("ble_cmd_system_whitelist_append_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 6 + 1];
@@ -1099,7 +1099,7 @@ public async Task<ble_msg_system_whitelist_append_rsp_t> ble_cmd_system_whitelis
             return (ble_msg_system_whitelist_append_rsp_t)response;
         }
 
-        public async Task<ble_msg_system_whitelist_remove_rsp_t> ble_cmd_system_whitelist_remove(bd_addr address, int address_type)
+        public async Task<ble_msg_system_whitelist_remove_rsp_t> ble_cmd_system_whitelist_remove(bd_addr address, gap_address_type address_type)
         {
             log("ble_cmd_system_whitelist_remove_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 6 + 1];
@@ -1134,7 +1134,7 @@ public async Task ble_cmd_system_whitelist_clear()
             await Send(new BgApiCommand() { Data = _data }, false);
         }
 
-        public async Task<ble_msg_system_endpoint_rx_rsp_t> ble_cmd_system_endpoint_rx(int endpoint, int size)
+        public async Task<ble_msg_system_endpoint_rx_rsp_t> ble_cmd_system_endpoint_rx(system_endpoints endpoint, int size)
         {
             log("ble_cmd_system_endpoint_rx_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 1 + 1];
@@ -1152,7 +1152,7 @@ public async Task<ble_msg_system_endpoint_rx_rsp_t> ble_cmd_system_endpoint_rx(i
             return (ble_msg_system_endpoint_rx_rsp_t)response;
         }
 
-        public async Task<ble_msg_system_endpoint_set_watermarks_rsp_t> ble_cmd_system_endpoint_set_watermarks(int endpoint, int rx, int tx)
+        public async Task<ble_msg_system_endpoint_set_watermarks_rsp_t> ble_cmd_system_endpoint_set_watermarks(system_endpoints endpoint, int rx, int tx)
         {
             log("ble_cmd_system_endpoint_set_watermarks_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 1 + 1 + 1];
@@ -2078,7 +2078,7 @@ public async Task<ble_msg_sm_delete_bonding_rsp_t> ble_cmd_sm_delete_bonding(int
             return (ble_msg_sm_delete_bonding_rsp_t)response;
         }
 
-        public async Task ble_cmd_sm_set_parameters(int mitm, int min_key_size, int io_capabilities)
+        public async Task ble_cmd_sm_set_parameters(int mitm, int min_key_size, sm_io_capability io_capabilities)
         {
             log("ble_cmd_sm_set_parameters_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 1 + 1 + 1];
@@ -2202,7 +2202,7 @@ public async Task ble_cmd_gap_set_privacy_flags(int peripheral_privacy, int cent
             await Send(new BgApiCommand() { Data = _data }, false);
         }
 
-        public async Task<ble_msg_gap_set_mode_rsp_t> ble_cmd_gap_set_mode(int discover, int connect)
+        public async Task<ble_msg_gap_set_mode_rsp_t> ble_cmd_gap_set_mode(gap_discoverable_mode discover, gap_connectable_mode connect)
         {
             log("ble_cmd_gap_set_mode_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 1 + 1];
@@ -2220,7 +2220,7 @@ public async Task<ble_msg_gap_set_mode_rsp_t> ble_cmd_gap_set_mode(int discover,
             return (ble_msg_gap_set_mode_rsp_t)response;
         }
 
-        public async Task<ble_msg_gap_discover_rsp_t> ble_cmd_gap_discover(int mode)
+        public async Task<ble_msg_gap_discover_rsp_t> ble_cmd_gap_discover(gap_discover_mode mode)
         {
             log("ble_cmd_gap_discover_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 1];
@@ -2305,7 +2305,7 @@ public async Task<ble_msg_gap_connect_selective_rsp_t> ble_cmd_gap_connect_selec
             return (ble_msg_gap_connect_selective_rsp_t)response;
         }
 
-        public async Task<ble_msg_gap_set_filtering_rsp_t> ble_cmd_gap_set_filtering(int scan_policy, int adv_policy, int scan_duplicate_filtering)
+        public async Task<ble_msg_gap_set_filtering_rsp_t> ble_cmd_gap_set_filtering(gap_scan_policy scan_policy, gap_advertising_policy adv_policy, int scan_duplicate_filtering)
         {
             log("ble_cmd_gap_set_filtering_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 1 + 1 + 1];
@@ -2388,7 +2388,7 @@ public async Task<ble_msg_gap_set_adv_data_rsp_t> ble_cmd_gap_set_adv_data(int s
             return (ble_msg_gap_set_adv_data_rsp_t)response;
         }
 
-        public async Task<ble_msg_gap_set_directed_connectable_mode_rsp_t> ble_cmd_gap_set_directed_connectable_mode(bd_addr address, int addr_type)
+        public async Task<ble_msg_gap_set_directed_connectable_mode_rsp_t> ble_cmd_gap_set_directed_connectable_mode(bd_addr address, gap_address_type addr_type)
         {
             log("ble_cmd_gap_set_directed_connectable_mode_id");
             byte[] _data = new byte[SIZE_HEADER + 0 + 6 + 1];
@@ -3151,7 +3151,7 @@ public class ble_msg_flash_ps_key_evt_t : BgApiEvent
         public class ble_msg_attributes_value_evt_t : BgApiEvent
         {
             public int connection;
-            public int reason;
+            public attributes_attribute_change_reason reason;
             public int handle;
             public int offset;
             public byte[] value;
@@ -3168,15 +3168,15 @@ public class ble_msg_attributes_user_read_request_evt_t : BgApiEvent
         public class ble_msg_attributes_status_evt_t : BgApiEvent
         {
             public int handle;
-            public int flags;
+            public attributes_attribute_status_flag flags;
         }
 
         public class ble_msg_connection_status_evt_t : BgApiEvent
         {
             public int connection;
-            public int flags;
+            public connection_connstatus flags;
             public bd_addr address;
-            public int address_type;
+            public gap_address_type address_type;
             public int conn_interval;
             public int timeout;
             public int latency;
@@ -3250,7 +3250,7 @@ public class ble_msg_attclient_attribute_value_evt_t : BgApiEvent
         {
             public int connection;
             public int atthandle;
-            public int type;
+            public attclient_attribute_value_types type;
             public byte[] value;
         }
 
@@ -3289,7 +3289,7 @@ public class ble_msg_sm_bond_status_evt_t : BgApiEvent
             public int bond;
             public int keysize;
             public int mitm;
-            public int keys;
+            public sm_bonding_key keys;
         }
 
         public class ble_msg_gap_scan_response_evt_t : BgApiEvent