diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
index 99f31323f2..56c90a2dab 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -138,6 +138,7 @@ public class ThingsboardInstallService {
                         systemDataLoaderService.deleteSystemWidgetBundle("gateway_widgets");
                         systemDataLoaderService.deleteSystemWidgetBundle("input_widgets");
                         systemDataLoaderService.deleteSystemWidgetBundle("date");
+                        systemDataLoaderService.deleteSystemWidgetBundle("entity_admin_widgets");
 
                         systemDataLoaderService.loadSystemWidgets();
                         break;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesService.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesService.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/device/ClaimDevicesService.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/claim/ClaimData.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/claim/ClaimData.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/device/claim/ClaimData.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/device/claim/ClaimData.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResponse.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResponse.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResponse.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResponse.java
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResult.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResult.java
similarity index 100%
rename from dao/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResult.java
rename to common/dao-api/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResult.java