diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
index 382929e1e7..1f683c7874 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -924,7 +924,7 @@ public abstract class BaseController {
         }
     }
 
-    protected <E extends HasName & HasId<I> & HasTenantId, I extends EntityId> void onEntityUpdatedOrCreated(User user, E savedEntity, E oldEntity, boolean isNewEntity) {
+    protected <E extends HasName & HasId<I>, I extends EntityId> void onEntityUpdatedOrCreated(User user, E savedEntity, E oldEntity, boolean isNewEntity) {
         boolean notifyEdgeService = false;
 
         EntityType entityType = savedEntity.getId().getEntityType();
@@ -954,7 +954,7 @@ public abstract class BaseController {
             case RULE_CHAIN:
                 RuleChainType ruleChainType = ((RuleChain) savedEntity).getType();
                 if (RuleChainType.CORE.equals(ruleChainType)) {
-                    tbClusterService.broadcastEntityStateChangeEvent(savedEntity.getTenantId(), savedEntity.getId(),
+                    tbClusterService.broadcastEntityStateChangeEvent(user.getTenantId(), savedEntity.getId(),
                             isNewEntity ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
                 }
                 if (RuleChainType.EDGE.equals(ruleChainType)) {
@@ -981,7 +981,7 @@ public abstract class BaseController {
             log.error("Failed to log entity action", e);
         }
         if (notifyEdgeService) {
-            sendEntityNotificationMsg(savedEntity.getTenantId(), savedEntity.getId(), isNewEntity ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
+            sendEntityNotificationMsg(user.getTenantId(), savedEntity.getId(), isNewEntity ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
         }
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
index eeaef01f63..ef9da1f89d 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/DefaultEntitiesExportImportService.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.ExportableEntityDao;
 import org.thingsboard.server.dao.TenantEntityDao;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -48,7 +49,7 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
 
     private final Map<EntityType, EntityExportService<?, ?, ?>> exportServices = new HashMap<>();
     private final Map<EntityType, EntityImportService<?, ?, ?>> importServices = new HashMap<>();
-    private final Map<EntityType, TenantEntityDao<?>> daos = new HashMap<>();
+    private final Map<EntityType, Dao<?>> daos = new HashMap<>();
 
     protected static final List<EntityType> SUPPORTED_ENTITY_TYPES = List.of(
             EntityType.CUSTOMER, EntityType.ASSET, EntityType.RULE_CHAIN,
@@ -86,12 +87,6 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
     }
 
 
-    @Override
-    public <E extends HasId<I> & HasTenantId, I extends EntityId> E findEntityById(TenantId tenantId, I id) {
-        TenantEntityDao<E> dao = (TenantEntityDao<E>) getDao(id.getEntityType());
-        return dao.findByTenantIdAndId(tenantId.getId(), id.getId());
-    }
-
     @Override
     public <E extends ExportableEntity<I>, I extends EntityId> E findEntityByExternalId(TenantId tenantId, I externalId) {
         EntityType entityType = externalId.getEntityType();
@@ -105,6 +100,12 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
         return findEntityById(tenantId, externalId);
     }
 
+    @Override
+    public <E extends HasId<I>, I extends EntityId> E findEntityById(TenantId tenantId, I id) {
+        Dao<E> dao = (Dao<E>) getDao(id.getEntityType());
+        return dao.findById(tenantId, id.getId());
+    }
+
 
     @SuppressWarnings("unchecked")
     private <I extends EntityId, E extends ExportableEntity<I>, D extends EntityExportData<E>> EntityExportService<I, E, D> getExportService(EntityType entityType) {
@@ -122,14 +123,14 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
         return (EntityImportService<I, E, D>) importServices.get(entityType);
     }
 
-    private TenantEntityDao<?> getDao(EntityType entityType) {
+    private Dao<?> getDao(EntityType entityType) {
         return daos.get(entityType);
     }
 
     @Autowired
     private void setServices(Collection<EntityExportService<?, ?, ?>> exportServices,
                              Collection<EntityImportService<?, ?, ?>> importServices,
-                             Collection<TenantEntityDao<?>> daos) {
+                             Collection<Dao<?>> daos) {
         exportServices.forEach(entityExportService -> {
             this.exportServices.put(entityExportService.getEntityType(), entityExportService);
         });
@@ -137,7 +138,9 @@ public class DefaultEntitiesExportImportService implements EntitiesExportImportS
             this.importServices.put(entityImportService.getEntityType(), entityImportService);
         });
         daos.forEach(dao -> {
-            this.daos.put(dao.getEntityType(), dao);
+            if (dao.getEntityType() != null) {
+                this.daos.put(dao.getEntityType(), dao);
+            }
         });
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/exporting/ExportableEntitiesService.java b/application/src/main/java/org/thingsboard/server/service/sync/exporting/ExportableEntitiesService.java
index 1c1cf6bf7f..9a47e98920 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/exporting/ExportableEntitiesService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/exporting/ExportableEntitiesService.java
@@ -16,13 +16,14 @@
 package org.thingsboard.server.service.sync.exporting;
 
 import org.thingsboard.server.common.data.ExportableEntity;
-import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
 
-public interface ExportableEntitiesService extends TenantEntitiesService {
+public interface ExportableEntitiesService {
 
     <E extends ExportableEntity<I>, I extends EntityId> E findEntityByExternalId(TenantId tenantId, I externalId);
 
+    <E extends HasId<I>, I extends EntityId> E findEntityById(TenantId tenantId, I id);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/exporting/TenantEntitiesService.java b/application/src/main/java/org/thingsboard/server/service/sync/exporting/TenantEntitiesService.java
deleted file mode 100644
index e3e25c21e8..0000000000
--- a/application/src/main/java/org/thingsboard/server/service/sync/exporting/TenantEntitiesService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.service.sync.exporting;
-
-import org.thingsboard.server.common.data.HasTenantId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.HasId;
-import org.thingsboard.server.common.data.id.TenantId;
-
-public interface TenantEntitiesService {
-
-    <E extends HasId<I> & HasTenantId, I extends EntityId> E findEntityById(TenantId tenantId, I id);
-
-}
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/AssetImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/AssetImportService.java
index b8328a43c3..b9013fd549 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/AssetImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/AssetImportService.java
@@ -34,6 +34,7 @@ public class AssetImportService extends BaseEntityImportService<AssetId, Asset,
 
     @Override
     protected Asset prepareAndSave(TenantId tenantId, Asset asset, AssetExportData exportData, NewIdProvider idProvider) {
+        asset.setTenantId(tenantId);
         asset.setCustomerId(idProvider.get(tenantId, Asset::getCustomerId));
         return assetService.saveAsset(asset);
     }
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/BaseEntityImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/BaseEntityImportService.java
index 608ffe2acf..dbfba4253a 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/BaseEntityImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/BaseEntityImportService.java
@@ -57,7 +57,6 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
         E existingEntity = exportableEntitiesService.findEntityByExternalId(tenantId, entity.getId());
 
         entity.setExternalId(entity.getId());
-        entity.setTenantId(tenantId);
 
         if (existingEntity == null) {
             entity.setId(null);
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/CustomerImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/CustomerImportService.java
index 5ad7161486..92f7371d50 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/CustomerImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/CustomerImportService.java
@@ -34,6 +34,7 @@ public class CustomerImportService extends BaseEntityImportService<CustomerId, C
 
     @Override
     protected Customer prepareAndSave(TenantId tenantId, Customer customer, CustomerExportData exportData, NewIdProvider idProvider) {
+        customer.setTenantId(tenantId);
         return customerService.saveCustomer(customer);
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DashboardImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DashboardImportService.java
index 5525ba8e6b..d23409713b 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DashboardImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DashboardImportService.java
@@ -43,6 +43,7 @@ public class DashboardImportService extends BaseEntityImportService<DashboardId,
     // TODO [viacheslav]: improve the code
     @Override
     protected Dashboard prepareAndSave(TenantId tenantId, Dashboard dashboard, DashboardExportData exportData, NewIdProvider idProvider) {
+        dashboard.setTenantId(tenantId);
         if (dashboard.getId() == null) {
             Set<ShortCustomerInfo> assignedCustomers = idProvider.get(tenantId, Dashboard::getAssignedCustomers, ShortCustomerInfo::getCustomerId, ShortCustomerInfo::setCustomerId);
             dashboard.setAssignedCustomers(null);
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceImportService.java
index 2dcf4f7e7f..f35a20e312 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceImportService.java
@@ -34,6 +34,7 @@ public class DeviceImportService extends BaseEntityImportService<DeviceId, Devic
 
     @Override
     protected Device prepareAndSave(TenantId tenantId, Device device, DeviceExportData exportData, NewIdProvider idProvider) {
+        device.setTenantId(tenantId);
         device.setCustomerId(idProvider.get(tenantId, Device::getCustomerId));
         device.setDeviceProfileId(idProvider.get(tenantId, Device::getDeviceProfileId));
         device.setFirmwareId(idProvider.get(tenantId, Device::getFirmwareId));
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceProfileImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceProfileImportService.java
index 61b1ea16dc..5f6b89a297 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceProfileImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/DeviceProfileImportService.java
@@ -34,6 +34,7 @@ public class DeviceProfileImportService extends BaseEntityImportService<DevicePr
 
     @Override
     protected DeviceProfile prepareAndSave(TenantId tenantId, DeviceProfile deviceProfile, DeviceProfileExportData exportData, NewIdProvider idProvider) {
+        deviceProfile.setTenantId(tenantId);
         deviceProfile.setDefaultRuleChainId(idProvider.get(tenantId, DeviceProfile::getDefaultRuleChainId));
         deviceProfile.setDefaultDashboardId(idProvider.get(tenantId, DeviceProfile::getDefaultDashboardId));
         deviceProfile.setFirmwareId(idProvider.get(tenantId, DeviceProfile::getFirmwareId));
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/RuleChainImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/RuleChainImportService.java
index 5dfc31e97a..dd92d724d9 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/RuleChainImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/importing/impl/RuleChainImportService.java
@@ -42,6 +42,7 @@ public class RuleChainImportService extends BaseEntityImportService<RuleChainId,
 
     @Override
     protected RuleChain prepareAndSave(TenantId tenantId, RuleChain ruleChain, RuleChainExportData exportData, NewIdProvider idProvider) {
+        ruleChain.setTenantId(tenantId);
         RuleChainMetaData metaData = exportData.getMetaData();
         Optional.ofNullable(metaData.getNodes()).orElse(Collections.emptyList())
                 .forEach(ruleNode -> {
diff --git a/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java b/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java
index 464b5da401..f114af6625 100644
--- a/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/sql/EntitiesExportImportControllerSqlTest.java
@@ -28,11 +28,10 @@ import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.ExportableEntity;
+import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.asset.Asset;
-import org.thingsboard.server.common.data.id.AssetId;
-import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChain;
@@ -52,7 +51,6 @@ import org.thingsboard.server.service.sync.importing.EntityImportResult;
 
 import java.util.List;
 
-import static org.assertj.core.api.Assertions.as;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -358,7 +356,7 @@ public class EntitiesExportImportControllerSqlTest extends BaseEntitiesExportImp
     }
 
 
-    private <E extends ExportableEntity<?>> void checkImportedEntity(TenantId tenantId1, E initialEntity, TenantId tenantId2, EntityImportResult<E> importResult) {
+    private <E extends ExportableEntity<?> & HasTenantId> void checkImportedEntity(TenantId tenantId1, E initialEntity, TenantId tenantId2, EntityImportResult<E> importResult) {
         E importedEntity = importResult.getSavedEntity();
 
         assertThat(initialEntity.getTenantId()).isEqualTo(tenantId1);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java b/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
index f1e8c3754e..50569b7a02 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ExportableEntity.java
@@ -17,9 +17,8 @@ package org.thingsboard.server.common.data;
 
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
-import org.thingsboard.server.common.data.id.TenantId;
 
-public interface ExportableEntity<I extends EntityId> extends HasId<I>, HasTenantId, HasName {
+public interface ExportableEntity<I extends EntityId> extends HasId<I>, HasName {
 
     I getId();
     void setId(I id);
@@ -27,7 +26,4 @@ public interface ExportableEntity<I extends EntityId> extends HasId<I>, HasTenan
     I getExternalId();
     void setExternalId(I externalId);
 
-    TenantId getTenantId();
-    void setTenantId(TenantId tenantId);
-
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/Dao.java b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
index 932a6e5ec1..038be61d21 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/Dao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao;
 
 import com.google.common.util.concurrent.ListenableFuture;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.TenantId;
 
 import java.util.Collection;
@@ -40,4 +41,6 @@ public interface Dao<T> {
 
     void removeAllByIds(Collection<UUID> ids);
 
+    default EntityType getEntityType() { return null; }
+
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ExportableEntityDao.java b/dao/src/main/java/org/thingsboard/server/dao/ExportableEntityDao.java
index 9f2cd51952..7e4d00286c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ExportableEntityDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ExportableEntityDao.java
@@ -19,7 +19,7 @@ import org.thingsboard.server.common.data.ExportableEntity;
 
 import java.util.UUID;
 
-public interface ExportableEntityDao<T extends ExportableEntity<?>> extends TenantEntityDao<T> {
+public interface ExportableEntityDao<T extends ExportableEntity<?>> extends Dao<T> {
 
     T findByTenantIdAndExternalId(UUID tenantId, UUID externalId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ExportableEntityRepository.java b/dao/src/main/java/org/thingsboard/server/dao/ExportableEntityRepository.java
index 1ce43ffe12..6e2d2e115a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ExportableEntityRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ExportableEntityRepository.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.dao;
 
 import java.util.UUID;
 
-public interface ExportableEntityRepository<D> extends TenantEntityRepository<D> {
+public interface ExportableEntityRepository<D> {
 
     D findByTenantIdAndExternalId(UUID tenantId, UUID externalId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/TenantEntityDao.java b/dao/src/main/java/org/thingsboard/server/dao/TenantEntityDao.java
index 53ffb7882a..17367c2cc7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/TenantEntityDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/TenantEntityDao.java
@@ -15,18 +15,9 @@
  */
 package org.thingsboard.server.dao;
 
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 
-import java.util.UUID;
-
-public interface TenantEntityDao<T extends HasTenantId> {
+public interface TenantEntityDao {
 
     Long countByTenantId(TenantId tenantId);
-
-    T findByTenantIdAndId(UUID tenantId, UUID id);
-
-    EntityType getEntityType();
-
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/TenantEntityRepository.java b/dao/src/main/java/org/thingsboard/server/dao/TenantEntityRepository.java
deleted file mode 100644
index 8997f65ca8..0000000000
--- a/dao/src/main/java/org/thingsboard/server/dao/TenantEntityRepository.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao;
-
-import java.util.UUID;
-
-public interface TenantEntityRepository<D> {
-
-    D findByTenantIdAndId(UUID tenantId, UUID id);
-
-    Long countByTenantId(UUID tenantId);
-
-}
diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java
index c7cf6f38e9..495886bcc4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/asset/AssetDao.java
@@ -34,7 +34,7 @@ import java.util.UUID;
  * The Interface AssetDao.
  *
  */
-public interface AssetDao extends Dao<Asset>, ExportableEntityDao<Asset> {
+public interface AssetDao extends Dao<Asset>, TenantEntityDao, ExportableEntityDao<Asset> {
 
     /**
      * Find asset info by id.
diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java
index df589711b9..89672d2a73 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java
@@ -29,7 +29,7 @@ import java.util.UUID;
 /**
  * The Interface CustomerDao.
  */
-public interface CustomerDao extends Dao<Customer>, ExportableEntityDao<Customer> {
+public interface CustomerDao extends Dao<Customer>, TenantEntityDao, ExportableEntityDao<Customer> {
 
     /**
      * Save or update customer object
diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDao.java
index ef6a739391..90353f49b3 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDao.java
@@ -24,7 +24,7 @@ import org.thingsboard.server.dao.TenantEntityDao;
 /**
  * The Interface DashboardDao.
  */
-public interface DashboardDao extends Dao<Dashboard>, ExportableEntityDao<Dashboard> {
+public interface DashboardDao extends Dao<Dashboard>, TenantEntityDao, ExportableEntityDao<Dashboard> {
 
     /**
      * Save or update dashboard object
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
index 688e7246d4..90f2b218a7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
@@ -36,7 +36,7 @@ import java.util.UUID;
  * The Interface DeviceDao.
  *
  */
-public interface DeviceDao extends Dao<Device>, ExportableEntityDao<Device> {
+public interface DeviceDao extends Dao<Device>, TenantEntityDao, ExportableEntityDao<Device> {
 
     /**
      * Find device info by id.
diff --git a/dao/src/main/java/org/thingsboard/server/dao/ota/OtaPackageDao.java b/dao/src/main/java/org/thingsboard/server/dao/ota/OtaPackageDao.java
index a24df5794c..445210ca3b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/ota/OtaPackageDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/ota/OtaPackageDao.java
@@ -21,6 +21,6 @@ import org.thingsboard.server.dao.Dao;
 import org.thingsboard.server.dao.TenantEntityDao;
 import org.thingsboard.server.dao.TenantEntityWithDataDao;
 
-public interface OtaPackageDao extends Dao<OtaPackage>, TenantEntityWithDataDao, TenantEntityDao<OtaPackage> {
+public interface OtaPackageDao extends Dao<OtaPackage>, TenantEntityWithDataDao {
     Long sumDataSizeByTenantId(TenantId tenantId);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainDao.java
index 47f69cc99d..1d6c1bf29a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainDao.java
@@ -30,7 +30,7 @@ import java.util.UUID;
 /**
  * Created by igor on 3/12/18.
  */
-public interface RuleChainDao extends Dao<RuleChain>, ExportableEntityDao<RuleChain> {
+public interface RuleChainDao extends Dao<RuleChain>, TenantEntityDao, ExportableEntityDao<RuleChain> {
 
     /**
      * Find rule chains by tenantId and page link.
@@ -80,6 +80,4 @@ public interface RuleChainDao extends Dao<RuleChain>, ExportableEntityDao<RuleCh
 
     Collection<RuleChain> findByTenantIdAndTypeAndName(TenantId tenantId, RuleChainType type, String name);
 
-    RuleChain findByTenantIdAndExternalId(UUID tenantId, UUID externalId);
-
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
index cd4fefac48..14788f8b38 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/asset/JpaAssetDao.java
@@ -214,11 +214,6 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> im
         return DaoUtil.getData(assetRepository.findByTenantIdAndExternalId(tenantId, externalId));
     }
 
-    @Override
-    public Asset findByTenantIdAndId(UUID tenantId, UUID id) {
-        return DaoUtil.getData(assetRepository.findByTenantIdAndId(tenantId, id));
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.ASSET;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java
index 893f22503d..1300fcdfa5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java
@@ -38,4 +38,5 @@ public interface CustomerRepository extends JpaRepository<CustomerEntity, UUID>,
 
     CustomerEntity findByTenantIdAndTitle(UUID tenantId, String title);
 
+    Long countByTenantId(UUID tenantId);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java
index 9cf74f1f33..17e1625a29 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/JpaCustomerDao.java
@@ -75,11 +75,6 @@ public class JpaCustomerDao extends JpaAbstractSearchTextDao<CustomerEntity, Cus
         return DaoUtil.getData(customerRepository.findByTenantIdAndExternalId(tenantId, externalId));
     }
 
-    @Override
-    public Customer findByTenantIdAndId(UUID tenantId, UUID id) {
-        return DaoUtil.getData(customerRepository.findByTenantIdAndId(tenantId, id));
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.CUSTOMER;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java
index b65e9997a9..ec3b42a154 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/dashboard/JpaDashboardDao.java
@@ -57,11 +57,6 @@ public class JpaDashboardDao extends JpaAbstractSearchTextDao<DashboardEntity, D
         return DaoUtil.getData(dashboardRepository.findByTenantIdAndExternalId(tenantId, externalId));
     }
 
-    @Override
-    public Dashboard findByTenantIdAndId(UUID tenantId, UUID id) {
-        return DaoUtil.getData(dashboardRepository.findByTenantIdAndId(tenantId, id));
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.DASHBOARD;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java
index 1a5d44900c..884e516833 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceDao.java
@@ -308,11 +308,6 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device>
         return DaoUtil.getData(deviceRepository.findByTenantIdAndExternalId(tenantId, externalId));
     }
 
-    @Override
-    public Device findByTenantIdAndId(UUID tenantId, UUID id) {
-        return findDeviceByTenantIdAndId(TenantId.fromUUID(tenantId), id);
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.DEVICE;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java
index 26e49e9c66..23e564b735 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java
@@ -116,16 +116,6 @@ public class JpaDeviceProfileDao extends JpaAbstractSearchTextDao<DeviceProfileE
         return DaoUtil.getData(deviceProfileRepository.findByTenantIdAndExternalId(tenantId, externalId));
     }
 
-    @Override
-    public Long countByTenantId(TenantId tenantId) {
-        return deviceProfileRepository.countByTenantId(tenantId.getId());
-    }
-
-    @Override
-    public DeviceProfile findByTenantIdAndId(UUID tenantId, UUID id) {
-        return DaoUtil.getData(deviceProfileRepository.findByTenantIdAndId(tenantId, id));
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.DEVICE_PROFILE;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java
index 3f76075e43..54ad850fd0 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/JpaOtaPackageDao.java
@@ -22,7 +22,6 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.OtaPackage;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.ota.OtaPackageDao;
 import org.thingsboard.server.dao.model.sql.OtaPackageEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
@@ -51,16 +50,6 @@ public class JpaOtaPackageDao extends JpaAbstractSearchTextDao<OtaPackageEntity,
         return otaPackageRepository.sumDataSizeByTenantId(tenantId.getId());
     }
 
-    @Override
-    public Long countByTenantId(TenantId tenantId) {
-        return otaPackageRepository.countByTenantId(tenantId.getId());
-    }
-
-    @Override
-    public OtaPackage findByTenantIdAndId(UUID tenantId, UUID id) {
-        return DaoUtil.getData(otaPackageRepository.findByTenantIdAndId(tenantId, id));
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.OTA_PACKAGE;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/OtaPackageRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/OtaPackageRepository.java
index d35a67287a..1500fa6435 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/ota/OtaPackageRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/ota/OtaPackageRepository.java
@@ -18,12 +18,11 @@ package org.thingsboard.server.dao.sql.ota;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.thingsboard.server.dao.TenantEntityRepository;
 import org.thingsboard.server.dao.model.sql.OtaPackageEntity;
 
 import java.util.UUID;
 
-public interface OtaPackageRepository extends JpaRepository<OtaPackageEntity, UUID>, TenantEntityRepository<OtaPackageEntity> {
+public interface OtaPackageRepository extends JpaRepository<OtaPackageEntity, UUID> {
     @Query(value = "SELECT COALESCE(SUM(ota.data_size), 0) FROM ota_package ota WHERE ota.tenant_id = :tenantId AND ota.data IS NOT NULL", nativeQuery = true)
     Long sumDataSizeByTenantId(@Param("tenantId") UUID tenantId);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java
index e2d8aafef3..0d5fea6f98 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDao.java
@@ -114,11 +114,6 @@ public class JpaRuleChainDao extends JpaAbstractSearchTextDao<RuleChainEntity, R
         return DaoUtil.getData(ruleChainRepository.findByTenantIdAndExternalId(tenantId, externalId));
     }
 
-    @Override
-    public RuleChain findByTenantIdAndId(UUID tenantId, UUID id) {
-        return DaoUtil.getData(ruleChainRepository.findByTenantIdAndId(tenantId, id));
-    }
-
     @Override
     public EntityType getEntityType() {
         return EntityType.RULE_CHAIN;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleChainRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleChainRepository.java
index 2b1bca32b3..888951778c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleChainRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleChainRepository.java
@@ -63,6 +63,8 @@ public interface RuleChainRepository extends JpaRepository<RuleChainEntity, UUID
 
     RuleChainEntity findByTenantIdAndTypeAndRootIsTrue(UUID tenantId, RuleChainType ruleChainType);
 
+    Long countByTenantId(UUID tenantId);
+
     List<RuleChainEntity> findByTenantIdAndTypeAndName(UUID tenantId, RuleChainType type, String name);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java
index 42d331cab5..6b2de9872a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/JpaUserDao.java
@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.sql.user;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -98,15 +96,4 @@ public class JpaUserDao extends JpaAbstractSearchTextDao<UserEntity, User> imple
     public Long countByTenantId(TenantId tenantId) {
         return userRepository.countByTenantId(tenantId.getId());
     }
-
-    @Override
-    public User findByTenantIdAndId(UUID tenantId, UUID id) {
-        return DaoUtil.getData(userRepository.findByTenantIdAndId(tenantId, id));
-    }
-
-    @Override
-    public EntityType getEntityType() {
-        return EntityType.USER;
-    }
-
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java
index 98b7cf0d00..51f6138cc1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/user/UserRepository.java
@@ -21,8 +21,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.thingsboard.server.common.data.security.Authority;
-import org.thingsboard.server.dao.TenantEntityDao;
-import org.thingsboard.server.dao.TenantEntityRepository;
 import org.thingsboard.server.dao.model.sql.UserEntity;
 
 import java.util.UUID;
@@ -30,7 +28,7 @@ import java.util.UUID;
 /**
  * @author Valerii Sosliuk
  */
-public interface UserRepository extends JpaRepository<UserEntity, UUID>, TenantEntityRepository<UserEntity> {
+public interface UserRepository extends JpaRepository<UserEntity, UUID> {
 
     UserEntity findByEmail(String email);
 
@@ -49,4 +47,5 @@ public interface UserRepository extends JpaRepository<UserEntity, UUID>, TenantE
                                     @Param("searchText") String searchText,
                                     Pageable pageable);
 
+    Long countByTenantId(UUID tenantId);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
index 7e27c1bf00..b906b3278d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
@@ -24,7 +24,7 @@ import org.thingsboard.server.dao.TenantEntityDao;
 
 import java.util.UUID;
 
-public interface UserDao extends Dao<User>, TenantEntityDao<User> {
+public interface UserDao extends Dao<User>, TenantEntityDao {
 
     /**
      * Save or update user object