diff --git a/doc/mgmt-api.txt b/doc/mgmt-api.txt
index cd10ad9..f323eb3 100644
--- a/doc/mgmt-api.txt
+++ b/doc/mgmt-api.txt
@@ -125,10 +125,19 @@ Set Connectable Command
 	Return Parameters:	Current_Settings (4 Octets)
 
 
+Set Fast Connectable Command
+============================
+
+	Command Code:		0x0008
+	Controller Index:	<controller id>
+	Command Parameters:	Enable (1 Octet)
+	Return Parameters:	Current_Settings (4 Octets)
+
+
 Set Pairable Command
 ====================
 
-	Command Code:		0x0008
+	Command Code:		0x0009
 	Controller Index:	<controller id>
 	Command Parameters:	Pairable (1 Octet)
 	Return Parameters:	Current_Settings (4 Octets)
@@ -137,7 +146,7 @@ Set Pairable Command
 Set Secure Simple Pairing Command
 =================================
 
-	Command Code:		0x0009
+	Command Code:		0x000A
 	Controller Index:	<controller id>
 	Command Parameters:	Secure_Simple_Pairing (1 Octet)
 	Return Parameters:	Current_Settings (4 Octets)
@@ -146,7 +155,7 @@ Set Secure Simple Pairing Command
 Set High Speed Command
 ======================
 
-	Command Code:		0x000A
+	Command Code:		0x000B
 	Controller Index:	<controller id>
 	Command Parameters:	High_Speed (1 Octet)
 	Return Parameters:	Current_Settings (4 Octets)
@@ -155,7 +164,7 @@ Set High Speed Command
 Set Low Energy Command
 ======================
 
-	Command Code:		0x000A
+	Command Code:		0x000C
 	Controller Index:	<controller id>
 	Command Parameters:	Low_Energy (1 Octet)
 	Return Parameters:	Current_Settings (4 Octets)
@@ -164,7 +173,7 @@ Set Low Energy Command
 Add UUID Command
 ================
 
-	Command Code:		0x000B
+	Command Code:		0x000D
 	Controller Index:	<controller id>
 	Command Parameters:	UUID (16 Octets)
 				SVC_Hint (1 Octet)
@@ -174,7 +183,7 @@ Add UUID Command
 Remove UUID Command
 ===================
 
-	Command Code:		0x000C
+	Command Code:		0x000E
 	Controller Index:	<controller id>
 	Command Parameters:	UUID (16 Octets)
 	Return Parameters:	Class_Of_Device (3 Octets)
@@ -183,26 +192,26 @@ Remove UUID Command
 Set Device Class
 ================
 
-	Command Code:		0x000D
+	Command Code:		0x000F
 	Controller Index:	<controller id>
 	Command Parameters:	Major_Class (1 Octet)
 				Minor_Class (1 Octet)
 	Return Parameters:	Class_Of_Device (3 Octets)
 
 
-Set Service Cache Command
-=========================
+Set UUID Caching Command
+========================
 
-	Command Code:		0x000E
+	Command Code:		0x0010
 	Controller Index:	<controller id>
 	Command Parameters:	Enable (1 Octet)
-	Return Parameters:
+	Return Parameters:	Class_Of_Device (3 Octets)
 
 
 Load Link Keys Command
 ======================
 
-	Command Code:		0x000F
+	Command Code:		0x0011
 	Controller Index:	<controller id>
 	Command Parameters:	Debug_Keys (1 Octet)
 				Key_Count (2 Octets)
@@ -220,7 +229,7 @@ Load Link Keys Command
 Remove Keys Command
 ===================
 
-	Command Code:		0x0010
+	Command Code:		0x0012
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 				Disconnect (1 Octet)
@@ -233,7 +242,7 @@ Remove Keys Command
 Disconnect Command
 ==================
 
-	Command Code:		0x0011
+	Command Code:		0x0013
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 	Return Parameters:	Address (6 Octets)
@@ -243,7 +252,7 @@ Disconnect Command
 Get Connections Command
 =======================
 
-	Command Code:		0x0012
+	Command Code:		0x0014
 	Controller Index:	<controller id>
 	Command Parameters:
 	Return Parameters:	Connection_Count (2 Octets)
@@ -263,7 +272,7 @@ Get Connections Command
 PIN Code Reply Command
 =======================
 
-	Command Code:		0x0013
+	Command Code:		0x0015
 	Controller Index:	<controller id>
 	Command Parameters:
 	Return Parameters:	Address (6 Octets)
@@ -274,7 +283,7 @@ PIN Code Reply Command
 PIN Code Negative Reply Command
 ===============================
 
-	Command Code:		0x0014
+	Command Code:		0x0016
 	Controller Index:	<controller id>
 	Command Parameters:
 	Return Parameters:	Address (6 Octets)
@@ -283,7 +292,7 @@ PIN Code Negative Reply Command
 Set IO Capability Command
 =========================
 
-	Command Code:		0x0015
+	Command Code:		0x0016
 	Controller Index:	<controller id>
 	Command Parameters:	IO_Capability (1 Octet)
 	Return Parameters:
@@ -292,7 +301,7 @@ Set IO Capability Command
 Pair Device Command
 ===================
 
-	Command Code:		0x0016
+	Command Code:		0x0017
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 				Address_Type (1 Octet)
@@ -310,7 +319,7 @@ Pair Device Command
 User Confirmation Reply Command
 ===============================
 
-	Command Code:		0x0017
+	Command Code:		0x0018
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 	Return Parameters:	Address (6 Octets)
@@ -320,7 +329,7 @@ User Confirmation Reply Command
 User Confirmation Negative Reply Command
 ========================================
 
-	Command Code:		0x0018
+	Command Code:		0x0019
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 	Return Parameters:	Address (6 Octets)
@@ -330,7 +339,7 @@ User Confirmation Negative Reply Command
 User Passkey Reply Command
 ==========================
 
-	Command Code:		0x0019
+	Command Code:		0x001A
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 				Passkey (4 Octets)
@@ -341,7 +350,7 @@ User Passkey Reply Command
 User Passkey Negative Reply Command
 ===================================
 
-	Command Code:		0x001A
+	Command Code:		0x001B
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 	Return Parameters:	Address (6 Octets)
@@ -351,7 +360,7 @@ User Passkey Negative Reply Command
 Set Local Name Command
 ======================
 
-	Command Code:		0x001B
+	Command Code:		0x001C
 	Controller Index:	<controller id>
 	Command Parameters:	Name (249 Octets)
 				Short_Name (11 Octets)
@@ -365,7 +374,7 @@ Set Local Name Command
 Read Local Out Of Band Data Command
 ========================================
 
-	Command Code:		0x001C
+	Command Code:		0x001D
 	Controller Index:	<controller id>
 	Command Parameters:
 	Return Parameters:	Hash (16 Octets)
@@ -375,7 +384,7 @@ Read Local Out Of Band Data Command
 Add Remote Out Of Band Data Command
 ========================================
 
-	Command Code:		0x001D
+	Command Code:		0x001E
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 				Hash (16 Octets)
@@ -386,7 +395,7 @@ Add Remote Out Of Band Data Command
 Remove Remote Out Of Band Data Command
 ========================================
 
-	Command Code:		0x001E
+	Command Code:		0x001F
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 	Return Parameters:
@@ -395,7 +404,7 @@ Remove Remote Out Of Band Data Command
 Start Discovery Command
 =======================
 
-	Command Code:		0x0001F
+	Command Code:		0x00020
 	Controller Index:	<controller id>
 	Command Parameters:	Type (1 Octet)
 	Return Parameters:
@@ -417,7 +426,7 @@ Start Discovery Command
 Stop Discovery Command
 ======================
 
-	Command Code:		0x00020
+	Command Code:		0x00021
 	Controller Index:	<controller id>
 	Command Parameters:
 	Return Parameters:
@@ -426,7 +435,7 @@ Stop Discovery Command
 Block Device Command
 ====================
 
-	Command Code:		0x00021
+	Command Code:		0x00022
 	Controller Index:	<controller id>
 	Command Parameters:	Address (6 Octets)
 	Return Parameters:	Status (1 Octet)
@@ -435,18 +444,9 @@ Block Device Command
 Unblock Device Command
 ======================
 
-	Command Code:		0x00022
-	Controller Index:	<controller id>
-	Command Parameters:	Address (6 Octets)
-	Return Parameters:	Status (1 Octet)
-
-
-Set Fast Connectable Command
-============================
-
 	Command Code:		0x00023
 	Controller Index:	<controller id>
-	Command Parameters:	Enable (1 Octet)
+	Command Parameters:	Address (6 Octets)
 	Return Parameters:	Status (1 Octet)
 
 
@@ -585,10 +585,27 @@ Controller Index:	<controller id>
 Event Parameters:	Current_Settings (4 Octets)
 
 
+Class Of Device Changed Event
+=============================
+
+Event Code		0x0007
+Controller Index:	<controller id>
+Event Parameters:	Class_Of_Device (3 Octets)
+
+
+Local Name Changed Event
+========================
+
+Event Code		0x0008
+Controller Index	<controller id>
+Event Parameters	Name (249 Octets)
+			Short_Name (11 Octets)
+
+
 New Link Key Event
 ==================
 
-Event Code		0x0007
+Event Code		0x0009
 Controller Index:	<controller id>
 Event Parameters	Key {
 				Address (6 Octets)
@@ -602,7 +619,7 @@ Event Parameters	Key {
 Device Connected Event
 ======================
 
-Event Code		0x0008
+Event Code		0x000A
 Controller Index:	<controller id>
 Event Parameters	Address (6 Octets)
 			Type (1 Octet)
@@ -616,7 +633,7 @@ Event Parameters	Address (6 Octets)
 Device Disconnected Event
 =========================
 
-Event Code		0x0009
+Event Code		0x000B
 Controller Index:	<controller id>
 Event Parameters	Address (6 Octets)
 			Type (1 Octet)
@@ -630,7 +647,7 @@ Event Parameters	Address (6 Octets)
 Connect Failed Event
 ====================
 
-Event Code		0x000A
+Event Code		0x000C
 Controller Index:	<controller id>
 Event Parameters	Address (6 Octets)
 			Type (1 Octet)
@@ -641,10 +658,11 @@ Event Parameters	Address (6 Octets)
 		1	LE Public
 		2	LE Random
 
+
 PIN Code Request Event
 ======================
 
-Event Code		0x000B
+Event Code		0x000D
 Controller Index:	<controller id>
 Event Parameters	Address (6 Octets)
 			Secure (1 Octet)
@@ -656,7 +674,7 @@ Event Parameters	Address (6 Octets)
 User Confirmation Request Event
 ===============================
 
-Event Code		0x000C
+Event Code		0x000E
 Controller Index:	<controller id>
 Event Parameters	Address (6 Octets)
 			Value (4 Octets)
@@ -665,7 +683,7 @@ Event Parameters	Address (6 Octets)
 User Passkey Request Event
 ==========================
 
-Event Code		0x000D
+Event Code		0x000F
 Controller Index:	<controller id>
 Event Parameters	Address (6 Octets)
 
@@ -673,25 +691,16 @@ Event Parameters	Address (6 Octets)
 Authentication Failed Event
 ===========================
 
-Event Code		0x000E
+Event Code		0x0010
 Controller Index:	<controller id>
 Event Parameters	Address (6 Octets)
 			Status (1 Octet)
 
 
-Local Name Changed Event
-========================
-
-Event Code		0x000F
-Controller Index	<controller id>
-Event Parameters	Name (249 Octets)
-			Short_Name (11 Octets)
-
-
 Device Found Event
 ==================
 
-Event Code		0x0010
+Event Code		0x0011
 Controller Index	<controller id>
 Event Parameters	Address (6 Octets)
 			Type (1 Octet)
@@ -709,7 +718,7 @@ Event Parameters	Address (6 Octets)
 Remote Name Event
 =================
 
-Event Code		0x0011
+Event Code		0x0012
 Controller Index	<controller id>
 Event Parameters	Address (6 Octets)
 			Name (249 Octets)
@@ -718,7 +727,7 @@ Event Parameters	Address (6 Octets)
 Discovering Event
 =================
 
-Event Code		0x00012
+Event Code		0x00013
 Controller Index	<controller id>
 Event Parameters	Discovering (1 Octet)
 
@@ -726,7 +735,7 @@ Event Parameters	Discovering (1 Octet)
 Device Blocked Event
 ====================
 
-Event Code		0x00013
+Event Code		0x00014
 Controller Index	<controller id>
 Event Parameters	Address (6 Octets)
 
@@ -734,7 +743,7 @@ Event Parameters	Address (6 Octets)
 Device Unblocked Event
 ======================
 
-Event Code		0x00014
+Event Code		0x00015
 Controller Index	<controller id>
 Event Parameters	Address (6 Octets)
 
@@ -742,7 +751,7 @@ Event Parameters	Address (6 Octets)
 New Long Term Key Event
 =======================
 
-Event Code		0x0015
+Event Code		0x0016
 Controller Index	<controller id>
 Event Parameters	Store Hint (1 Octet)
 			Key {