diff --git a/client/AskForAllianceData.json b/client/AskForAllianceData.json
index 761305a..01ffce8 100644
--- a/client/AskForAllianceData.json
+++ b/client/AskForAllianceData.json
@@ -1,5 +1,5 @@
 {
-  "id": 14302,
+  "id": 10609,
   "name": "AskForAllianceData",
   "fields": [
     {"name": "allianceId", "type": "LONG"}
diff --git a/client/AskForAllianceRankingList.json b/client/AskForAllianceRankingList.json
index 646d599..2e26b70 100644
--- a/client/AskForAllianceRankingList.json
+++ b/client/AskForAllianceRankingList.json
@@ -1,5 +1,5 @@
 {
-  "id": 14401,
+  "id": 14171,
   "name": "AskForAllianceRankingList",
   "fields": [
     {"name": "region", "type": "BYTE","comment":"general or local"}
diff --git a/client/AskForAvatarLocalRanking.json b/client/AskForAvatarLocalRanking.json
index 6d9e58c..aaca841 100644
--- a/client/AskForAvatarLocalRanking.json
+++ b/client/AskForAvatarLocalRanking.json
@@ -1,5 +1,5 @@
 {
-  "id": 14404,
+  "id": 11639,
   "name": "AskForAvatarLocalRanking",
   "fields": [
     { "type": "BYTE"}
diff --git a/client/AskForAvatarRankingList.json b/client/AskForAvatarRankingList.json
index 21904f0..d67c3b7 100644
--- a/client/AskForAvatarRankingList.json
+++ b/client/AskForAvatarRankingList.json
@@ -1,5 +1,5 @@
 {
-  "id": 14403,
+  "id": 11149,
   "name": "AskForAvatarRankingList",
   "fields": [
     {"type": "BYTE"}
diff --git a/client/AskForBattleReplayStream.json b/client/AskForBattleReplayStream.json
index 1d54cad..336ae27 100644
--- a/client/AskForBattleReplayStream.json
+++ b/client/AskForBattleReplayStream.json
@@ -1,5 +1,5 @@
 {
-  "id": 14406,
+  "id": 15827,
   "name": "AskForBattleReplayStream",
   "fields": [
     {"name": "accountID", "type": "LONG"}
diff --git a/client/AskForJoinableAlliancesList.json b/client/AskForJoinableAlliancesList.json
index 67fc5dc..a4264d0 100644
--- a/client/AskForJoinableAlliancesList.json
+++ b/client/AskForJoinableAlliancesList.json
@@ -1,5 +1,5 @@
 {
-  "id": 14303,
+  "id": 10857,
   "name": "AskForJoinableAlliancesList",
   "fields": [
   ]
diff --git a/client/AskForLiveBattle.json b/client/AskForLiveBattle.json
index aad549a..029f3e4 100644
--- a/client/AskForLiveBattle.json
+++ b/client/AskForLiveBattle.json
@@ -1,5 +1,5 @@
 {
-  "id": 14106,
+  "id": 16604,
   "name": "askForLiveBattle",
   "fields": [
     {"name": "liveBattleId", "type": "LONG"}
diff --git a/client/AskForProfile.json b/client/AskForProfile.json
index 89961f7..89b246e 100644
--- a/client/AskForProfile.json
+++ b/client/AskForProfile.json
@@ -1,5 +1,5 @@
 {
-  "id": 14113,
+  "id": 19860,
   "name": "AskForProfile",
   "fields": [
     {"name": "accountID", "type": "LONG"}
diff --git a/client/AskForTVContent.json b/client/AskForTVContent.json
index 1d6ba16..f25da9c 100644
--- a/client/AskForTVContent.json
+++ b/client/AskForTVContent.json
@@ -1,5 +1,5 @@
 {
-  "id": 14402,
+  "id": 10185,
   "name": "AskForTVContent",
   "fields": [
     {"name": "arena", "type": "SCID"}
diff --git a/client/AskForTournamentData.json b/client/AskForTournamentData.json
index e429981..aee4182 100644
--- a/client/AskForTournamentData.json
+++ b/client/AskForTournamentData.json
@@ -1,5 +1,5 @@
 {
-  "id": 16104,
+  "id": 10575,
   "name": "AskForTournamentData",
   "fields": [
     {"name": "tournamentID", "type": "LONG"}
diff --git a/client/EndClientTurn.json b/client/EndClientTurn.json
index 5448c7b..ffc6548 100644
--- a/client/EndClientTurn.json
+++ b/client/EndClientTurn.json
@@ -1,5 +1,5 @@
 {
-  "id": 14102,
+  "id": 11688,
   "name": "EndClientTurn",
   "fields": [
     {"name": "tick", "type": "RRSINT32"},
diff --git a/client/HomeBattleReplay.json b/client/HomeBattleReplay.json
index 4982d6f..d11bbd6 100644
--- a/client/HomeBattleReplay.json
+++ b/client/HomeBattleReplay.json
@@ -1,5 +1,5 @@
 {
-  "id": 14114,
+  "id": 15075,
   "name": "HomeBattleReplay",
   "fields": [
     {"name": "battleId", "type": "LONG"},
diff --git a/client/JoinAlliance.json b/client/JoinAlliance.json
index 5aadb66..efe8ab9 100644
--- a/client/JoinAlliance.json
+++ b/client/JoinAlliance.json
@@ -1,5 +1,5 @@
 {
-  "id": 14305,
+  "id": 16190,
   "name": "JoinAlliance",
   "fields": [
     {"name": "allianceId", "type": "LONG"},
diff --git a/client/KeepAlive.json b/client/KeepAlive.json
index 35c6396..053a6ba 100644
--- a/client/KeepAlive.json
+++ b/client/KeepAlive.json
@@ -1,4 +1,4 @@
 {
-  "id": 10108,
+  "id": 19911,
   "name": "KeepAlive"
 }
diff --git a/client/LeaveAlliance.json b/client/LeaveAlliance.json
index 4b537e9..5758a2c 100644
--- a/client/LeaveAlliance.json
+++ b/client/LeaveAlliance.json
@@ -1,5 +1,5 @@
 {
-  "id": 14308,
+  "id": 15985,
   "name": "LeaveAlliance",
   "fields": []
 }
diff --git a/client/SearchAlliances.json b/client/SearchAlliances.json
index 0481e3e..5638be5 100644
--- a/client/SearchAlliances.json
+++ b/client/SearchAlliances.json
@@ -1,5 +1,5 @@
 {
-  "id": 14324,
+  "id": 10949,
   "name": "SearchAlliances",
   "fields": [
     {"name": "searchString", "type": "STRING"},
diff --git a/client/VisitHome.json b/client/VisitHome.json
index 5485186..bccdf69 100644
--- a/client/VisitHome.json
+++ b/client/VisitHome.json
@@ -1,5 +1,5 @@
 {
-  "id": 14113,
+  "id": 19860,
   "name": "VisitHome",
   "fields": [
     {"name": "accountID", "type": "LONG"}
diff --git a/component/ServerCommandComponent.json b/component/ServerCommandComponent.json
index 826865a..346d721 100644
--- a/component/ServerCommandComponent.json
+++ b/component/ServerCommandComponent.json
@@ -5,8 +5,8 @@
   ],
   "extensions": [
     {
-      "id": 206,
-      "name": "LogicJoinAllianceCommand (209)",
+      "id": 263,
+      "name": "LogicJoinAllianceCommand",
       "fields": [
           {"name": "allianceId", "type": "LONG"},
           {"name": "name", "type": "STRING"},
diff --git a/server/AllianceData.json b/server/AllianceData.json
index eabdc40..8063912 100644
--- a/server/AllianceData.json
+++ b/server/AllianceData.json
@@ -1,5 +1,5 @@
 {
-    "id": 24301,
+    "id": 26550,
     "name": "AllianceData",
     "fields": [
         {"name": "header", "type": "AllianceHeaderEntry"},
diff --git a/server/AllianceLocalRankingList.json b/server/AllianceLocalRankingList.json
index 1f3627e..2fcb918 100644
--- a/server/AllianceLocalRankingList.json
+++ b/server/AllianceLocalRankingList.json
@@ -1,5 +1,5 @@
 {
-    "id": 24402,
+    "id": 26973,
     "name": "AllianceLocalRankingList",
     "fields": [
         {"name": "entries", "type": "AllianceRankingEntry[]", "lengthType": "INT"}
diff --git a/server/AllianceRankingList.json b/server/AllianceRankingList.json
index 59e6448..850c3d9 100644
--- a/server/AllianceRankingList.json
+++ b/server/AllianceRankingList.json
@@ -1,5 +1,5 @@
 {
-    "id": 24401,
+    "id": 25105,
     "name": "AllianceRankingList",
     "fields": [
         {"name": "entries", "type": "AllianceRankingEntry[]", "lengthType": "RRSINT32"}
diff --git a/server/AllianceStream.json b/server/AllianceStream.json
index d20ba03..71fd08e 100644
--- a/server/AllianceStream.json
+++ b/server/AllianceStream.json
@@ -1,5 +1,5 @@
 {
-  "id": 24311,
+  "id": 24719,
   "name": "AllianceStream",
   "fields": [
     {"name": "entries", "type": "AllianceStreamComponent[]"}
diff --git a/server/AllianceStreamEntry.json b/server/AllianceStreamEntry.json
index 6182583..8655350 100644
--- a/server/AllianceStreamEntry.json
+++ b/server/AllianceStreamEntry.json
@@ -1,5 +1,5 @@
 {
-  "id": 24312,
+  "id": 21075,
   "name": "AllianceStreamEntry",
   "fields": [
     {"name": "entry", "type": "AllianceStreamComponent"}
diff --git a/server/AvailableServerCommand.json b/server/AvailableServerCommand.json
index 0bbaa95..62dc8c3 100644
--- a/server/AvailableServerCommand.json
+++ b/server/AvailableServerCommand.json
@@ -1,5 +1,5 @@
 {
-  "id": 24111,
+  "id": 23394,
   "name": "AvailableServerCommand",
   "fields": [
     {"name": "command", "type": "ServerCommandComponent"},
diff --git a/server/BattleReportStream.json b/server/BattleReportStream.json
index 8c0190c..10614c9 100644
--- a/server/BattleReportStream.json
+++ b/server/BattleReportStream.json
@@ -1,5 +1,5 @@
 {
-  "id": 24413,
+  "id": 20032,
   "name": "BattleReportStream",
   "fields": [
     {"name": "accountID", "type": "LONG"},
diff --git a/server/HomeBattleReplayData.json b/server/HomeBattleReplayData.json
index ef0c161..5343484 100644
--- a/server/HomeBattleReplayData.json
+++ b/server/HomeBattleReplayData.json
@@ -1,5 +1,5 @@
 {
-  "id": 24114,
+  "id": 25412,
   "name": "HomeBattleReplayData",
   "fields": [
     {"type": "RRSINT32"},
diff --git a/server/JoinableAllianceList.json b/server/JoinableAllianceList.json
index 4fb604a..bc3b360 100644
--- a/server/JoinableAllianceList.json
+++ b/server/JoinableAllianceList.json
@@ -1,5 +1,5 @@
 {
-    "id": 24304,
+    "id": 25445,
     "name": "JoinableAllianceList",
     "fields": [
         {"name": "alliances", "type": "AllianceHeaderEntry[]", "lengthType": "RRSINT32"}
diff --git a/server/KeepAliveOk.json b/server/KeepAliveOk.json
index e58b3e8..30b8a16 100644
--- a/server/KeepAliveOk.json
+++ b/server/KeepAliveOk.json
@@ -1,4 +1,4 @@
 {
-  "id": 20108,
+  "id": 24135,
   "name": "KeepAliveOk"
 }
diff --git a/server/LoginOk.json b/server/LoginOk.json
index 3e6903d..c2ccf7a 100644
--- a/server/LoginOk.json
+++ b/server/LoginOk.json
@@ -1,5 +1,5 @@
 {
-  "id": 20104,
+  "id": 22280,
   "name": "LoginOk",
   "fields": [
     {"name": "userId", "type": "LONG"},
diff --git a/server/OwnHomeData.json b/server/OwnHomeData.json
index d047c92..bf19279 100644
--- a/server/OwnHomeData.json
+++ b/server/OwnHomeData.json
@@ -1,5 +1,5 @@
 {
-  "id": 24101,
+  "id": 28502,
   "name": "OwnHomeData",
   "fields": [
     {"name": "age", "type": "INT"},
diff --git a/server/RoyalTVContent.json b/server/RoyalTVContent.json
index 8580736..ee379b2 100644
--- a/server/RoyalTVContent.json
+++ b/server/RoyalTVContent.json
@@ -1,5 +1,5 @@
 {
-  "id": 24405,
+  "id": 20073,
   "name": "RoyalTVContent",
   "fields": [
     {"name": "RoyaleTVEntry", "type": "RoyaleTVEntry[]", "lengthType": "BYTE"},