diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/CommonsConfigurationModule.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/CommonsConfigurationModule.java
deleted file mode 100644
index f97b4f23f9b..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/CommonsConfigurationModule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration;
-
-import org.eclipse.kapua.commons.core.AbstractKapuaModule;
-import org.eclipse.kapua.service.config.ServiceConfigurationFactory;
-
-public class CommonsConfigurationModule extends AbstractKapuaModule {
-    @Override
-    protected void configureModule() {
-        bind(ServiceConfigurationFactory.class).to(ServiceConfigurationFactoryImpl.class);
-    }
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/KapuaConfigurableServiceBase.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/KapuaConfigurableServiceBase.java
index daebf7f0cf0..be0698d338d 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/KapuaConfigurableServiceBase.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/KapuaConfigurableServiceBase.java
@@ -12,11 +12,13 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.commons.util.ArgumentValidator;
+import org.eclipse.kapua.model.config.metatype.EmptyTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.id.KapuaId;
@@ -29,10 +31,10 @@
 /**
  * Base {@link KapuaConfigurableService} implementation, build upon {@link ServiceConfigurationManager}.
  * <p>
- * Note: at first glance, this might seems like a violation of Composition over Inheritance principle, however:
- * - in this case inheritance is an acceptable strategy due to the strong link between {@link ServiceConfigurationManager#isServiceEnabled(org.eclipse.kapua.storage.TxContext, KapuaId)}
- * and {@link org.eclipse.kapua.service.KapuaService#isServiceEnabled(KapuaId)} (the latter being dependent from the first for configurable services).
- * - this class is nothing more than glue and convenience, demanding all of its logic to the {@link ServiceConfigurationManager}'s instance provided, so no flexibility has been sacrificed
+ * Note: at first glance, this might seems like a violation of Composition over Inheritance principle, however: - in this case inheritance is an acceptable strategy due to the strong link between
+ * {@link ServiceConfigurationManager#isServiceEnabled(org.eclipse.kapua.storage.TxContext, KapuaId)} and {@link org.eclipse.kapua.service.KapuaService#isServiceEnabled(KapuaId)} (the latter being
+ * dependent from the first for configurable services). - this class is nothing more than glue and convenience, demanding all of its logic to the {@link ServiceConfigurationManager}'s instance
+ * provided, so no flexibility has been sacrificed
  *
  * @since 2.0.0
  */
@@ -73,8 +75,11 @@ public KapuaTocd getConfigMetadata(KapuaId scopeId) throws KapuaException {
         ArgumentValidator.notNull(scopeId, "scopeId");
 
         // Check access
-        authorizationService.checkPermission(permissionFactory.newPermission(domain, Actions.read, scopeId));
-        return txManager.execute(tx -> serviceConfigurationManager.getConfigMetadata(tx, scopeId, true));
+        if (!authorizationService.isPermitted(permissionFactory.newPermission(domain, Actions.read, scopeId))) {
+            //Temporary, use Optional instead
+            return new EmptyTocd();
+        }
+        return serviceConfigurationManager.getConfigMetadata(scopeId, true).orElse(null);
     }
 
     @Override
@@ -83,9 +88,10 @@ public Map<String, Object> getConfigValues(KapuaId scopeId) throws KapuaExceptio
         ArgumentValidator.notNull(scopeId, "scopeId");
 
         // Check access
-        authorizationService.checkPermission(permissionFactory.newPermission(domain, Actions.read, scopeId));
-
-        return txManager.execute(tx -> serviceConfigurationManager.getConfigValues(tx, scopeId, true));
+        if (!authorizationService.isPermitted(permissionFactory.newPermission(domain, Actions.read, scopeId))) {
+            return Collections.emptyMap();
+        }
+        return serviceConfigurationManager.getConfigValues(scopeId, true);
     }
 
     @Override
@@ -96,9 +102,6 @@ public void setConfigValues(KapuaId scopeId, KapuaId parentId, Map<String, Objec
 
         authorizationService.checkPermission(permissionFactory.newPermission(domain, Actions.write, scopeId));
 
-        txManager.<Void>execute(tx -> {
-            serviceConfigurationManager.setConfigValues(tx, scopeId, Optional.ofNullable(parentId), values);
-            return null;
-        });
+        serviceConfigurationManager.setConfigValues(scopeId, Optional.ofNullable(parentId), values);
     }
 }
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ResourceBasedServiceConfigurationMetadataProvider.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ResourceBasedServiceConfigurationMetadataProvider.java
new file mode 100644
index 00000000000..0f26ed91e0a
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ResourceBasedServiceConfigurationMetadataProvider.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.commons.configuration;
+
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+
+import org.eclipse.kapua.commons.util.ResourceUtils;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.model.config.metatype.KapuaTmetadata;
+import org.eclipse.kapua.storage.TxContext;
+
+public class ResourceBasedServiceConfigurationMetadataProvider implements ServiceConfigurationMetadataProvider {
+
+    private final XmlUtil xmlUtil;
+
+    public ResourceBasedServiceConfigurationMetadataProvider(XmlUtil xmlUtil) {
+        this.xmlUtil = xmlUtil;
+    }
+
+    @Override
+    public Optional<KapuaTmetadata> fetchMetadata(TxContext txContext, String pid) {
+        URL url = ResourceUtils.getResource(String.format("META-INF/metatypes/%s.xml", pid));
+
+        if (url == null) {
+            return Optional.empty();
+        }
+
+        try {
+            return Optional.ofNullable(xmlUtil.unmarshal(ResourceUtils.openAsReader(url, StandardCharsets.UTF_8), KapuaTmetadata.class))
+                    .filter(v -> v.getOCD() != null && !v.getOCD().isEmpty());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ResourceLimitedServiceConfigurationManagerImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ResourceLimitedServiceConfigurationManagerImpl.java
index f6761ac7510..a517a73163e 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ResourceLimitedServiceConfigurationManagerImpl.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ResourceLimitedServiceConfigurationManagerImpl.java
@@ -21,13 +21,13 @@
 import org.eclipse.kapua.commons.configuration.exception.ServiceConfigurationLimitExceededException;
 import org.eclipse.kapua.commons.configuration.exception.ServiceConfigurationParentLimitExceededException;
 import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.account.Account;
 import org.eclipse.kapua.service.account.AccountListResult;
 import org.eclipse.kapua.service.config.KapuaConfigurableService;
 import org.eclipse.kapua.storage.TxContext;
+import org.eclipse.kapua.storage.TxManager;
 
 public class ResourceLimitedServiceConfigurationManagerImpl
         extends ServiceConfigurationManagerImpl
@@ -38,12 +38,14 @@ public class ResourceLimitedServiceConfigurationManagerImpl
 
     public ResourceLimitedServiceConfigurationManagerImpl(
             String pid,
+            String domain,
+            TxManager txManager,
             ServiceConfigRepository serviceConfigRepository,
             RootUserTester rootUserTester,
             AccountRelativeFinder accountRelativeFinder,
             UsedEntitiesCounter usedEntitiesCounter,
-            XmlUtil xmlUtil) {
-        super(pid, serviceConfigRepository, rootUserTester, xmlUtil);
+            ServiceConfigurationMetadataProvider serviceConfigurationMetadataProvider) {
+        super(pid, domain, txManager, serviceConfigRepository, rootUserTester, serviceConfigurationMetadataProvider);
         this.accountRelativeFinder = accountRelativeFinder;
         this.usedEntitiesCounter = usedEntitiesCounter;
     }
@@ -134,7 +136,7 @@ private long allowedChildEntities(TxContext txContext, KapuaId scopeId, Optional
         if (configuration.isPresent()) { // Checked exceptions be damned, could have been .orElseGet(()->...)
             finalConfig = configuration.get();
         } else {
-            finalConfig = getConfigValues(txContext, scopeId, false);
+            finalConfig = doGetConfigValues(txContext, scopeId, false);
         }
         boolean allowInfiniteChildEntities = (boolean) finalConfig.getOrDefault("infiniteChildEntities", false);
         if (allowInfiniteChildEntities) {
@@ -148,7 +150,7 @@ private long allowedChildEntities(TxContext txContext, KapuaId scopeId, Optional
             // Resources assigned to children
             long childCount = 0;
             for (Account childAccount : childAccounts.getItems()) {
-                Map<String, Object> childConfigValues = getConfigValues(txContext, childAccount.getId(), true);
+                Map<String, Object> childConfigValues = doGetConfigValues(txContext, childAccount.getId(), true);
                 // maxNumberChildEntities can be null if such property is disabled via the
                 // isPropertyEnabled() method in the service implementation. In such case,
                 // it makes sense to treat the service as it had 0 available entities
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationImpl.java
deleted file mode 100644
index 4358ab8198e..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration;
-
-import java.util.Map;
-
-import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
-import org.eclipse.kapua.commons.configuration.metatype.TocdImpl;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-
-/**
- * Service component configuration entity implementation.
- *
- * @since 1.0
- */
-public class ServiceComponentConfigurationImpl implements ServiceComponentConfiguration {
-
-    private String id;
-    private String name;
-    private TocdImpl definition;
-    private Map<String, Object> properties;
-
-    /**
-     * Constructor
-     */
-    public ServiceComponentConfigurationImpl() {
-    }
-
-    /**
-     * Constructor
-     *
-     * @param id
-     */
-    public ServiceComponentConfigurationImpl(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public void setDefinition(KapuaTocd definition) {
-        this.definition = (TocdImpl) definition;
-    }
-
-    @Override
-    public KapuaTocd getDefinition() {
-        return definition;
-    }
-
-    @Override
-    public Map<String, Object> getProperties() {
-        return properties;
-    }
-
-    @Override
-    public void setProperties(Map<String, Object> properties) {
-        this.properties = properties;
-    }
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationFactoryImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationFactoryImpl.java
deleted file mode 100644
index 2be35298a32..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationFactoryImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration;
-
-import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
-import org.eclipse.kapua.service.config.ServiceConfiguration;
-import org.eclipse.kapua.service.config.ServiceConfigurationFactory;
-
-import javax.inject.Singleton;
-
-/**
- * Service configuration entity service factory implementation.
- *
- * @since 1.0
- */
-@Singleton
-public class ServiceConfigurationFactoryImpl implements ServiceConfigurationFactory {
-
-    @Override
-    public ServiceComponentConfiguration newComponentConfigurationInstance(String componentConfigurationId) {
-        return new ServiceComponentConfigurationImpl(componentConfigurationId);
-    }
-
-    @Override
-    public ServiceConfiguration newConfigurationInstance() {
-        return new ServiceConfigurationImpl();
-    }
-
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManager.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManager.java
index 6bcc162ea5e..bb9c4ea9436 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManager.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManager.java
@@ -12,20 +12,23 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration;
 
+import java.util.Map;
+import java.util.Optional;
+
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.KapuaService;
+import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
 import org.eclipse.kapua.storage.TxContext;
 
-import java.util.Map;
-import java.util.Optional;
-
 public interface ServiceConfigurationManager {
+
     /**
      * Whether this {@link KapuaService} is enabled for the given scope {@link KapuaId}.
      *
-     * @param scopeId The scope {@link KapuaId} for which to check.
+     * @param scopeId
+     *         The scope {@link KapuaId} for which to check.
      * @return {@code true} if the {@link KapuaService} is enabled, {@code false} otherwise.
      * @since 1.2.0
      */
@@ -33,11 +36,17 @@ default boolean isServiceEnabled(TxContext txContext, KapuaId scopeId) {
         return true;
     }
 
+    String getDomain();
+
     void checkAllowedEntities(TxContext txContext, KapuaId scopeId, String entityType) throws KapuaException;
 
-    void setConfigValues(TxContext txContext, KapuaId scopeId, Optional<KapuaId> parentId, Map<String, Object> values) throws KapuaException;
+    void setConfigValues(KapuaId scopeId, Optional<KapuaId> parentId, Map<String, Object> values) throws KapuaException;
 
     Map<String, Object> getConfigValues(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException;
 
-    KapuaTocd getConfigMetadata(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException;
+    Map<String, Object> getConfigValues(KapuaId scopeId, boolean excludeDisabled) throws KapuaException;
+
+    Optional<KapuaTocd> getConfigMetadata(KapuaId scopeId, boolean excludeDisabled) throws KapuaException;
+
+    Optional<ServiceComponentConfiguration> extractServiceComponentConfiguration(KapuaId scopeId) throws KapuaException;
 }
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManagerCachingWrapper.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManagerCachingWrapper.java
index f8bb6fc3bb4..285a7b02dd7 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManagerCachingWrapper.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManagerCachingWrapper.java
@@ -12,6 +12,9 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration;
 
+import java.util.Map;
+import java.util.Optional;
+
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.eclipse.kapua.KapuaException;
@@ -23,12 +26,11 @@
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.account.Account;
 import org.eclipse.kapua.service.config.KapuaConfigurableService;
+import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
 import org.eclipse.kapua.storage.TxContext;
 
-import java.util.Map;
-import java.util.Optional;
-
 public class ServiceConfigurationManagerCachingWrapper implements ServiceConfigurationManager {
+
     private final ServiceConfigurationManager wrapped;
 
     private static final int LOCAL_CACHE_SIZE_MAX = SystemSetting.getInstance().getInt(SystemSettingKey.TMETADATA_LOCAL_CACHE_SIZE_MAXIMUM, 100);
@@ -48,29 +50,36 @@ public class ServiceConfigurationManagerCachingWrapper implements ServiceConfigu
     private final LocalCache<Pair<KapuaId, Boolean>, KapuaTocd> kapuaTocdLocalCache = new LocalCache<>(LOCAL_CACHE_SIZE_MAX, null);
 
     /**
-     * This cache only holds the {@link Boolean} value {@literal True} if the {@link KapuaTocd} has been already read from the file
-     * at least once, regardless of the value. With this we can know when a read from {@code KAPUA_TOCD_LOCAL_CACHE}
-     * returns {@literal null} because of the requested key is not present, and when the key is present but its actual value
-     * is {@literal null}.
+     * This cache only holds the {@link Boolean} value {@literal True} if the {@link KapuaTocd} has been already read from the file at least once, regardless of the value. With this we can know when a
+     * read from {@code KAPUA_TOCD_LOCAL_CACHE} returns {@literal null} because of the requested key is not present, and when the key is present but its actual value is {@literal null}.
      *
      * @since 1.2.0
      */
     private final LocalCache<Pair<KapuaId, Boolean>, Boolean> kapuaTocdEmptyLocalCache = new LocalCache<>(LOCAL_CACHE_SIZE_MAX, false);
 
-
     public ServiceConfigurationManagerCachingWrapper(ServiceConfigurationManager wrapped) {
         this.wrapped = wrapped;
     }
 
+    @Override
+    public String getDomain() {
+        return wrapped.getDomain();
+    }
+
     @Override
     public void checkAllowedEntities(TxContext txContext, KapuaId scopeId, String entityType) throws KapuaException {
         wrapped.checkAllowedEntities(txContext, scopeId, entityType);
     }
 
     @Override
-    public void setConfigValues(TxContext txContext, KapuaId scopeId, Optional<KapuaId> parentId, Map<String, Object> values) throws KapuaException {
-        wrapped.setConfigValues(txContext, scopeId, parentId, values);
+    public void setConfigValues(KapuaId scopeId, Optional<KapuaId> parentId, Map<String, Object> values) throws KapuaException {
+        wrapped.setConfigValues(scopeId, parentId, values);
+
+    }
 
+    @Override
+    public Map<String, Object> getConfigValues(KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
+        return wrapped.getConfigValues(scopeId, excludeDisabled);
     }
 
     @Override
@@ -79,24 +88,24 @@ public Map<String, Object> getConfigValues(TxContext txContext, KapuaId scopeId,
     }
 
     @Override
-    public KapuaTocd getConfigMetadata(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
+    public Optional<KapuaTocd> getConfigMetadata(KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
         // Argument validation
         ArgumentValidator.notNull(scopeId, "scopeId");
 
         // Get the Tocd
         // Keep distinct values for service PID, Scope ID and disabled properties included/excluded from AD
-        Pair<KapuaId, Boolean> cacheKey = Pair.of(scopeId, excludeDisabled);
+        final Pair<KapuaId, Boolean> cacheKey = Pair.of(scopeId, excludeDisabled);
         try {
             // Check if the OCD is already in cache, but not in the "empty" cache
-            KapuaTocd tocd;
-            tocd = kapuaTocdLocalCache.get(cacheKey);
-            if (tocd == null && !kapuaTocdEmptyLocalCache.get(cacheKey)) {
+            Optional<KapuaTocd> tocd;
+            tocd = Optional.ofNullable(kapuaTocdLocalCache.get(cacheKey));
+            if (!tocd.isPresent() && !kapuaTocdEmptyLocalCache.get(cacheKey)) {
                 // If not, read metadata and process it
-                tocd = wrapped.getConfigMetadata(txContext, scopeId, excludeDisabled);
+                tocd = wrapped.getConfigMetadata(scopeId, excludeDisabled);
                 // If null, put it in the "empty" ocd cache, else put it in the "standard" cache
-                if (tocd != null) {
+                if (tocd.isPresent()) {
                     // If the value is not null, put it in "standard" cache and remove the entry from the "empty" cache if present
-                    kapuaTocdLocalCache.put(cacheKey, tocd);
+                    kapuaTocdLocalCache.put(cacheKey, tocd.get());
                     kapuaTocdEmptyLocalCache.remove(cacheKey);
                 } else {
                     // If the value is null, just remember we already read it from file at least once
@@ -108,4 +117,9 @@ public KapuaTocd getConfigMetadata(TxContext txContext, KapuaId scopeId, boolean
             throw KapuaException.internalError(e);
         }
     }
+
+    @Override
+    public Optional<ServiceComponentConfiguration> extractServiceComponentConfiguration(KapuaId scopeId) throws KapuaException {
+        return wrapped.extractServiceComponentConfiguration(scopeId);
+    }
 }
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManagerImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManagerImpl.java
index db73a029e27..7dd2137e2c7 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManagerImpl.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationManagerImpl.java
@@ -12,9 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration;
 
-import java.io.IOException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,7 +22,6 @@
 import java.util.stream.Collectors;
 
 import javax.validation.constraints.NotNull;
-import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 
 import org.eclipse.kapua.KapuaEntityNotFoundException;
@@ -32,36 +29,39 @@
 import org.eclipse.kapua.KapuaIllegalArgumentException;
 import org.eclipse.kapua.KapuaIllegalNullArgumentException;
 import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
-import org.eclipse.kapua.commons.service.internal.KapuaServiceDisabledException;
 import org.eclipse.kapua.commons.util.ArgumentValidator;
-import org.eclipse.kapua.commons.util.ResourceUtils;
 import org.eclipse.kapua.commons.util.StringUtil;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.model.KapuaEntityAttributes;
 import org.eclipse.kapua.model.config.metatype.KapuaTad;
 import org.eclipse.kapua.model.config.metatype.KapuaTmetadata;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.config.KapuaConfigurableService;
+import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
 import org.eclipse.kapua.storage.TxContext;
-import org.xml.sax.SAXException;
+import org.eclipse.kapua.storage.TxManager;
 
 public class ServiceConfigurationManagerImpl implements ServiceConfigurationManager {
 
     protected final String pid;
+    protected final TxManager txManager;
+    private final String domain;
     private final ServiceConfigRepository serviceConfigRepository;
     private final RootUserTester rootUserTester;
-    private final XmlUtil xmlUtil;
+    private final ServiceConfigurationMetadataProvider serviceConfigurationMetadataProvider;
 
     public ServiceConfigurationManagerImpl(
             String pid,
+            String domain, TxManager txManager,
             ServiceConfigRepository serviceConfigRepository,
             RootUserTester rootUserTester,
-            XmlUtil xmlUtil) {
+            ServiceConfigurationMetadataProvider serviceConfigurationMetadataProvider) {
         this.pid = pid;
+        this.txManager = txManager;
+        this.domain = domain;
         this.serviceConfigRepository = serviceConfigRepository;
         this.rootUserTester = rootUserTester;
-        this.xmlUtil = xmlUtil;
+        this.serviceConfigurationMetadataProvider = serviceConfigurationMetadataProvider;
     }
 
     /**
@@ -101,6 +101,11 @@ protected boolean validateNewConfigValuesCoherence(TxContext txContext, KapuaToc
         return true;
     }
 
+    @Override
+    public String getDomain() {
+        return domain;
+    }
+
     /**
      * Checks if the given scope {@link KapuaId} can have more entities for this {@link KapuaConfigurableService}.
      *
@@ -117,58 +122,71 @@ public void checkAllowedEntities(TxContext txContext, KapuaId scopeId, String en
     }
 
     @Override
-    public void setConfigValues(TxContext txContext, KapuaId scopeId, Optional<KapuaId> parentId, Map<String, Object> values) throws KapuaException {
-        KapuaTocd ocd = getConfigMetadata(txContext, scopeId, false);
+    public void setConfigValues(KapuaId scopeId, Optional<KapuaId> parentId, Map<String, Object> values) throws KapuaException {
+        txManager.<Void>execute(tx -> {
+            Optional<KapuaTocd> maybeOcd = doGetConfigMetadata(tx, scopeId, false);
+            if (!maybeOcd.isPresent()) {
+                return null;
+                //throw?
+            }
 
-        Map<String, Object> originalValues = getConfigValues(txContext, scopeId, true);
+            final Optional<KapuaTocd> maybeKapuaTocd = doGetConfigMetadata(tx, scopeId, true);
+            if (!maybeKapuaTocd.isPresent()) {
+                return null;
+                //throw?
+            }
 
-        for (KapuaTad ad : ocd.getAD()) {
-            boolean allowSelfEdit = Boolean.parseBoolean(ad.getOtherAttributes().getOrDefault(new QName("allowSelfEdit"), "false"));
-
-            final KapuaId currentUserId = KapuaSecurityUtils.getSession().getUserId();
-            boolean preventChange =
-                    // if current user is not root user...
-                    !rootUserTester.isRoot(currentUserId) &&
-                            // current configuration does not allow self edit...
-                            !allowSelfEdit &&
-                            // a configuration for the current logged account is about to be changed...
-                            KapuaSecurityUtils.getSession().getScopeId().equals(scopeId) &&
-                            // and the new value is different from the other one...
-                            !originalValues.get(ad.getId()).equals(values.get(ad.getId()));
-
-            if (preventChange) {
-                // ... prevent the change!
-                throw KapuaException.internalError(String.format("The configuration \"%s\" cannot be changed by this user in this account", ad.getId()));
+            Map<String, Object> originalValues = doGetConfigValues(tx, scopeId, maybeKapuaTocd.get());
+
+            for (KapuaTad ad : maybeOcd.get().getAD()) {
+                boolean allowSelfEdit = Boolean.parseBoolean(ad.getOtherAttributes().getOrDefault(new QName("allowSelfEdit"), "false"));
+
+                final KapuaId currentUserId = KapuaSecurityUtils.getSession().getUserId();
+                boolean preventChange =
+                        // if current user is not root user...
+                        !rootUserTester.isRoot(currentUserId) &&
+                                // current configuration does not allow self edit...
+                                !allowSelfEdit &&
+                                // a configuration for the current logged account is about to be changed...
+                                KapuaSecurityUtils.getSession().getScopeId().equals(scopeId) &&
+                                // and the new value is different from the other one...
+                                !originalValues.get(ad.getId()).equals(values.get(ad.getId()));
+
+                if (preventChange) {
+                    // ... prevent the change!
+                    throw KapuaException.internalError(String.format("The configuration \"%s\" cannot be changed by this user in this account", ad.getId()));
+                }
             }
-        }
 
-        validateConfigurations(txContext, ocd, values, scopeId, parentId);
+            validateConfigurations(tx, maybeOcd.get(), values, scopeId, parentId);
 
-        ServiceConfigQueryImpl query = new ServiceConfigQueryImpl(scopeId);
-        query.setPredicate(
-                query.andPredicate(
-                        query.attributePredicate(ServiceConfigAttributes.SERVICE_ID, pid),
-                        query.attributePredicate(KapuaEntityAttributes.SCOPE_ID, scopeId)
-                )
-        );
+            ServiceConfigQueryImpl query = new ServiceConfigQueryImpl(scopeId);
+            query.setPredicate(
+                    query.andPredicate(
+                            query.attributePredicate(ServiceConfigAttributes.SERVICE_ID, pid),
+                            query.attributePredicate(KapuaEntityAttributes.SCOPE_ID, scopeId)
+                    )
+            );
 
-        ServiceConfigListResult result = serviceConfigRepository.query(txContext, query);
+            ServiceConfigListResult result = serviceConfigRepository.query(tx, query);
 
-        Properties props = toProperties(values);
-        if (result == null || result.isEmpty()) {
-            // In not exists create then return
-            ServiceConfig serviceConfigNew = new ServiceConfigImpl(scopeId);
-            serviceConfigNew.setPid(pid);
-            serviceConfigNew.setConfigurations(props);
+            Properties props = toProperties(values);
+            if (result == null || result.isEmpty()) {
+                // In not exists create then return
+                ServiceConfig serviceConfigNew = new ServiceConfigImpl(scopeId);
+                serviceConfigNew.setPid(pid);
+                serviceConfigNew.setConfigurations(props);
 
-            createConfig(txContext, serviceConfigNew);
-        } else {
-            // If exists update it
-            ServiceConfig serviceConfig = result.getFirstItem();
-            serviceConfig.setConfigurations(props);
+                createConfig(tx, serviceConfigNew);
+            } else {
+                // If exists update it
+                ServiceConfig serviceConfig = result.getFirstItem();
+                serviceConfig.setConfigurations(props);
 
-            updateConfig(txContext, serviceConfig);
-        }
+                updateConfig(tx, serviceConfig);
+            }
+            return null;
+        });
     }
 
     /**
@@ -252,7 +270,7 @@ private void validateConfigurations(TxContext txContext, KapuaTocd ocd, Map<Stri
 
         if (!disabledProperties.isEmpty()) {
             // If there's any disabled property, read current values to overwrite the proposed ones
-            Map<String, Object> originalValues = getConfigValues(txContext, scopeId, false);
+            Map<String, Object> originalValues = doGetConfigValues(txContext, scopeId, false);
             if (originalValues != null) {
                 disabledProperties.forEach(disabledProp -> updatedProps.put(disabledProp.getId(), originalValues.get(disabledProp.getId())));
             }
@@ -329,10 +347,37 @@ private void checkRequiredProperties(KapuaTocd ocd, Map<String, Object> updatedP
      * @throws KapuaException
      * @since 1.3.0
      */
+    @Override
+    public Map<String, Object> getConfigValues(KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
+        // Argument validation
+        ArgumentValidator.notNull(scopeId, "scopeId");
+
+        return txManager.execute(txContext -> doGetConfigValues(txContext, scopeId, excludeDisabled));
+    }
+
     @Override
     public Map<String, Object> getConfigValues(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
         // Argument validation
         ArgumentValidator.notNull(scopeId, "scopeId");
+
+        return doGetConfigValues(txContext, scopeId, excludeDisabled);
+    }
+
+    protected Map<String, Object> doGetConfigValues(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
+        final Optional<KapuaTocd> metadata = doGetConfigMetadata(txContext, scopeId, excludeDisabled);
+        return metadata.map(m -> {
+            try {
+                return doGetConfigValues(txContext, scopeId, m);
+            } catch (KapuaException e) {
+                throw new RuntimeException(e);
+            }
+        }).orElse(Collections.emptyMap());
+    }
+
+    protected Map<String, Object> doGetConfigValues(TxContext txContext, KapuaId scopeId, KapuaTocd metadata) throws KapuaException {
+        if (metadata == null) {
+            return null;
+        }
         // Get configuration values
         final ServiceConfigListResult result = serviceConfigRepository.findByScopeAndPid(txContext, scopeId, pid);
 
@@ -341,9 +386,7 @@ public Map<String, Object> getConfigValues(TxContext txContext, KapuaId scopeId,
             properties = result.getFirstItem().getConfigurations();
         }
 
-        KapuaTocd ocd = getConfigMetadata(txContext, scopeId, excludeDisabled);
-
-        return ocd == null ? null : toValues(ocd, properties);
+        return toValues(metadata, properties);
     }
 
     /**
@@ -380,21 +423,42 @@ private static Map<String, Object> toValues(@NotNull KapuaTocd ocd, Properties p
      * @since 1.3.0
      */
     @Override
-    public KapuaTocd getConfigMetadata(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
+    public Optional<KapuaTocd> getConfigMetadata(KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
+        return txManager.execute(txContext -> doGetConfigMetadata(txContext, scopeId, excludeDisabled));
+    }
+
+    protected Optional<KapuaTocd> doGetConfigMetadata(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
         // Argument validation
         ArgumentValidator.notNull(scopeId, "scopeId");
         // Check disabled service
         if (!isServiceEnabled(txContext, scopeId)) {
-            throw new KapuaServiceDisabledException(pid);
+            return Optional.empty();
         }
         // Get the Tocd
         try {
-            return processMetadata(txContext, readMetadata(pid), scopeId, excludeDisabled);
+            return processMetadata(txContext, serviceConfigurationMetadataProvider.fetchMetadata(txContext, pid), scopeId, excludeDisabled);
         } catch (Exception e) {
             throw KapuaException.internalError(e);
         }
     }
 
+    @Override
+    public Optional<ServiceComponentConfiguration> extractServiceComponentConfiguration(KapuaId scopeId) throws KapuaException {
+        return txManager.execute(txContext -> {
+            final Optional<KapuaTocd> maybeMetadata = this.doGetConfigMetadata(txContext, scopeId, true);
+            if (!maybeMetadata.isPresent()) {
+                return Optional.empty();
+            }
+            final KapuaTocd metadata = maybeMetadata.get();
+            final Map<String, Object> values = this.doGetConfigValues(txContext, scopeId, metadata);
+            final ServiceComponentConfiguration res = new ServiceComponentConfiguration(metadata.getId());
+            res.setDefinition(metadata);
+            res.setName(metadata.getName());
+            res.setProperties(values);
+            return Optional.of(res);
+        });
+    }
+
     /**
      * Process {@link KapuaTmetadata} to exclude disabled {@link KapuaTocd}s and {@link KapuaTad}s if requested.
      *
@@ -405,35 +469,15 @@ public KapuaTocd getConfigMetadata(TxContext txContext, KapuaId scopeId, boolean
      * @return The processed {@link KapuaTocd}.
      * @since 1.3.0
      */
-    private KapuaTocd processMetadata(TxContext txContext, KapuaTmetadata metadata, KapuaId scopeId, boolean excludeDisabled) {
-        if (metadata != null && metadata.getOCD() != null && !metadata.getOCD().isEmpty()) {
-            for (KapuaTocd ocd : metadata.getOCD()) {
+    private Optional<KapuaTocd> processMetadata(TxContext txContext, Optional<KapuaTmetadata> metadata, KapuaId scopeId, boolean excludeDisabled) {
+        return metadata.flatMap(meta -> {
+            for (KapuaTocd ocd : meta.getOCD()) {
                 if (ocd.getId() != null && ocd.getId().equals(pid) && isServiceEnabled(txContext, scopeId)) {
                     ocd.getAD().removeIf(ad -> excludeDisabled && !isPropertyEnabled(ad, scopeId));
-                    return ocd;
+                    return Optional.of(ocd);
                 }
             }
-        }
-        return null;
+            return Optional.empty();
+        });
     }
-
-    /**
-     * Reads the {@link KapuaTmetadata} for the given {@link KapuaConfigurableService} pid.
-     *
-     * @param pid
-     *         The {@link KapuaConfigurableService} pid
-     * @return The {@link KapuaTmetadata} for the given {@link KapuaConfigurableService} pid.
-     * @throws Exception
-     * @since 1.0.0
-     */
-    private KapuaTmetadata readMetadata(String pid) throws JAXBException, SAXException, IOException {
-        URL url = ResourceUtils.getResource(String.format("META-INF/metatypes/%s.xml", pid));
-
-        if (url == null) {
-            return null;
-        }
-
-        return xmlUtil.unmarshal(ResourceUtils.openAsReader(url, StandardCharsets.UTF_8), KapuaTmetadata.class);
-    }
-
 }
\ No newline at end of file
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationMetadataProvider.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationMetadataProvider.java
new file mode 100644
index 00000000000..85d334aa49b
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationMetadataProvider.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.commons.configuration;
+
+import java.util.Optional;
+
+import org.eclipse.kapua.model.config.metatype.KapuaTmetadata;
+import org.eclipse.kapua.model.config.metatype.KapuaTocd;
+import org.eclipse.kapua.service.config.KapuaConfigurableService;
+import org.eclipse.kapua.storage.TxContext;
+
+public interface ServiceConfigurationMetadataProvider {
+
+    /**
+     * Reads the {@link KapuaTmetadata} for the given {@link KapuaConfigurableService} pid. If no metadata can be found, just return Optional.empty() Same if the metadata is empty (containing no
+     * {@link KapuaTocd}s)
+     *
+     * @param txContext
+     *         the transaction context (can be ignored if the data source is not transactional)
+     * @param pid
+     *         The {@link KapuaConfigurableService} pid
+     * @return The {@link KapuaTmetadata} for the given {@link KapuaConfigurableService} pid.
+     * @since 1.0.0
+     */
+    Optional<KapuaTmetadata> fetchMetadata(TxContext txContext, String pid);
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationsFacade.java
similarity index 50%
rename from commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationImpl.java
rename to commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationsFacade.java
index c2a82883382..b7d350889b8 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationImpl.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationsFacade.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2022 Eurotech and/or its affiliates and others
+ * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -12,30 +12,19 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration;
 
-import java.util.ArrayList;
-import java.util.List;
-
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
 import org.eclipse.kapua.service.config.ServiceConfiguration;
 
-/**
- * Service configuration entity implementation.
- *
- * @since 1.0
- */
-public class ServiceConfigurationImpl implements ServiceConfiguration {
+public interface ServiceConfigurationsFacade {
 
-    private static final long serialVersionUID = -2167999497954676423L;
+    ServiceConfiguration fetchAllConfigurations(KapuaId scopeId) throws KapuaException;
 
-    private List<ServiceComponentConfiguration> configurations;
+    void update(KapuaId scopeId, ServiceConfiguration serviceConfiguration) throws KapuaException;
 
-    public ServiceConfigurationImpl() {
-        configurations = new ArrayList<>();
-    }
+    ServiceComponentConfiguration fetchConfiguration(KapuaId scopeId, String serviceId) throws KapuaException;
 
-    @Override
-    public List<ServiceComponentConfiguration> getComponentConfigurations() {
-        return configurations;
-    }
+    void update(KapuaId scopeId, String serviceId, ServiceComponentConfiguration newServiceComponentConfiguration) throws KapuaException;
 
 }
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationsFacadeImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationsFacadeImpl.java
new file mode 100644
index 00000000000..a686d807ad5
--- /dev/null
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationsFacadeImpl.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.commons.configuration;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.KapuaIllegalArgumentException;
+import org.eclipse.kapua.model.domain.Actions;
+import org.eclipse.kapua.model.id.KapuaId;
+import org.eclipse.kapua.service.account.Account;
+import org.eclipse.kapua.service.account.AccountService;
+import org.eclipse.kapua.service.authorization.AuthorizationService;
+import org.eclipse.kapua.service.authorization.permission.PermissionFactory;
+import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
+import org.eclipse.kapua.service.config.ServiceConfiguration;
+
+public class ServiceConfigurationsFacadeImpl implements ServiceConfigurationsFacade {
+
+    private final Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass;
+    private final Map<String, ServiceConfigurationManager> serviceConfigurationManagersByServiceClassName;
+    protected final AuthorizationService authorizationService;
+    protected final PermissionFactory permissionFactory;
+    protected final AccountService accountService;
+
+    @Inject
+    public ServiceConfigurationsFacadeImpl(Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass, AuthorizationService authorizationService,
+            PermissionFactory permissionFactory, AccountService accountService) {
+        this.serviceConfigurationManagersByServiceClass = serviceConfigurationManagersByServiceClass;
+        this.serviceConfigurationManagersByServiceClassName =
+                serviceConfigurationManagersByServiceClass.entrySet().stream().collect(Collectors.toMap(kv -> kv.getKey().getName(), kv -> kv.getValue()));
+        this.authorizationService = authorizationService;
+        this.permissionFactory = permissionFactory;
+        this.accountService = accountService;
+    }
+
+    @Override
+    public ServiceConfiguration fetchAllConfigurations(KapuaId scopeId) throws KapuaException {
+        final ServiceConfiguration res = new ServiceConfiguration();
+
+        for (ServiceConfigurationManager configurableService : serviceConfigurationManagersByServiceClass.values()) {
+            if (!authorizationService.isPermitted(permissionFactory.newPermission(configurableService.getDomain(), Actions.read, scopeId))) {
+                continue;
+            }
+            configurableService.extractServiceComponentConfiguration(scopeId).ifPresent(res.getComponentConfigurations()::add);
+        }
+        return res;
+    }
+
+    @Override
+    public ServiceComponentConfiguration fetchConfiguration(KapuaId scopeId, String serviceId) throws KapuaException {
+        final ServiceConfigurationManager serviceConfigurationManager = serviceConfigurationManagersByServiceClassName.get(serviceId);
+        if (serviceConfigurationManager == null) {
+            throw new KapuaIllegalArgumentException("service.pid", serviceId);
+        }
+        authorizationService.checkPermission(permissionFactory.newPermission(serviceConfigurationManager.getDomain(), Actions.read, scopeId));
+        return serviceConfigurationManager.extractServiceComponentConfiguration(scopeId).orElse(null);
+    }
+
+    @Override
+    public void update(KapuaId scopeId, ServiceConfiguration newServiceConfiguration) throws KapuaException {
+        final Account account = accountService.find(scopeId);
+
+        for (ServiceComponentConfiguration newServiceComponentConfiguration : newServiceConfiguration.getComponentConfigurations()) {
+            doUpdateServiceComponentConfiguration(account, scopeId, newServiceComponentConfiguration.getId(), newServiceComponentConfiguration);
+        }
+    }
+
+    @Override
+    public void update(KapuaId scopeId, String serviceId, ServiceComponentConfiguration newServiceComponentConfiguration) throws KapuaException {
+        final Account account = accountService.find(scopeId);
+        doUpdateServiceComponentConfiguration(account, scopeId, serviceId, newServiceComponentConfiguration);
+    }
+
+    private void doUpdateServiceComponentConfiguration(Account account, KapuaId scopeId, String serviceId, ServiceComponentConfiguration newServiceComponentConfiguration) throws KapuaException {
+        final ServiceConfigurationManager serviceConfigurationManager = serviceConfigurationManagersByServiceClassName.get(serviceId);
+        if (serviceConfigurationManager == null) {
+            throw new KapuaIllegalArgumentException("serviceConfiguration.componentConfiguration.id", newServiceComponentConfiguration.getId());
+        }
+        if (!authorizationService.isPermitted(permissionFactory.newPermission(serviceConfigurationManager.getDomain(), Actions.write, scopeId))) {
+            //TODO: Or maybe throw?
+            return;
+        }
+        serviceConfigurationManager.setConfigValues(scopeId, Optional.ofNullable(account.getScopeId()), newServiceComponentConfiguration.getProperties());
+    }
+}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ValueTokenizer.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ValueTokenizer.java
index afde37a28c5..0658873c578 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/ValueTokenizer.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/ValueTokenizer.java
@@ -13,20 +13,19 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration;
 
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
-import org.eclipse.kapua.model.config.metatype.KapuaTad;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.kapua.model.config.metatype.KapuaTad;
+import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
- * The implementation of this class is inspired from the org.eclipse.equinox.metatype.impl.ValueTokenizer class
- * in the Eclipse Equinox project.
+ * The implementation of this class is inspired from the org.eclipse.equinox.metatype.impl.ValueTokenizer class in the Eclipse Equinox project.
  *
  * @since 1.0
  */
@@ -215,7 +214,7 @@ else if (values.size() > cardinality) {
                 boolean rangeError = false;
                 Object minVal = null;
                 Object maxVal = null;
-                TscalarImpl adScalarType = TscalarImpl.fromValue(ad.getType().value());
+                KapuaTscalar adScalarType = KapuaTscalar.fromValue(ad.getType().value());
                 switch (adScalarType) {
                 case PASSWORD:
                 case STRING:
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/CommonsMetatypeModule.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/CommonsMetatypeModule.java
deleted file mode 100644
index 7768fa46364..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/CommonsMetatypeModule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import org.eclipse.kapua.commons.core.AbstractKapuaModule;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
-
-public class CommonsMetatypeModule extends AbstractKapuaModule {
-    @Override
-    protected void configureModule() {
-        bind(KapuaMetatypeFactory.class).to(KapuaMetatypeFactoryImpl.class);
-    }
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/KapuaMetatypeFactoryImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/KapuaMetatypeFactoryImpl.java
deleted file mode 100644
index 2062cc53a83..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/KapuaMetatypeFactoryImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
-import org.eclipse.kapua.model.config.metatype.KapuaTad;
-import org.eclipse.kapua.model.config.metatype.KapuaTdesignate;
-import org.eclipse.kapua.model.config.metatype.KapuaTicon;
-import org.eclipse.kapua.model.config.metatype.KapuaTmetadata;
-import org.eclipse.kapua.model.config.metatype.KapuaTobject;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
-
-import javax.inject.Singleton;
-
-/**
- * Kapua metatype objects factory service implementation.
- *
- * @since 1.0
- */
-@Singleton
-public class KapuaMetatypeFactoryImpl implements KapuaMetatypeFactory {
-
-    @Override
-    public KapuaTocd newKapuaTocd() {
-        return new TocdImpl();
-    }
-
-    @Override
-    public KapuaTad newKapuaTad() {
-        return new TadImpl();
-    }
-
-    @Override
-    public KapuaTscalar newKapuaTscalar(String type) {
-        return TscalarImpl.fromValue(type);
-    }
-
-    @Override
-    public KapuaToption newKapuaToption() {
-        return new ToptionImpl();
-    }
-
-    @Override
-    public KapuaTicon newKapuaTicon() {
-        return new TiconImpl();
-    }
-
-    public KapuaTmetadata newKapuaTmetadata() {
-        return new TmetadataImpl();
-    }
-
-    public KapuaTdesignate newKapuaTdesignate() {
-        return new TdesignateImpl();
-    }
-
-    public KapuaTobject newKapuaTobject() {
-        return new TobjectImpl();
-    }
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/ObjectFactoryImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/ObjectFactoryImpl.java
deleted file mode 100644
index 7ebdaa7b2a2..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/ObjectFactoryImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * ObjectFactory allows you to programmatically construct new instances of the Java representation for XML content.<br>
- * The Java representation of XML content can consist of schema derived interfaces and classes representing the binding of schema type definitions, element declarations and model groups. Factory
- * methods for each of these are provided in this class.
- *
- * @since 1.0
- */
-@XmlRegistry
-public class ObjectFactoryImpl {
-
-    private static final QName _MetaData_QNAME = new QName("http://www.osgi.org/xmlns/metatype/v1.2.0", "MetaData");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes.
-     */
-    public ObjectFactoryImpl() {
-    }
-
-    /**
-     * Create an instance of {@link TiconImpl }
-     */
-    public TiconImpl createTicon() {
-        return new TiconImpl();
-    }
-
-    /**
-     * Create an instance of {@link TattributeImpl }
-     */
-    public TattributeImpl createTattribute() {
-        return new TattributeImpl();
-    }
-
-    /**
-     * Create an instance of {@link TmetadataImpl }
-     */
-    public TmetadataImpl createTmetadata() {
-        return new TmetadataImpl();
-    }
-
-    /**
-     * Create an instance of {@link TdesignateImpl }
-     */
-    public TdesignateImpl createTdesignate() {
-        return new TdesignateImpl();
-    }
-
-    /**
-     * Create an instance of {@link TadImpl }
-     */
-    public TadImpl createTad() {
-        return new TadImpl();
-    }
-
-    /**
-     * Create an instance of {@link TobjectImpl }
-     */
-    public TobjectImpl createTobject() {
-        return new TobjectImpl();
-    }
-
-    /**
-     * Create an instance of {@link TocdImpl }
-     */
-    public TocdImpl createTocd() {
-        return new TocdImpl();
-    }
-
-    /**
-     * Create an instance of {@link ToptionImpl }
-     */
-    public ToptionImpl createToption() {
-        return new ToptionImpl();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TmetadataImpl }{@code >}}
-     */
-    @XmlElementDecl(namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0", name = "MetaData")
-    public JAXBElement<TmetadataImpl> createMetaData(TmetadataImpl value) {
-        return new JAXBElement<>(_MetaData_QNAME, TmetadataImpl.class, null, value);
-    }
-
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/PasswordPropertyAdapter.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/PasswordPropertyAdapter.java
index 68e5147c6a9..62bc7c33215 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/PasswordPropertyAdapter.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/PasswordPropertyAdapter.java
@@ -12,15 +12,18 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration.metatype;
 
-import com.google.common.base.Strings;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
+import org.eclipse.kapua.model.config.metatype.Password;
 import org.eclipse.kapua.model.xml.XmlPropertyAdapted;
 import org.eclipse.kapua.model.xml.adapters.ClassBasedXmlPropertyAdapterBase;
 
-import java.util.Arrays;
-import java.util.stream.Collectors;
+import com.google.common.base.Strings;
 
 public class PasswordPropertyAdapter extends ClassBasedXmlPropertyAdapterBase<Password> {
+
     private final CryptoUtil cryptoUtil;
 
     public PasswordPropertyAdapter(CryptoUtil cryptoUtil) {
@@ -51,8 +54,10 @@ public Password unmarshallValue(String value) {
     /**
      * Unmarshalls the given value according to {@link XmlPropertyAdapted#isEncrypted()}.
      *
-     * @param value The value to unmarshall.
-     * @param isEncrypted The {@link XmlPropertyAdapted#isEncrypted()}.
+     * @param value
+     *         The value to unmarshall.
+     * @param isEncrypted
+     *         The {@link XmlPropertyAdapted#isEncrypted()}.
      * @return The unmarshalled {@link Password}
      * @since 2.1.0
      */
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TadImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TadImpl.java
deleted file mode 100644
index 4697b30f65d..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TadImpl.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTad;
-import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for Tad complex type.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- *
- * <pre>
- * &lt;complexType name="Tad"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Option" type="{http://www.osgi.org/xmlns/metatype/v1.2.0}Toption" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="type" use="required" type="{http://www.osgi.org/xmlns/metatype/v1.2.0}Tscalar" /&gt;
- *       &lt;attribute name="cardinality" type="{http://www.w3.org/2001/XMLSchema}int" default="0" /&gt;
- *       &lt;attribute name="min" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="default" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="required" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- * @since 1.0
- */
-
-public class TadImpl implements KapuaTad {
-
-    protected List<ToptionImpl> option;
-    protected List<Object> any;
-    protected String name;
-    protected String description;
-    protected String id;
-    protected TscalarImpl type;
-    protected Integer cardinality;
-    protected String min;
-    protected String max;
-    protected String defaultValue;
-    protected Boolean required;
-    private Map<QName, String> otherAttributes = new HashMap<>();
-
-    /**
-     * Gets the value of the option property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the option property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <p>
-     *
-     * <pre>
-     * getOption().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ToptionImpl }
-     */
-    public List<KapuaToption> getOption() {
-        if (option == null) {
-            option = new ArrayList<>();
-        }
-        return new ArrayList<>(this.option);
-    }
-
-    /**
-     * Add an option to the internal list
-     *
-     * @param option
-     */
-    public void addOption(KapuaToption option) {
-        if (this.option == null) {
-            this.option = new ArrayList<>();
-        }
-
-        this.option.add((ToptionImpl) option);
-    }
-
-    @Override
-    public void setOption(List<KapuaToption> option) {
-        this.option = new ArrayList<>();
-        for (KapuaToption singleOption : option) {
-            this.option.add((ToptionImpl) singleOption);
-        }
-    }
-
-    /**
-     * Gets the value of the any property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <p>
-     *
-     * <pre>
-     * getAny().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    @Override
-    public void setAny(List<Object> any) {
-        this.any = any;
-    }
-
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     *         {@link String }
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link String }
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is
-     *         {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link String }
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     *         {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link String }
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     *
-     * @return possible object is
-     *         {@link TscalarImpl }
-     */
-    public TscalarImpl getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link TscalarImpl }
-     */
-    public void setType(KapuaTscalar value) {
-        this.type = (TscalarImpl) value;
-    }
-
-    /**
-     * Gets the value of the cardinality property.
-     *
-     * @return possible object is
-     *         {@link Integer }
-     */
-    public Integer getCardinality() {
-        if (cardinality == null) {
-            return 0;
-        } else {
-            return cardinality;
-        }
-    }
-
-    /**
-     * Sets the value of the cardinality property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link Integer }
-     */
-    public void setCardinality(Integer value) {
-        this.cardinality = value;
-    }
-
-    /**
-     * Gets the value of the min property.
-     *
-     * @return possible object is
-     *         {@link String }
-     */
-    public String getMin() {
-        return min;
-    }
-
-    /**
-     * Sets the value of the min property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link String }
-     */
-    public void setMin(String value) {
-        this.min = value;
-    }
-
-    /**
-     * Gets the value of the max property.
-     *
-     * @return possible object is
-     *         {@link String }
-     */
-    public String getMax() {
-        return max;
-    }
-
-    /**
-     * Sets the value of the max property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link String }
-     */
-    public void setMax(String value) {
-        this.max = value;
-    }
-
-    /**
-     * Gets the value of the default property.
-     *
-     * @return possible object is
-     *         {@link String }
-     */
-    public String getDefault() {
-        return defaultValue;
-    }
-
-    /**
-     * Sets the value of the default property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link String }
-     */
-    public void setDefault(String value) {
-        this.defaultValue = value;
-    }
-
-    /**
-     * Gets the value of the required property.
-     *
-     * @return possible object is
-     *         {@link Boolean }
-     */
-    public Boolean isRequired() {
-        if (required == null) {
-            return true;
-        } else {
-            return required;
-        }
-    }
-
-    /**
-     * Sets the value of the required property.
-     *
-     * @param value
-     *            allowed object is
-     *            {@link Boolean }
-     */
-    public void setRequired(Boolean value) {
-        this.required = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * <p>
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-    public void putOtherAttribute(QName key, String value) {
-        getOtherAttributes().put(key,
-                value);
-    }
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TattributeImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TattributeImpl.java
deleted file mode 100644
index 310e029b27f..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TattributeImpl.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTattribute;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for Tattribute complex type.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType name="Tattribute"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Value" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;attribute name="adref" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="content" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- * @since 1.0
- */
-@XmlRootElement(name = "Attribute", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Tattribute", propOrder = {
-        "value",
-        "any"
-})
-public class TattributeImpl implements KapuaTattribute {
-
-    @XmlElement(name = "Value", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
-    protected List<String> value;
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-    @XmlAttribute(name = "adref", required = true)
-    protected String adref;
-    @XmlAttribute(name = "content")
-    protected String content;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the value property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the value property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getValue().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     */
-    public List<String> getValue() {
-        if (value == null) {
-            value = new ArrayList<String>();
-        }
-        return this.value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the adref property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getAdref() {
-        return adref;
-    }
-
-    /**
-     * Sets the value of the adref property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setAdref(String value) {
-        this.adref = value;
-    }
-
-    /**
-     * Gets the value of the content property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getContent() {
-        return content;
-    }
-
-    /**
-     * Sets the value of the content property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setContent(String value) {
-        this.content = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * <p>
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TdesignateImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TdesignateImpl.java
deleted file mode 100644
index d24d0b471c6..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TdesignateImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTdesignate;
-import org.eclipse.kapua.model.config.metatype.KapuaTobject;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for Tdesignate complex type.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType name="Tdesignate"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Object" type="{http://www.osgi.org/xmlns/metatype/v1.2.0}Tobject"/&gt;
- *         &lt;any processContents='lax' maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;attribute name="pid" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="factoryPid" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="bundle" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="optional" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- *       &lt;attribute name="merge" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- * @since 1.0
- */
-public class TdesignateImpl implements KapuaTdesignate {
-
-    protected TobjectImpl object;
-    protected List<Object> any;
-    protected String pid;
-    protected String factoryPid;
-    protected String bundle;
-    protected Boolean optional;
-    protected Boolean merge;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the object property.
-     *
-     * @return possible object is
-     * {@link TobjectImpl }
-     */
-    public KapuaTobject getObject() {
-        return object;
-    }
-
-    /**
-     * Sets the value of the object property.
-     *
-     * @param value allowed object is
-     *              {@link TobjectImpl }
-     */
-    public void setObject(KapuaTobject value) {
-        this.object = (TobjectImpl) value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    public void setAny(List<Object> any) {
-        this.any = any;
-    }
-
-    /**
-     * Gets the value of the pid property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getPid() {
-        return pid;
-    }
-
-    /**
-     * Sets the value of the pid property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setPid(String value) {
-        this.pid = value;
-    }
-
-    /**
-     * Gets the value of the factoryPid property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getFactoryPid() {
-        return factoryPid;
-    }
-
-    /**
-     * Sets the value of the factoryPid property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setFactoryPid(String value) {
-        this.factoryPid = value;
-    }
-
-    /**
-     * Gets the value of the bundle property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getBundle() {
-        return bundle;
-    }
-
-    /**
-     * Sets the value of the bundle property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setBundle(String value) {
-        this.bundle = value;
-    }
-
-    /**
-     * Gets the value of the optional property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isOptional() {
-        if (optional == null) {
-            return false;
-        } else {
-            return optional;
-        }
-    }
-
-    /**
-     * Sets the value of the optional property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setOptional(Boolean value) {
-        this.optional = value;
-    }
-
-    /**
-     * Gets the value of the merge property.
-     *
-     * @return possible object is
-     * {@link Boolean }
-     */
-    public Boolean isMerge() {
-        if (merge == null) {
-            return false;
-        } else {
-            return merge;
-        }
-    }
-
-    /**
-     * Sets the value of the merge property.
-     *
-     * @param value allowed object is
-     *              {@link Boolean }
-     */
-    public void setMerge(Boolean value) {
-        this.merge = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * <p>
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-    public void setOtherAttributes(Map<QName, String> otherAttributes) {
-        this.otherAttributes = otherAttributes;
-    }
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TiconImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TiconImpl.java
deleted file mode 100644
index e10d230b9cb..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TiconImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTicon;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for Ticon complex type.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType name="Ticon"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;any processContents='lax' maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;attribute name="resource" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="size" use="required" type="{http://www.w3.org/2001/XMLSchema}positiveInteger" /&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- * @since 1.0
- */
-public class TiconImpl implements KapuaTicon {
-
-    protected List<Object> any;
-    protected String resource;
-    protected BigInteger size;
-    private Map<QName, String> otherAttributes = new HashMap<>();
-
-    /**
-     * Gets the value of the any property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <p>
-     * <pre>
-     * getAny().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the resource property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getResource() {
-        return resource;
-    }
-
-    /**
-     * Sets the value of the resource property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setResource(String value) {
-        this.resource = value;
-    }
-
-    /**
-     * Gets the value of the size property.
-     *
-     * @return possible object is
-     * {@link BigInteger }
-     */
-    public BigInteger getSize() {
-        return size;
-    }
-
-    /**
-     * Sets the value of the size property.
-     *
-     * @param value allowed object is
-     *              {@link BigInteger }
-     */
-    public void setSize(BigInteger value) {
-        this.size = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * <p>
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TmetadataImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TmetadataImpl.java
deleted file mode 100644
index f776da91e58..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TmetadataImpl.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTdesignate;
-import org.eclipse.kapua.model.config.metatype.KapuaTmetadata;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for Tmetadata complex type.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType name="Tmetadata"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="OCD" type="{http://www.osgi.org/xmlns/metatype/v1.2.0}Tocd" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;element name="Designate" type="{http://www.osgi.org/xmlns/metatype/v1.2.0}Tdesignate" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;attribute name="localization" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- * @since 1.0
- */
-public class TmetadataImpl implements KapuaTmetadata {
-
-    protected List<KapuaTocd> ocd;
-    protected List<KapuaTdesignate> designate;
-    protected List<Object> any;
-    protected String localization;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the ocd property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the ocd property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOCD().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TocdImpl }
-     */
-    @Override
-    public List<KapuaTocd> getOCD() {
-        if (ocd == null) {
-            ocd = new ArrayList<>();
-        }
-        return new ArrayList<>(this.ocd);
-    }
-
-    public void setOCD(List<KapuaTocd> ocd) {
-        this.ocd = ocd;
-    }
-
-    /**
-     * Gets the value of the designate property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the designate property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDesignate().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TdesignateImpl }
-     */
-    public List<KapuaTdesignate> getDesignate() {
-        if (designate == null) {
-            designate = new ArrayList<>();
-        }
-        return new ArrayList<>(this.designate);
-    }
-
-    public void setDesignate(List<KapuaTdesignate> designate) {
-        this.designate = designate;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    public void setAny(List<Object> any) {
-        this.any = any;
-    }
-
-    /**
-     * Gets the value of the localization property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getLocalization() {
-        return localization;
-    }
-
-    /**
-     * Sets the value of the localization property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setLocalization(String value) {
-        this.localization = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * <p>
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-    public void setOtherAttributes(Map<QName, String> otherAttributes) {
-        this.otherAttributes = otherAttributes;
-    }
-
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TobjectImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TobjectImpl.java
deleted file mode 100644
index 85ba1b967b5..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TobjectImpl.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTattribute;
-import org.eclipse.kapua.model.config.metatype.KapuaTobject;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for Tobject complex type.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType name="Tobject"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="Attribute" type="{http://www.osgi.org/xmlns/metatype/v1.2.0}Tattribute" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;attribute name="ocdref" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- * @since 1.0
- */
-public class TobjectImpl implements KapuaTobject {
-
-    protected List<TattributeImpl> attribute;
-    protected List<Object> any;
-    protected String ocdref;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the attribute property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attribute property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttribute().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TattributeImpl }
-     */
-    public List<KapuaTattribute> getAttribute() {
-        if (attribute == null) {
-            attribute = new ArrayList<TattributeImpl>();
-        }
-        return new ArrayList<KapuaTattribute>(this.attribute);
-    }
-
-    /**
-     * Gets the value of the any property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the ocdref property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getOcdref() {
-        return ocdref;
-    }
-
-    /**
-     * Sets the value of the ocdref property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setOcdref(String value) {
-        this.ocdref = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * <p>
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TocdImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TocdImpl.java
deleted file mode 100644
index 8b81ee4f8c8..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TocdImpl.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTad;
-import org.eclipse.kapua.model.config.metatype.KapuaTicon;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for Tocd complex type.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType name="Tocd"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;element name="AD" type="{http://www.osgi.org/xmlns/metatype/v1.2.0}Tad" maxOccurs="unbounded"/&gt;
- *         &lt;element name="Icon" type="{http://www.osgi.org/xmlns/metatype/v1.2.0}Ticon" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- * @since 1.0
- */
-public class TocdImpl implements KapuaTocd {
-
-    protected List<KapuaTad> ad;
-    protected List<KapuaTicon> icon;
-    protected List<Object> any;
-    protected String name;
-    protected String description;
-    protected String id;
-    private Map<QName, String> otherAttributes = new HashMap<>();
-
-    /**
-     * Gets the value of the ad property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the ad property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <p>
-     * <pre>
-     * getAD().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TadImpl }
-     */
-    public List<KapuaTad> getAD() {
-        if (ad == null) {
-            ad = new ArrayList<>();
-        }
-        return this.ad;
-    }
-
-    @Override
-    public void setAD(List<KapuaTad> ad) {
-        this.ad = ad;
-    }
-
-    /**
-     * Add Tad to the internal list
-     *
-     * @param ad
-     */
-    public void addAD(KapuaTad ad) {
-        if (this.ad == null) {
-            this.ad = new ArrayList<>();
-        }
-
-        this.ad.add(ad);
-    }
-
-    /**
-     * Gets the value of the icon property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the icon property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <p>
-     * <pre>
-     * getIcon().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TiconImpl }
-     */
-    public List<KapuaTicon> getIcon() {
-        if (icon == null) {
-            icon = new ArrayList<>();
-        }
-        return this.icon;
-    }
-
-    @Override
-    public void setIcon(List<KapuaTicon> icon) {
-        this.icon = icon;
-    }
-
-    /**
-     * Add icon to the internal list
-     *
-     * @param icon
-     */
-    public void addIcon(KapuaTicon icon) {
-        if (this.icon == null) {
-            this.icon = new ArrayList<>();
-        }
-        this.icon.add((TiconImpl) icon);
-    }
-
-    /**
-     * Gets the value of the any property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <p>
-     * <pre>
-     * getAny().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<>();
-        }
-        return this.any;
-    }
-
-    @Override
-    public void setAny(List<Object> any) {
-        this.any = any;
-    }
-
-    /**
-     * Add a generic object to the internal list
-     *
-     * @param object
-     */
-    public void addAny(Object object) {
-        getAny().add(object);
-    }
-
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the description property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Sets the value of the description property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * <p>
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-
-    /**
-     * Insert a generic value for the provided QName
-     *
-     * @param key
-     * @param value
-     */
-    public void putOtherAttribute(QName key, String value) {
-        getOtherAttributes().put(key,
-                value);
-    }
-
-    @Override
-    public void setOtherAttributes(Map<QName, String> otherAttributes) {
-        this.otherAttributes = otherAttributes;
-    }
-
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/ToptionImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/ToptionImpl.java
deleted file mode 100644
index 7d779d0072a..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/ToptionImpl.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.w3c.dom.Element;
-
-/**
- * <p>
- * Java class for Toption complex type.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;complexType name="Toption"&gt;
- *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
- *       &lt;sequence&gt;
- *         &lt;any processContents='lax' maxOccurs="unbounded" minOccurs="0"/&gt;
- *       &lt;/sequence&gt;
- *       &lt;attribute name="label" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
- *       &lt;anyAttribute/&gt;
- *     &lt;/restriction&gt;
- *   &lt;/complexContent&gt;
- * &lt;/complexType&gt;
- * </pre>
- *
- * @since 1.0
- */
-public class ToptionImpl implements KapuaToption {
-
-    protected List<Object> any;
-    protected String label;
-    protected String value;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the any property.
-     * <p>
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * <p>
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <p>
-     * <pre>
-     * getAny().add(newItem);
-     * </pre>
-     * <p>
-     * <p>
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-    /**
-     * Gets the value of the label property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Sets the value of the label property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setLabel(String value) {
-        this.label = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * <p>
-     * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
-     * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     *
-     * @return always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TscalarImpl.java b/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TscalarImpl.java
deleted file mode 100644
index 8925f9b39cb..00000000000
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/TscalarImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
-
-/**
- * <p>
- * Java class for Tscalar.
- * <p>
- * <p>
- * The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <p>
- * <pre>
- * &lt;simpleType name="Tscalar"&gt;
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"&gt;
- *     &lt;enumeration value="String"/&gt;
- *     &lt;enumeration value="Long"/&gt;
- *     &lt;enumeration value="Double"/&gt;
- *     &lt;enumeration value="Float"/&gt;
- *     &lt;enumeration value="Integer"/&gt;
- *     &lt;enumeration value="Byte"/&gt;
- *     &lt;enumeration value="Char"/&gt;
- *     &lt;enumeration value="Boolean"/&gt;
- *     &lt;enumeration value="Short"/&gt;
- *     &lt;enumeration value="Password"/&gt;
- *   &lt;/restriction&gt;
- * &lt;/simpleType&gt;
- * </pre>
- *
- * @since 1.0
- */
-@XmlEnum
-@XmlType(name = "Tscalar")
-@XmlRootElement(name = "OCD", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
-@XmlAccessorType(XmlAccessType.PROPERTY)
-public enum TscalarImpl implements KapuaTscalar {
-    @XmlEnumValue("String")
-    STRING("String"),
-    @XmlEnumValue("Long")
-    LONG("Long"),
-    @XmlEnumValue("Double")
-    DOUBLE("Double"),
-    @XmlEnumValue("Float")
-    FLOAT("Float"),
-    @XmlEnumValue("Integer")
-    INTEGER("Integer"),
-    @XmlEnumValue("Byte")
-    BYTE("Byte"),
-    @XmlEnumValue("Char")
-    CHAR("Char"),
-    @XmlEnumValue("Boolean")
-    BOOLEAN("Boolean"),
-    @XmlEnumValue("Short")
-    SHORT("Short"),
-    @XmlEnumValue("Password")
-    PASSWORD("Password");
-    private final String value;
-
-    /**
-     * Constructor
-     *
-     * @param v
-     */
-    TscalarImpl(String v) {
-        value = v;
-    }
-
-    @Override
-    public String value() {
-        return value;
-    }
-
-    /**
-     * Convert a String value to a {@link TscalarImpl}
-     *
-     * @param v
-     * @return
-     */
-    public static TscalarImpl fromValue(String v) {
-        for (TscalarImpl c : TscalarImpl.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/util/StringUtil.java b/commons/src/main/java/org/eclipse/kapua/commons/util/StringUtil.java
index d5f03229d8b..58ab61d4af6 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/util/StringUtil.java
+++ b/commons/src/main/java/org/eclipse/kapua/commons/util/StringUtil.java
@@ -12,14 +12,13 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.util;
 
-import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.Password;
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
+import org.eclipse.kapua.model.config.metatype.Password;
 
 /**
  * Utilities to manipulate string
@@ -66,81 +65,84 @@ public static String[] splitValues(String strValues) {
         for (int i = 0; i < strValues.length(); i++) {
             char c1 = strValues.charAt(i);
             switch (c1) {
-                case DELIMITER:
-                    // When the delimiter is encountered, add the extracted
-                    // token to the result and prepare the buffer to receive the
-                    // next token.
-                    values.add(buffer.toString());
-                    buffer.delete(0, buffer.length());
-                    break;
-                case ESCAPE:
-                    // When the escape is encountered, add the immediately
-                    // following character to the token, unless the end of the
-                    // input has been reached. Note this will result in loop
-                    // counter 'i' being incremented twice, once here and once
-                    // at the end of the loop.
-                    if (i + 1 < strValues.length()) {
-                        buffer.append(strValues.charAt(++i));
+            case DELIMITER:
+                // When the delimiter is encountered, add the extracted
+                // token to the result and prepare the buffer to receive the
+                // next token.
+                values.add(buffer.toString());
+                buffer.delete(0, buffer.length());
+                break;
+            case ESCAPE:
+                // When the escape is encountered, add the immediately
+                // following character to the token, unless the end of the
+                // input has been reached. Note this will result in loop
+                // counter 'i' being incremented twice, once here and once
+                // at the end of the loop.
+                if (i + 1 < strValues.length()) {
+                    buffer.append(strValues.charAt(++i));
+                }
+                // If the ESCAPE character occurs as the last character
+                // of the string, ignore it.
+                break;
+            default:
+                // For all other characters, add them to the current token
+                // unless dealing with unescaped whitespace at the beginning
+                // or end. We know the whitespace is unescaped because it
+                // would have been handled in the ESCAPE case otherwise.
+                if (Character.isWhitespace(c1)) {
+                    // Ignore unescaped whitespace at the beginning of the
+                    // token.
+                    if (buffer.length() == 0) {
+                        continue;
                     }
-                    // If the ESCAPE character occurs as the last character
-                    // of the string, ignore it.
-                    break;
-                default:
-                    // For all other characters, add them to the current token
-                    // unless dealing with unescaped whitespace at the beginning
-                    // or end. We know the whitespace is unescaped because it
-                    // would have been handled in the ESCAPE case otherwise.
-                    if (Character.isWhitespace(c1)) {
-                        // Ignore unescaped whitespace at the beginning of the
-                        // token.
-                        if (buffer.length() == 0) {
-                            continue;
-                        }
-                        // If the whitespace is not at the beginning, look
-                        // forward, starting with the next character, to see if
-                        // it's in the middle or at the end. Unescaped
-                        // whitespace in the middle is okay.
-                        for (int j = i + 1; j < strValues.length(); j++) {
-                            // Keep looping until the end of the string is
-                            // reached or a non-whitespace character other than
-                            // the escape is seen.
-                            char c2 = strValues.charAt(j);
-                            if (!Character.isWhitespace(c2)) {
-                                // If the current character is not the DELIMITER, all whitespace
-                                // characters are significant and should be added to the token.
-                                // Otherwise, they're at the end and should be ignored. But watch
-                                // out for an escape character at the end of the input. Ignore it
-                                // and any previous insignificant whitespace if it exists.
-                                if (c2 == ESCAPE && j + 1 >= strValues.length()) {
-                                    continue;
-                                }
-                                if (c2 != DELIMITER) {
-                                    buffer.append(strValues.substring(i, j));
-                                }
-                                // Let loop counter i catch up with the inner loop but keep in
-                                // mind it will still be incremented at the end of the outer loop.
-                                i = j - 1;
-                                break;
+                    // If the whitespace is not at the beginning, look
+                    // forward, starting with the next character, to see if
+                    // it's in the middle or at the end. Unescaped
+                    // whitespace in the middle is okay.
+                    for (int j = i + 1; j < strValues.length(); j++) {
+                        // Keep looping until the end of the string is
+                        // reached or a non-whitespace character other than
+                        // the escape is seen.
+                        char c2 = strValues.charAt(j);
+                        if (!Character.isWhitespace(c2)) {
+                            // If the current character is not the DELIMITER, all whitespace
+                            // characters are significant and should be added to the token.
+                            // Otherwise, they're at the end and should be ignored. But watch
+                            // out for an escape character at the end of the input. Ignore it
+                            // and any previous insignificant whitespace if it exists.
+                            if (c2 == ESCAPE && j + 1 >= strValues.length()) {
+                                continue;
+                            }
+                            if (c2 != DELIMITER) {
+                                buffer.append(strValues.substring(i, j));
                             }
+                            // Let loop counter i catch up with the inner loop but keep in
+                            // mind it will still be incremented at the end of the outer loop.
+                            i = j - 1;
+                            break;
                         }
-                    } else {
-                        // For non-whitespace characters.
-                        buffer.append(c1);
                     }
+                } else {
+                    // For non-whitespace characters.
+                    buffer.append(c1);
+                }
             }
         }
         // Don't forget to add the last token.
         values.add(buffer.toString());
-        return values.toArray(new String[]{});
+        return values.toArray(new String[] {});
     }
 
     /**
      * Convert the string to the appropriate Object based on type
      *
-     * @param type              allowed values are {@link TscalarImpl}
-     * @param string            the input value
-     * @return                  the output value
-     * @throws KapuaException   when something goes wrong
+     * @param type
+     *         allowed values are {@link KapuaTscalar}
+     * @param string
+     *         the input value
+     * @return the output value
+     * @throws KapuaException
+     *         when something goes wrong
      */
     public static Object stringToValue(String type, String string) throws KapuaException {
         if (string == null) {
@@ -151,45 +153,45 @@ public static Object stringToValue(String type, String string) throws KapuaExcep
             throw KapuaException.internalError("Invalid type");
         }
 
-        TscalarImpl scalarType = TscalarImpl.fromValue(type);
+        KapuaTscalar scalarType = KapuaTscalar.fromValue(type);
 
-        if (TscalarImpl.STRING.equals(scalarType)) {
+        if (KapuaTscalar.STRING.equals(scalarType)) {
             return string;
         }
 
-        if (TscalarImpl.BOOLEAN.equals(scalarType)) {
+        if (KapuaTscalar.BOOLEAN.equals(scalarType)) {
             return StringUtils.isEmpty(string) ? null : Boolean.valueOf(string);
         }
 
-        if (TscalarImpl.BYTE.equals(scalarType)) {
+        if (KapuaTscalar.BYTE.equals(scalarType)) {
             return StringUtils.isEmpty(string) ? null : Byte.valueOf(string);
         }
 
-        if (TscalarImpl.CHAR.equals(scalarType)) {
+        if (KapuaTscalar.CHAR.equals(scalarType)) {
             return string.toCharArray()[0];
         }
 
-        if (TscalarImpl.DOUBLE.equals(scalarType)) {
+        if (KapuaTscalar.DOUBLE.equals(scalarType)) {
             return StringUtils.isEmpty(string) ? null : Double.valueOf(string);
         }
 
-        if (TscalarImpl.FLOAT.equals(scalarType)) {
+        if (KapuaTscalar.FLOAT.equals(scalarType)) {
             return StringUtils.isEmpty(string) ? null : Float.valueOf(string);
         }
 
-        if (TscalarImpl.INTEGER.equals(scalarType)) {
+        if (KapuaTscalar.INTEGER.equals(scalarType)) {
             return StringUtils.isEmpty(string) ? null : Integer.valueOf(string);
         }
 
-        if (TscalarImpl.LONG.equals(scalarType)) {
+        if (KapuaTscalar.LONG.equals(scalarType)) {
             return StringUtils.isEmpty(string) ? null : Long.valueOf(string);
         }
 
-        if (TscalarImpl.SHORT.equals(scalarType)) {
+        if (KapuaTscalar.SHORT.equals(scalarType)) {
             return StringUtils.isEmpty(string) ? null : Short.valueOf(string);
         }
 
-        if (TscalarImpl.PASSWORD.equals(scalarType)) {
+        if (KapuaTscalar.PASSWORD.equals(scalarType)) {
             return new Password(string);
         }
 
@@ -197,8 +199,7 @@ public static Object stringToValue(String type, String string) throws KapuaExcep
     }
 
     /**
-     * Convert the value to a String.<br>
-     * It supports also arrays such as Integer[], Boolean[], ... Password[]). For the arrays the converted String will be a comma separated concatenation.
+     * Convert the value to a String.<br> It supports also arrays such as Integer[], Boolean[], ... Password[]). For the arrays the converted String will be a comma separated concatenation.
      *
      * @param value
      * @return
@@ -352,8 +353,7 @@ public static String valueToString(Object value) {
     }
 
     /**
-     * Escape the String <br>
-     * Escaped values are '\' ',' and ' '
+     * Escape the String <br> Escaped values are '\' ',' and ' '
      *
      * @param s
      * @return
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationTest.java
similarity index 91%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationImplTest.java
rename to commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationTest.java
index 96e86bbe024..012f6f69261 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationImplTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceComponentConfigurationTest.java
@@ -12,31 +12,30 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration;
 
-import org.eclipse.kapua.commons.configuration.metatype.TocdImpl;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
+import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.util.HashMap;
-import java.util.Map;
-
-
 @Category(JUnitTests.class)
-public class ServiceComponentConfigurationImplTest {
+public class ServiceComponentConfigurationTest {
 
-    ServiceComponentConfigurationImpl serviceComponentConfiguration;
+    ServiceComponentConfiguration serviceComponentConfiguration;
 
     @Before
     public void createInstanceOfClass() {
-        serviceComponentConfiguration = new ServiceComponentConfigurationImpl();
+        serviceComponentConfiguration = new ServiceComponentConfiguration();
     }
 
     @Test
     public void createInstanceWithSecondConstructorTest() {
-        ServiceComponentConfigurationImpl componentConfiguration = new ServiceComponentConfigurationImpl("12");
+        ServiceComponentConfiguration componentConfiguration = new ServiceComponentConfiguration("12");
         Assert.assertEquals(componentConfiguration.getId(), "12");
     }
 
@@ -112,7 +111,7 @@ public void setDefinitionToNullTest() {
 
     @Test
     public void setDefinitionToRegularValueTest() {
-        KapuaTocd tocd = new TocdImpl();
+        KapuaTocd tocd = new KapuaTocd();
         serviceComponentConfiguration.setDefinition(tocd);
         Assert.assertEquals(serviceComponentConfiguration.getDefinition(), tocd);
     }
@@ -129,7 +128,7 @@ public void setPropertiesToRegularValueTest() {
         properties.put("property1", 10);
         properties.put("property2", "string");
         properties.put("property3", 'c');
-        properties.put("property4", (double)10);
+        properties.put("property4", (double) 10);
         serviceComponentConfiguration.setProperties(properties);
         Assert.assertEquals(properties, serviceComponentConfiguration.getProperties());
     }
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationFactoryImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationFactoryImplTest.java
deleted file mode 100644
index a54dc50a106..00000000000
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationFactoryImplTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration;
-
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
-import org.eclipse.kapua.service.config.ServiceConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-
-@Category(JUnitTests.class)
-public class ServiceConfigurationFactoryImplTest {
-
-    @Test
-    public void newComponentConfigurationInstanceWithStringTest() {
-        ServiceConfigurationFactoryImpl configurationFactory = new ServiceConfigurationFactoryImpl();
-        ServiceComponentConfiguration componentConfiguration = configurationFactory.newComponentConfigurationInstance("testInstance");
-        Assert.assertEquals(componentConfiguration.getId(), "testInstance");
-    }
-
-    @Test
-    public void newComponentConfigurationInstanceWithNumberTest() {
-        ServiceConfigurationFactoryImpl configurationFactory = new ServiceConfigurationFactoryImpl();
-        ServiceComponentConfiguration componentConfiguration = configurationFactory.newComponentConfigurationInstance("1");
-        Assert.assertEquals(componentConfiguration.getId(), "1");
-    }
-
-    @Test
-    public void newComponentConfigurationInstanceWithSymbolTest() {
-        ServiceConfigurationFactoryImpl configurationFactory = new ServiceConfigurationFactoryImpl();
-        ServiceComponentConfiguration componentConfiguration = configurationFactory.newComponentConfigurationInstance("@");
-        Assert.assertEquals(componentConfiguration.getId(), "@");
-    }
-
-    @Test
-    public void newConfigurationInstanceTest() {
-        ServiceConfigurationFactoryImpl configurationFactory = new ServiceConfigurationFactoryImpl();
-        ServiceConfiguration configuration = configurationFactory.newConfigurationInstance();
-        Assert.assertNotNull(configuration);
-    }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationImplTest.java
deleted file mode 100644
index 02d6ddff21e..00000000000
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/ServiceConfigurationImplTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration;
-
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-@Category(JUnitTests.class)
-public class ServiceConfigurationImplTest {
-
-    ServiceConfigurationImpl configuration;
-
-    @Before
-    public void createNewClass() {
-        configuration = new ServiceConfigurationImpl();
-    }
-
-    @Test
-    public void getComponentConfigurationsTest() {
-        Assert.assertNotNull(configuration.getComponentConfigurations());
-    }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/StringUtilTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/StringUtilTest.java
index 6a918294d72..bb445dfdc9a 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/StringUtilTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/configuration/StringUtilTest.java
@@ -13,8 +13,8 @@
 package org.eclipse.kapua.commons.configuration;
 
 import org.assertj.core.api.Assertions;
-import org.eclipse.kapua.commons.configuration.metatype.Password;
 import org.eclipse.kapua.commons.util.StringUtil;
+import org.eclipse.kapua.model.config.metatype.Password;
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -25,7 +25,7 @@ public class StringUtilTest {
     @Test
     public void shouldConvertPasswordsArrayToString() {
         // Given
-        Password[] passwords = new Password[]{new Password("foo")};
+        Password[] passwords = new Password[] { new Password("foo") };
 
         // When
         String passwordsString = StringUtil.valueToString(passwords);
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/ValueTokenizerTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/ValueTokenizerTest.java
index 09d902b4e16..091bb0c85c9 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/ValueTokenizerTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/configuration/ValueTokenizerTest.java
@@ -12,15 +12,14 @@
  *******************************************************************************/
 package org.eclipse.kapua.commons.configuration;
 
-import org.eclipse.kapua.commons.configuration.metatype.TadImpl;
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
+import org.eclipse.kapua.model.config.metatype.KapuaTad;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
+import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-
 @Category(JUnitTests.class)
 public class ValueTokenizerTest {
 
@@ -37,7 +36,7 @@ public void valueTokenizerNullStringTest() throws Exception {
     public void valueTokenizerNotNullTest() throws Exception {
         try {
             Assert.assertNotNull(new ValueTokenizer("valueTokenizerConstructor"));
-        } catch (Exception ex){
+        } catch (Exception ex) {
             Assert.fail("No exception expected");
         }
     }
@@ -48,7 +47,7 @@ public void valueTokenizerDelimeterTest() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a123,aaa,rrr");
         try {
             Assert.assertEquals("a123,aaa,rrr", valueTokenizer.getValuesAsString());
-        } catch (Exception ex){
+        } catch (Exception ex) {
             Assert.fail("Failed to delimit input string");
         }
     }
@@ -58,7 +57,7 @@ public void valueTokenizerEscapeTest() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a123\\aaa\\rrr");
         try {
             Assert.assertEquals("a123aaarrr", valueTokenizer.getValuesAsString());
-        } catch (Exception ex){
+        } catch (Exception ex) {
             Assert.fail("Failed to load escape string");
         }
     }
@@ -68,7 +67,7 @@ public void valueTokenizerEscapeAtEndTest() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a123aaarrr\\");
         try {
             Assert.assertEquals("a123aaarrr", valueTokenizer.getValuesAsString());
-        } catch (Exception ex){
+        } catch (Exception ex) {
             Assert.fail("Failed to load escape string");
         }
     }
@@ -79,7 +78,7 @@ public void valueTokenizerEscapeAtBeginningTest() throws Exception {
         try {
             valueTokenizer.getValuesAsString();
             Assert.assertEquals("a123aaarrr", valueTokenizer.getValuesAsString());
-        } catch (Exception ex){
+        } catch (Exception ex) {
             Assert.fail("Failed to load escape string");
         }
     }
@@ -89,7 +88,7 @@ public void valueTokenizerSpaceAtBeginningTest() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer(" a123aaarrr");
         try {
             Assert.assertEquals("a123aaarrr", valueTokenizer.getValuesAsString());
-        } catch (Exception ex){
+        } catch (Exception ex) {
             Assert.fail("Cannot load string whit white space at the beginning");
         }
     }
@@ -99,7 +98,7 @@ public void valueTokenizerSpaceAtTheEndTest() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a123aaarrr ");
         try {
             Assert.assertEquals("a123aaarrr", valueTokenizer.getValuesAsString());
-        } catch (Exception ex){
+        } catch (Exception ex) {
             Assert.fail("Cannot load string whit white space at the end");
         }
     }
@@ -128,7 +127,7 @@ public void valueTokenizerValueAStringSpaceMiddleTest() throws Exception {
     @Test
     public void valueTokenizerValuesAsArrayWithDelimeter() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a,123,aaa,rrr");
-        String [] expectedValues = new String[]{"a", "123", "aaa", "rrr"};
+        String[] expectedValues = new String[] { "a", "123", "aaa", "rrr" };
         try {
             Assert.assertArrayEquals(expectedValues, valueTokenizer.getValuesAsArray());
         } catch (Exception ex) {
@@ -139,7 +138,7 @@ public void valueTokenizerValuesAsArrayWithDelimeter() throws Exception {
     @Test
     public void valueTokenizerValuesAsArrayWithEscape() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a123\\aaarr\\r");
-        String [] expectedValues = new String[]{"a123aaarrr"};
+        String[] expectedValues = new String[] { "a123aaarrr" };
         try {
             Assert.assertArrayEquals(expectedValues, valueTokenizer.getValuesAsArray());
         } catch (Exception ex) {
@@ -160,9 +159,9 @@ public void valueTokenizerValuesAsArrayWithNullString() throws Exception {
     @Test
     public void valueTokenizerValueAsArrayDelimiterAndEscape() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a12\\3,a\\,aa,r\\rr,");
-        String [] expectedValues = new String[] {"a123", "a,aa", "rrr", ""};
+        String[] expectedValues = new String[] { "a123", "a,aa", "rrr", "" };
         try {
-            Assert.assertArrayEquals(expectedValues,valueTokenizer.getValuesAsArray());
+            Assert.assertArrayEquals(expectedValues, valueTokenizer.getValuesAsArray());
         } catch (Exception ex) {
             Assert.fail("Arrays are not equal");
         }
@@ -171,19 +170,19 @@ public void valueTokenizerValueAsArrayDelimiterAndEscape() throws Exception {
     @Test
     public void valueTokenizerValueAsArray() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer(" a123, aaa, rrr");
-        String [] expectedValues = new String[] {"a123", "aaa", "rrr"};
+        String[] expectedValues = new String[] { "a123", "aaa", "rrr" };
         try {
-            Assert.assertArrayEquals(expectedValues,valueTokenizer.getValuesAsArray());
+            Assert.assertArrayEquals(expectedValues, valueTokenizer.getValuesAsArray());
         } catch (Exception ex) {
             Assert.fail("Arrays are not equal");
         }
     }
 
-     //test for method ...getValues();
+    //test for method ...getValues();
     @Test
     public void valueTokenizerGetValuesWithDelimeter() throws Exception {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a123,aaarrr");
-        String [] expectedValues = new String[] {"a123", "aaarrr"};
+        String[] expectedValues = new String[] { "a123", "aaarrr" };
         try {
             Assert.assertArrayEquals(expectedValues, valueTokenizer.getValues().toArray());
         } catch (Exception ex) {
@@ -207,7 +206,7 @@ public void validateWithNullValueTokenizerTest() {
     @Test
     public void validateZeroCardinalityTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("asdf, qwer");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(0);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Cardinality violation: \"asdf,qwer\" has 2 value(s) but must have between 1 and 1 value(s).", message);
@@ -216,7 +215,7 @@ public void validateZeroCardinalityTest() {
     @Test
     public void validateOneCardinalityTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("asdf, qwer");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(1);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Cardinality violation: \"asdf,qwer\" has 2 value(s) but must have between 0 and 1 value(s).", message);
@@ -225,7 +224,7 @@ public void validateOneCardinalityTest() {
     @Test
     public void validateEmptyStringZeroCardinalityTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(0);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Internal error: null", message);
@@ -234,7 +233,7 @@ public void validateEmptyStringZeroCardinalityTest() {
     @Test
     public void validateEmptyStringNonZeroCardinalityTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(2);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Internal error: null", message);
@@ -243,7 +242,7 @@ public void validateEmptyStringNonZeroCardinalityTest() {
     @Test
     public void validateNegativeCardinalityTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("asdf, qwer");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(-1);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Cardinality violation: \"asdf,qwer\" has 2 value(s) but must have between 0 and 1 value(s).", message);
@@ -252,7 +251,7 @@ public void validateNegativeCardinalityTest() {
     @Test
     public void validateWithoutTypeTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("asdf, qwer");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Internal error: null", message);
@@ -261,9 +260,9 @@ public void validateWithoutTypeTest() {
     @Test
     public void validateWithBooleanTypeTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("asdf, qwer");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.BOOLEAN);
+        tad.setType(KapuaTscalar.BOOLEAN);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -271,9 +270,9 @@ public void validateWithBooleanTypeTest() {
     @Test
     public void validateWithStringTypeWithoutRestrictionsTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("asdf, qwer");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.STRING);
+        tad.setType(KapuaTscalar.STRING);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -281,9 +280,9 @@ public void validateWithStringTypeWithoutRestrictionsTest() {
     @Test
     public void validateWithStringTypeWithMaxRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("asdf, qwer");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.STRING);
+        tad.setType(KapuaTscalar.STRING);
         tad.setMax("2");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value asdf is out of range", message);
@@ -293,9 +292,9 @@ public void validateWithStringTypeWithMaxRestrictionTest() {
 /*    @Test
     public void validateWithStringTypeWithMinRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("asdf, qwer");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.STRING);
+        tad.setType(KapuaTscalar.STRING);
         tad.setMin("10");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value asdf is out of range", message);
@@ -304,9 +303,9 @@ public void validateWithStringTypeWithMinRestrictionTest() {
     @Test
     public void validateWithIntegerTypeWithoutRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.INTEGER);
+        tad.setType(KapuaTscalar.INTEGER);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -314,9 +313,9 @@ public void validateWithIntegerTypeWithoutRestrictionTest() {
     @Test
     public void validateMinAndMaxIntegerRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.INTEGER);
+        tad.setType(KapuaTscalar.INTEGER);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -326,9 +325,9 @@ public void validateMinAndMaxIntegerRestrictionTest() {
     @Test
     public void validateCornerCasesIntegerRestrictionsTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 100");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.INTEGER);
+        tad.setType(KapuaTscalar.INTEGER);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -338,9 +337,9 @@ public void validateCornerCasesIntegerRestrictionsTest() {
     @Test
     public void validateEqualMinAndMaxIntegerRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 10");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.INTEGER);
+        tad.setType(KapuaTscalar.INTEGER);
         tad.setMin("10");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -350,9 +349,9 @@ public void validateEqualMinAndMaxIntegerRestrictionTest() {
     @Test
     public void validateMixedMinAndMaxIntegerRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("21");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.INTEGER);
+        tad.setType(KapuaTscalar.INTEGER);
         tad.setMin("100");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -362,9 +361,9 @@ public void validateMixedMinAndMaxIntegerRestrictionTest() {
     @Test
     public void validateWithIntegerTypeWitMaxRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.INTEGER);
+        tad.setType(KapuaTscalar.INTEGER);
         tad.setMax("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 99 is out of range", message);
@@ -373,9 +372,9 @@ public void validateWithIntegerTypeWitMaxRestrictionTest() {
     @Test
     public void validateWithIntegerTypeWitMinRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.INTEGER);
+        tad.setType(KapuaTscalar.INTEGER);
         tad.setMin("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 12 is out of range", message);
@@ -384,9 +383,9 @@ public void validateWithIntegerTypeWitMinRestrictionTest() {
     @Test
     public void validateWithLongTypeWithoutRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.LONG);
+        tad.setType(KapuaTscalar.LONG);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -394,9 +393,9 @@ public void validateWithLongTypeWithoutRestrictionTest() {
     @Test
     public void validateWithLongTypeWitMaxRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.LONG);
+        tad.setType(KapuaTscalar.LONG);
         tad.setMax("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 99 is out of range", message);
@@ -405,9 +404,9 @@ public void validateWithLongTypeWitMaxRestrictionTest() {
     @Test
     public void validateWithLongTypeWitMinRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.LONG);
+        tad.setType(KapuaTscalar.LONG);
         tad.setMin("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 12 is out of range", message);
@@ -416,9 +415,9 @@ public void validateWithLongTypeWitMinRestrictionTest() {
     @Test
     public void validateMinAndMaxLongRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.LONG);
+        tad.setType(KapuaTscalar.LONG);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -428,9 +427,9 @@ public void validateMinAndMaxLongRestrictionTest() {
     @Test
     public void validateCornerCasesLongRestrictionsTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 100");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.LONG);
+        tad.setType(KapuaTscalar.LONG);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -440,9 +439,9 @@ public void validateCornerCasesLongRestrictionsTest() {
     @Test
     public void validateEqualMinAndMaxLongRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 10");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.LONG);
+        tad.setType(KapuaTscalar.LONG);
         tad.setMin("10");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -452,9 +451,9 @@ public void validateEqualMinAndMaxLongRestrictionTest() {
     @Test
     public void validateMixedMinAndMaxLongRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("21");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.LONG);
+        tad.setType(KapuaTscalar.LONG);
         tad.setMin("100");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -464,9 +463,9 @@ public void validateMixedMinAndMaxLongRestrictionTest() {
     @Test
     public void validateWithDoubleTypeWithoutRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.DOUBLE);
+        tad.setType(KapuaTscalar.DOUBLE);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -474,9 +473,9 @@ public void validateWithDoubleTypeWithoutRestrictionTest() {
     @Test
     public void validateWithDoubleTypeWitMaxRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.DOUBLE);
+        tad.setType(KapuaTscalar.DOUBLE);
         tad.setMax("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 99 is out of range", message);
@@ -485,9 +484,9 @@ public void validateWithDoubleTypeWitMaxRestrictionTest() {
     @Test
     public void validateWithDoubleTypeWitMinRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.DOUBLE);
+        tad.setType(KapuaTscalar.DOUBLE);
         tad.setMin("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 12 is out of range", message);
@@ -496,9 +495,9 @@ public void validateWithDoubleTypeWitMinRestrictionTest() {
     @Test
     public void validateMinAndMaxDoubleRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.DOUBLE);
+        tad.setType(KapuaTscalar.DOUBLE);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -508,9 +507,9 @@ public void validateMinAndMaxDoubleRestrictionTest() {
     @Test
     public void validateCornerCasesDoubleRestrictionsTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 100");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.DOUBLE);
+        tad.setType(KapuaTscalar.DOUBLE);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -520,9 +519,9 @@ public void validateCornerCasesDoubleRestrictionsTest() {
     @Test
     public void validateEqualMinAndMaxDoubleRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 10");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.DOUBLE);
+        tad.setType(KapuaTscalar.DOUBLE);
         tad.setMin("10");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -532,9 +531,9 @@ public void validateEqualMinAndMaxDoubleRestrictionTest() {
     @Test
     public void validateMixedMinAndMaxDoubleRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("21");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.DOUBLE);
+        tad.setType(KapuaTscalar.DOUBLE);
         tad.setMin("100");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -544,9 +543,9 @@ public void validateMixedMinAndMaxDoubleRestrictionTest() {
     @Test
     public void validateWithCharTypeWithoutRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a, z");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.CHAR);
+        tad.setType(KapuaTscalar.CHAR);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -554,9 +553,9 @@ public void validateWithCharTypeWithoutRestrictionTest() {
     @Test
     public void validateWithCharTypeWitMaxRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a, z");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.CHAR);
+        tad.setType(KapuaTscalar.CHAR);
         tad.setMax("b");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value z is out of range", message);
@@ -565,9 +564,9 @@ public void validateWithCharTypeWitMaxRestrictionTest() {
     @Test
     public void validateWithCharTypeWitMinRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("a, z");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.CHAR);
+        tad.setType(KapuaTscalar.CHAR);
         tad.setMin("b");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value a is out of range", message);
@@ -576,9 +575,9 @@ public void validateWithCharTypeWitMinRestrictionTest() {
     @Test
     public void validateWithFloatTypeWithoutRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.FLOAT);
+        tad.setType(KapuaTscalar.FLOAT);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -586,9 +585,9 @@ public void validateWithFloatTypeWithoutRestrictionTest() {
     @Test
     public void validateWithFloatTypeWitMaxRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.FLOAT);
+        tad.setType(KapuaTscalar.FLOAT);
         tad.setMax("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 99 is out of range", message);
@@ -597,9 +596,9 @@ public void validateWithFloatTypeWitMaxRestrictionTest() {
     @Test
     public void validateWithFloatTypeWitMinRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.FLOAT);
+        tad.setType(KapuaTscalar.FLOAT);
         tad.setMin("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 12 is out of range", message);
@@ -608,9 +607,9 @@ public void validateWithFloatTypeWitMinRestrictionTest() {
     @Test
     public void validateMinAndMaxFloatRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.FLOAT);
+        tad.setType(KapuaTscalar.FLOAT);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -620,9 +619,9 @@ public void validateMinAndMaxFloatRestrictionTest() {
     @Test
     public void validateCornerCasesFloatRestrictionsTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 100");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.FLOAT);
+        tad.setType(KapuaTscalar.FLOAT);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -632,9 +631,9 @@ public void validateCornerCasesFloatRestrictionsTest() {
     @Test
     public void validateEqualMinAndMaxFloatRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 10");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.FLOAT);
+        tad.setType(KapuaTscalar.FLOAT);
         tad.setMin("10");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -644,9 +643,9 @@ public void validateEqualMinAndMaxFloatRestrictionTest() {
     @Test
     public void validateMixedMinAndMaxFloatRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("21");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.FLOAT);
+        tad.setType(KapuaTscalar.FLOAT);
         tad.setMin("100");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -656,9 +655,9 @@ public void validateMixedMinAndMaxFloatRestrictionTest() {
     @Test
     public void validateWithShortTypeWithoutRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.SHORT);
+        tad.setType(KapuaTscalar.SHORT);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -666,9 +665,9 @@ public void validateWithShortTypeWithoutRestrictionTest() {
     @Test
     public void validateWithShortTypeWitMaxRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.SHORT);
+        tad.setType(KapuaTscalar.SHORT);
         tad.setMax("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 99 is out of range", message);
@@ -677,9 +676,9 @@ public void validateWithShortTypeWitMaxRestrictionTest() {
     @Test
     public void validateWithShortTypeWitMinRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.SHORT);
+        tad.setType(KapuaTscalar.SHORT);
         tad.setMin("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 12 is out of range", message);
@@ -688,9 +687,9 @@ public void validateWithShortTypeWitMinRestrictionTest() {
     @Test
     public void validateMinAndMaxShortRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.SHORT);
+        tad.setType(KapuaTscalar.SHORT);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -700,9 +699,9 @@ public void validateMinAndMaxShortRestrictionTest() {
     @Test
     public void validateCornerCasesShortRestrictionsTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 100");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.SHORT);
+        tad.setType(KapuaTscalar.SHORT);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -712,9 +711,9 @@ public void validateCornerCasesShortRestrictionsTest() {
     @Test
     public void validateEqualMinAndMaxShortRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 10");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.SHORT);
+        tad.setType(KapuaTscalar.SHORT);
         tad.setMin("10");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -724,9 +723,9 @@ public void validateEqualMinAndMaxShortRestrictionTest() {
     @Test
     public void validateMixedMinAndMaxShortRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("21");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.SHORT);
+        tad.setType(KapuaTscalar.SHORT);
         tad.setMin("100");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -736,9 +735,9 @@ public void validateMixedMinAndMaxShortRestrictionTest() {
     @Test
     public void validateWithByteTypeWithoutRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.BYTE);
+        tad.setType(KapuaTscalar.BYTE);
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("", message);
     }
@@ -746,9 +745,9 @@ public void validateWithByteTypeWithoutRestrictionTest() {
     @Test
     public void validateWithByteTypeWitMaxRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.BYTE);
+        tad.setType(KapuaTscalar.BYTE);
         tad.setMax("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 99 is out of range", message);
@@ -757,9 +756,9 @@ public void validateWithByteTypeWitMaxRestrictionTest() {
     @Test
     public void validateWithByteTypeWitMinRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.BYTE);
+        tad.setType(KapuaTscalar.BYTE);
         tad.setMin("50");
         String message = valueTokenizer.validate(tad);
         Assert.assertEquals("Value 12 is out of range", message);
@@ -768,9 +767,9 @@ public void validateWithByteTypeWitMinRestrictionTest() {
     @Test
     public void validateMinAndMaxByteRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.BYTE);
+        tad.setType(KapuaTscalar.BYTE);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -780,9 +779,9 @@ public void validateMinAndMaxByteRestrictionTest() {
     @Test
     public void validateCornerCasesByteRestrictionsTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 100");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.BYTE);
+        tad.setType(KapuaTscalar.BYTE);
         tad.setMin("10");
         tad.setMax("100");
         String message = valueTokenizer.validate(tad);
@@ -792,9 +791,9 @@ public void validateCornerCasesByteRestrictionsTest() {
     @Test
     public void validateEqualMinAndMaxByteRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("10, 10");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.BYTE);
+        tad.setType(KapuaTscalar.BYTE);
         tad.setMin("10");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -804,9 +803,9 @@ public void validateEqualMinAndMaxByteRestrictionTest() {
     @Test
     public void validateMixedMinAndMaxByteRestrictionTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("21");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.BYTE);
+        tad.setType(KapuaTscalar.BYTE);
         tad.setMin("100");
         tad.setMax("10");
         String message = valueTokenizer.validate(tad);
@@ -816,9 +815,9 @@ public void validateMixedMinAndMaxByteRestrictionTest() {
     @Test
     public void validateTest() {
         ValueTokenizer valueTokenizer = new ValueTokenizer("12, 99");
-        TadImpl tad = new TadImpl();
+        KapuaTad tad = new KapuaTad();
         tad.setCardinality(10);
-        tad.setType(TscalarImpl.FLOAT);
+        tad.setType(KapuaTscalar.FLOAT);
         KapuaToption option = null;
         tad.addOption(option);
         String message = valueTokenizer.validate(tad);
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/KapuaMetatypeFactoryImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/KapuaMetatypeFactoryImplTest.java
deleted file mode 100644
index 450970be709..00000000000
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/KapuaMetatypeFactoryImplTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-@Category(JUnitTests.class)
-public class KapuaMetatypeFactoryImplTest {
-
-    @Test
-    public void testKapuaTocd() {
-        KapuaMetatypeFactoryImpl factory = new KapuaMetatypeFactoryImpl();
-        Assert.assertNotNull(factory.newKapuaTocd());
-    }
-
-    @Test
-    public void testkapuaTad() {
-        KapuaMetatypeFactoryImpl factory = new KapuaMetatypeFactoryImpl();
-        Assert.assertNotNull(factory.newKapuaTad());
-    }
-
-    @Test
-    public void testKapuaTscalar() {
-        KapuaMetatypeFactoryImpl factory = new KapuaMetatypeFactoryImpl();
-        Assert.assertNotNull(factory.newKapuaTscalar("String"));
-    }
-
-    @Test
-    public void testNewKapuaToption() {
-        KapuaMetatypeFactoryImpl factory = new KapuaMetatypeFactoryImpl();
-        Assert.assertNotNull(factory.newKapuaToption());
-    }
-
-    @Test
-    public void testNewKapuaTicon() {
-        KapuaMetatypeFactoryImpl factory = new KapuaMetatypeFactoryImpl();
-        Assert.assertNotNull(factory.newKapuaTicon());
-    }
-
-    @Test
-    public void testNewKapuaTmetadata() {
-        KapuaMetatypeFactoryImpl factory = new KapuaMetatypeFactoryImpl();
-        Assert.assertNotNull(factory.newKapuaTmetadata());
-    }
-
-    @Test
-    public void testNewKapuaTdesignate() {
-        KapuaMetatypeFactoryImpl factory = new KapuaMetatypeFactoryImpl();
-        Assert.assertNotNull(factory.newKapuaTdesignate());
-    }
-
-    @Test
-    public void testNewKapuaTobject() {
-        KapuaMetatypeFactoryImpl factory = new KapuaMetatypeFactoryImpl();
-        Assert.assertNotNull(factory.newKapuaTobject());
-    }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/ObjectFactoryImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/ObjectFactoryImplTest.java
deleted file mode 100644
index b4871efdfde..00000000000
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/ObjectFactoryImplTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-@Category(JUnitTests.class)
-public class ObjectFactoryImplTest {
-
-    @Test
-    public void testCreateTicon() {
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createTicon());
-    }
-
-    @Test
-    public void testCreateTattribute() {
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createTattribute());
-    }
-
-    @Test
-    public void testCreateTmetadata() {
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createTmetadata());
-    }
-
-    @Test
-    public void testCreateTdesignate() {
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createTdesignate());
-    }
-
-    @Test
-    public void testCreateTad() {
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createTad());
-    }
-
-    @Test
-    public void testCreateTobject() {
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createTobject());
-    }
-
-    @Test
-    public void testCreateTocd() {
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createTocd());
-    }
-
-    @Test
-    public void testCreateToption() {
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createToption());
-    }
-
-    @Test
-    public void testCreateMetaData() {
-        TmetadataImpl value = new TmetadataImpl();
-        ObjectFactoryImpl factoryImpl = new ObjectFactoryImpl();
-        Assert.assertNotNull(factoryImpl.createMetaData(value));
-    }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TadImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TadImplTest.java
deleted file mode 100644
index 74097380ff6..00000000000
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TadImplTest.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-@Category(JUnitTests.class)
-public class TadImplTest {
-
-    @Before
-    public void createInstanceOfClasses() {
-
-        tadImpl = new TadImpl();
-        toption = new ToptionImpl();
-        toption2 = new ToptionImpl();
-    }
-
-    TadImpl tadImpl;
-    ToptionImpl toption;
-    ToptionImpl toption2;
-
-    @Test
-    public void getOptionToNullTest() {
-        tadImpl.getOption();
-        Assert.assertTrue(tadImpl.getOption().isEmpty());
-    }
-
-    @Test
-    public void setAndGetOptionRegularTest() {
-        List<KapuaToption> option = new ArrayList<>();
-        option.add(toption);
-        tadImpl.setOption(option);
-        Assert.assertEquals("tadImpl.option", option, tadImpl.getOption());
-    }
-
-    @Test
-    public void addAndGetOptionTest() {
-        List<KapuaToption> options = new ArrayList<>();
-        options.add(toption);
-        options.add(toption2);
-
-        tadImpl.addOption(toption);
-        tadImpl.addOption(toption2);
-
-        Assert.assertEquals("tadImpl.option", options, tadImpl.getOption());
-    }
-
-    @Test
-    public void getAnyTest() {
-        Assert.assertTrue(tadImpl.getAny().isEmpty());
-    }
-
-    @Test
-    public void setAndGetAnyTest() {
-        List<Object> options = new ArrayList<>();
-        options.add(toption);
-        options.add(toption2);
-        options.add(null);
-        tadImpl.setAny(options);
-        Assert.assertEquals("tadImpl.option", options, tadImpl.getAny());
-    }
-
-    @Test
-    public void setAndGetNameToNullTest() {
-        tadImpl.setName(null);
-        Assert.assertNull(tadImpl.getName());
-    }
-
-    @Test
-    public void setAndGetNameTest() {
-        String[] permittedValues = {"", "regularName", "49", "regular Name", "regular name with spaces", "!@#$%&*()_+/->,<", "NAME", "name123"};
-        for (String value : permittedValues) {
-            tadImpl.setName(value);
-            Assert.assertTrue(tadImpl.getName().contains(value));
-        }
-    }
-
-    @Test
-    public void setAndGetDescriptionToNullTest() {
-        tadImpl.setDescription(null);
-        Assert.assertNull(tadImpl.getDescription());
-    }
-
-    @Test
-    public void setAndGetDescriptionTest() {
-        String[] permittedValues = {"", "regularDescription", "49", "regular Description", "regular description with spaces", "!@#$%&*()_+/->,<", "DESCRIPTION", "description123"};
-        for (String value : permittedValues) {
-            tadImpl.setDescription(value);
-            Assert.assertTrue(tadImpl.getDescription().contains(value));
-        }
-    }
-
-    @Test
-    public void setAndGetIdToNullTest() {
-        tadImpl.setId(null);
-        Assert.assertNull(tadImpl.getId());
-    }
-
-    @Test
-    public void setAndGetIdTest() {
-        String[] permittedValues = {"", "regularId", "49", "regular Id", "regular id with spaces", "!@#$%&*()_+/->,<", "ID", "id123"};
-        for (String value : permittedValues) {
-            tadImpl.setId(value);
-            Assert.assertTrue(tadImpl.getId().contains(value));
-        }
-    }
-
-    @Test
-    public void setAndGetTypeStringTest() {
-        tadImpl.setType(TscalarImpl.STRING);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.STRING, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypeLongTest() {
-        tadImpl.setType(TscalarImpl.LONG);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.LONG, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypeDoubleTest() {
-        tadImpl.setType(TscalarImpl.DOUBLE);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.DOUBLE, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypeFloatTest() {
-        tadImpl.setType(TscalarImpl.FLOAT);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.FLOAT, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypeIntegerTest() {
-        tadImpl.setType(TscalarImpl.INTEGER);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.INTEGER, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypeByteTest() {
-        tadImpl.setType(TscalarImpl.BYTE);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.BYTE, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypeCharTest() {
-        tadImpl.setType(TscalarImpl.CHAR);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.CHAR, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypeBooleanTest() {
-        tadImpl.setType(TscalarImpl.BOOLEAN);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.BOOLEAN, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypeShortTest() {
-        tadImpl.setType(TscalarImpl.SHORT);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.SHORT, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetTypePasswordTest() {
-        tadImpl.setType(TscalarImpl.PASSWORD);
-        Assert.assertEquals("tadImpl.type", TscalarImpl.PASSWORD, tadImpl.getType());
-    }
-
-    @Test
-    public void setAndGetCardinalityToNullTest() {
-        tadImpl.setCardinality(null);
-        Assert.assertEquals("tadImpl.cardinality", 0, (int) tadImpl.getCardinality());
-    }
-
-    @Test
-    public void setAndGetCardinalityRegularTest() {
-        int[] permittedValues = {1, 10, 100, 500, -2147483648, 2147483647, 0};
-        for (int value : permittedValues) {
-            tadImpl.setCardinality(value);
-            Assert.assertEquals("tadImpl.cardinality", Integer.valueOf(value), tadImpl.getCardinality());
-        }
-    }
-
-    @Test
-    public void setAndGetMinToNullTest() {
-        tadImpl.setMin(null);
-        Assert.assertNull(tadImpl.getMin());
-    }
-
-    @Test
-    public void setAndGetMinTest() {
-        String[] permittedValues = {"", "regularMin", "49", "regular Min", "regular min with spaces", "!@#$%&*()_+/->,<", "MIN", "min123"};
-        for (String value : permittedValues) {
-            tadImpl.setMin(value);
-            Assert.assertTrue(tadImpl.getMin().contains(value));
-        }
-    }
-
-    @Test
-    public void setAndGetMaxToNullTest() {
-        tadImpl.setMax(null);
-        Assert.assertNull(tadImpl.getMax());
-    }
-
-    @Test
-    public void setAndGetMaxTest() {
-        String[] permittedValues = {"", "regularMax", "49", "regular Max", "regular max with spaces", "!@#$%&*()_+/->,<", "MAX", "max123"};
-        for (String value : permittedValues) {
-            tadImpl.setMax(value);
-            Assert.assertTrue(tadImpl.getMax().contains(value));
-        }
-    }
-
-    @Test
-    public void setAndGetDefaultToNullTest() {
-        tadImpl.setDefault(null);
-        Assert.assertNull(tadImpl.getDefault());
-    }
-
-    @Test
-    public void setAndGetDefaultTest() {
-        String[] permittedValues = {"", "regularDefault", "49", "regular Default", "regular default with spaces", "!@#$%&*()_+/->,<", "DEFAULT", "default123"};
-        for (String value : permittedValues) {
-            tadImpl.setDefault(value);
-            Assert.assertTrue(tadImpl.getDefault().contains(value));
-        }
-    }
-
-    @Test
-    public void setIsRequiredToNullTest() {
-        tadImpl.setRequired(null);
-        Assert.assertTrue(tadImpl.isRequired());
-    }
-
-    @Test
-    public void setAndIsRequiredTest() {
-        boolean[] permittedValues = {false, true};
-        for (boolean value : permittedValues) {
-            tadImpl.setRequired(value);
-            Assert.assertEquals("tadImpl.value", value, tadImpl.isRequired());
-        }
-    }
-
-    @Test
-    public void putAndGetOtherAttributeTest() {
-        Map<QName, String> expectedValues = new HashMap<>();
-
-        expectedValues.put(QName.valueOf("1"), "a");
-        expectedValues.put(QName.valueOf("2"), "b");
-        expectedValues.put(QName.valueOf("3"), "c");
-
-        tadImpl.putOtherAttribute(QName.valueOf("1"),"a");
-        tadImpl.putOtherAttribute(QName.valueOf("2"),"b");
-        tadImpl.putOtherAttribute(QName.valueOf("3"),"c");
-
-        Assert.assertEquals("tadImpl.attributes", expectedValues, tadImpl.getOtherAttributes());
-    }
-
-    @Test
-    public void getOtherAttributeTest() {
-        Assert.assertTrue(tadImpl.getOtherAttributes().isEmpty());
-    }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TocdImplTest.java b/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TocdImplTest.java
deleted file mode 100644
index b2e3d458373..00000000000
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TocdImplTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTad;
-import org.eclipse.kapua.model.config.metatype.KapuaTicon;
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.xml.namespace.QName;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-@Category(JUnitTests.class)
-public class TocdImplTest {
-
-    @Before
-    public void createInstanceOfClasses() {
-
-        tocdImpl = new TocdImpl();
-        tadImpl = new TadImpl();
-        tadImpl2 = new TadImpl();
-        tadImpl3 = new TadImpl();
-        ticon = new TiconImpl();
-        ticon2 = new TiconImpl();
-    }
-
-    TocdImpl tocdImpl;
-    TadImpl tadImpl;
-    TadImpl tadImpl2;
-    TadImpl tadImpl3;
-    TiconImpl ticon;
-    TiconImpl ticon2;
-
-    @Test
-    public void getADTest() {
-        Assert.assertTrue(tocdImpl.getAD().isEmpty());
-    }
-
-    @Test
-    public void setAndGetADTest() {
-        List<KapuaTad> expectedValues = new ArrayList<>();
-        expectedValues.add(tadImpl);
-        tocdImpl.setAD(expectedValues);
-        Assert.assertEquals("tocdImpl.ad", expectedValues, tocdImpl.getAD());
-    }
-
-    @Test
-    public void addAndGetADTest() {
-        tocdImpl.addAD(tadImpl3);
-        tocdImpl.addAD(tadImpl2);
-        tocdImpl.getAD();
-        Assert.assertTrue(tocdImpl.getAD().contains(tadImpl3) && tocdImpl.getAD().contains(tadImpl2));
-    }
-
-    @Test
-    public void getIconTest(){
-        Assert.assertTrue(tocdImpl.getIcon().isEmpty());
-    }
-
-    @Test
-    public void setAndGetIconTest() {
-        List<KapuaTicon> listOfObj = new ArrayList<>();
-        listOfObj.add(ticon);
-        tocdImpl.setIcon(listOfObj);
-        Assert.assertEquals("tocdImpl.icon", listOfObj, tocdImpl.getIcon());
-    }
-
-    @Test
-    public void addAndGetIconTest() {
-        tocdImpl.addIcon(ticon);
-        tocdImpl.addIcon(ticon2);
-        tocdImpl.getIcon();
-        Assert.assertTrue(tocdImpl.getIcon().contains(ticon) && tocdImpl.getIcon().contains(ticon2));
-    }
-
-    @Test
-    public void getAnyTest() {
-        Assert.assertTrue(tocdImpl.getAny().isEmpty());
-    }
-
-    @Test
-    public void setAndGetAnyTest() {
-        List<Object> options = new ArrayList<>();
-        options.add(ticon);
-        options.add(ticon2);
-        tocdImpl.setAny(options);
-        Assert.assertEquals("tocdImpl.any", options, tocdImpl.getAny());
-    }
-
-    @Test
-    public void addAndGetAnyTest() {
-        tocdImpl.addAny(ticon);
-        tocdImpl.addAny(ticon2);
-        Assert.assertTrue(tocdImpl.getAny().contains(ticon) && tocdImpl.getAny().contains(ticon2));
-    }
-
-    @Test
-    public void setAndGetNameToNullTest() {
-        tocdImpl.setName(null);
-        Assert.assertNull(tocdImpl.getName());
-    }
-
-    @Test
-    public void setAndGetNameTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularName", "regular Name", "49", "regularName49", "REGULAR", "246465494135646120009090049684646496468456468496846464968496844"};
-        for (String value : permittedValues) {
-            tocdImpl.setName(value);
-            Assert.assertTrue(tocdImpl.getName().contains(value));
-        }
-    }
-
-    @Test
-    public void setAndGetDescriptionToNullTest() {
-        tocdImpl.setDescription(null);
-        Assert.assertNull(tocdImpl.getDescription());
-    }
-
-    @Test
-    public void setAndGetDescriptionTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regular Description", "49", "regularDescription49", "DESCRIPTION", "246465494135646120009090049684646496468456468496846464968496844"};
-        for (String value : permittedValues) {
-            tocdImpl.setDescription(value);
-            Assert.assertTrue(tocdImpl.getDescription().contains(value));
-        }
-    }
-
-    @Test
-    public void setAndGetIdToNullTest() {
-        tocdImpl.setId(null);
-        Assert.assertNull(tocdImpl.getId());
-    }
-
-    @Test
-    public void setAndGetIdTest() {
-        String[] permittedValues = {"", "regularId", "49", "regular Id", "regular id with spaces", "!@#$%&*()_+/->,<", "ID", "id123"};
-        for (String value : permittedValues) {
-            tocdImpl.setId(value);
-            Assert.assertTrue(tocdImpl.getId().contains(value));
-        }
-    }
-
-    @Test
-    public void putAndGetOtherAttributeTest() {
-        Map<QName, String> expectedValues = new HashMap<>();
-
-        expectedValues.put(QName.valueOf("1"), "a");
-        expectedValues.put(QName.valueOf("2"), "b");
-        expectedValues.put(QName.valueOf("3"), "c");
-
-        tocdImpl.putOtherAttribute(QName.valueOf("1"),"a");
-        tocdImpl.putOtherAttribute(QName.valueOf("2"),"b");
-        tocdImpl.putOtherAttribute(QName.valueOf("3"),"c");
-
-        Assert.assertEquals("tocdImpl.otherAttributes", expectedValues, tocdImpl.getOtherAttributes());
-    }
-
-    @Test
-    public void getOtherAttributeTest() {
-        Assert.assertTrue(tocdImpl.getOtherAttributes().isEmpty());
-    }
-
-    @Test
-    public void testSetAndGetOtherAttribute() {
-        Map<QName, String> values = new HashMap<>();
-
-        values.put(QName.valueOf("1"), "a");
-        values.put(QName.valueOf("2"), "b");
-        values.put(QName.valueOf("3"), "c");
-
-        tocdImpl.setOtherAttributes(values);
-        Assert.assertEquals("tocdImpl.otherAttributes", values, tocdImpl.getOtherAttributes());
-    }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/util/StringUtilTest.java b/commons/src/test/java/org/eclipse/kapua/commons/util/StringUtilTest.java
index 30240825907..2f588029b87 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/util/StringUtilTest.java
+++ b/commons/src/test/java/org/eclipse/kapua/commons/util/StringUtilTest.java
@@ -14,13 +14,12 @@
 
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.KapuaIllegalArgumentException;
-import org.eclipse.kapua.commons.configuration.metatype.Password;
+import org.eclipse.kapua.model.config.metatype.Password;
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-
 @Category(JUnitTests.class)
 public class StringUtilTest {
 
@@ -31,13 +30,15 @@ public void splitValuesNullTest() {
 
     @Test
     public void splitValuesTest() {
-        String[] delimiterStrings = {"string ,aa", "s,tring", ",string", "string,", "string,,", ",,string", "str,in,g", ",str,in,g,"};
-        String[] escapeStrings = {"\\str \\ing", "\\string \\", "\\str ing", "s\\\\tring", " strin\\g", "st\\ring", "\\", "str\\ing", "stri\\ng", "strin\\g", "string\\", "\\\\"};
-        String[] regularStrings = {"ss  sss               s", "string", "", "s tring", "s tri ng", "!@#$%^&*()_/.'|<>?|:1234567890"};
+        String[] delimiterStrings = { "string ,aa", "s,tring", ",string", "string,", "string,,", ",,string", "str,in,g", ",str,in,g," };
+        String[] escapeStrings = { "\\str \\ing", "\\string \\", "\\str ing", "s\\\\tring", " strin\\g", "st\\ring", "\\", "str\\ing", "stri\\ng", "strin\\g", "string\\", "\\\\" };
+        String[] regularStrings = { "ss  sss               s", "string", "", "s tring", "s tri ng", "!@#$%^&*()_/.'|<>?|:1234567890" };
 
-        String[][] expectedDelimiterStrings = {{"string", "aa"}, {"s", "tring"}, {"", "string"}, {"string", ""}, {"string", "", ""}, {"", "", "string"}, {"str", "in", "g"}, {"", "str", "in", "g", ""}};
-        String[][] expectedEscapeStrings = {{"str ing"}, {"string"}, {"str ing"}, {"s\\tring"}, {"string"}, {"string"}, {""}, {"string"}, {"string"}, {"string"}, {"string"}, {"\\"}};
-        String[][] expectedRegularStrings = {{"ss  sss               s"}, {"string"}, {""}, {"s tring"}, {"s tri ng"}, {"!@#$%^&*()_/.'|<>?|:1234567890"}};
+        String[][] expectedDelimiterStrings = { { "string", "aa" }, { "s", "tring" }, { "", "string" }, { "string", "" }, { "string", "", "" }, { "", "", "string" }, { "str", "in", "g" },
+                { "", "str", "in", "g", "" } };
+        String[][] expectedEscapeStrings = { { "str ing" }, { "string" }, { "str ing" }, { "s\\tring" }, { "string" }, { "string" }, { "" }, { "string" }, { "string" }, { "string" }, { "string" },
+                { "\\" } };
+        String[][] expectedRegularStrings = { { "ss  sss               s" }, { "string" }, { "" }, { "s tring" }, { "s tri ng" }, { "!@#$%^&*()_/.'|<>?|:1234567890" } };
 
         for (int i = 0; i < delimiterStrings.length; i++) {
             Assert.assertArrayEquals("Expected and actual values should be the same.", expectedDelimiterStrings[i], StringUtil.splitValues(delimiterStrings[i]));
@@ -91,8 +92,8 @@ public void stringToValueIncorrectTypeTest() {
 
     @Test
     public void stringToValueStringTypeTest() throws Exception {
-        String[] stringArray = new String[]{"a", "ab", "abc", "string", "String", "STRING", "!#$%&'()=?*QWERTYUIOPŠĐASDFGHJKLČĆŽZXCVBNM;:_>Z⁄@‹›€°·‚Test±}{∏Ø’”ÆæÒÔÓÌ~«¿ˇÈ¯Ñ◊"};
-        String[] type = new String[]{"sTring", "strinG", "string", "STRING"};
+        String[] stringArray = new String[] { "a", "ab", "abc", "string", "String", "STRING", "!#$%&'()=?*QWERTYUIOPŠĐASDFGHJKLČĆŽZXCVBNM;:_>Z⁄@‹›€°·‚Test±}{∏Ø’”ÆæÒÔÓÌ~«¿ˇÈ¯Ñ◊" };
+        String[] type = new String[] { "sTring", "strinG", "string", "STRING" };
 
         // Positive tests
         for (int k = 0; k < stringArray.length; k++) {
@@ -118,10 +119,10 @@ public void stringToValueStringTypeTest() throws Exception {
 
     @Test
     public void stringToValueBooleanTypeTest() throws Exception {
-        String booleanNegativeType[] = new String[]{"bOolean", "booleaN", "BOOLEAN"};
+        String booleanNegativeType[] = new String[] { "bOolean", "booleaN", "BOOLEAN" };
 
-        String booleanTrueValues[] = new String[]{"true", "True", "tRue", "truE", "TRUE"};
-        String booleanFalseValues[] = new String[]{"false", "False", "faLse", "fals", "FALSE"};
+        String booleanTrueValues[] = new String[] { "true", "True", "tRue", "truE", "TRUE" };
+        String booleanFalseValues[] = new String[] { "false", "False", "faLse", "fals", "FALSE" };
 
         // boolean.True positive tests
         for (int i = 0; i < booleanTrueValues.length; i++) {
@@ -173,9 +174,9 @@ public void stringToValueBooleanTypeTest() throws Exception {
 
     @Test
     public void stringToValueByteTypeTest() throws Exception {
-        String[] byteTypeInvalidValues = new String[]{"bYte", "bytE", "BYTE"};
+        String[] byteTypeInvalidValues = new String[] { "bYte", "bytE", "BYTE" };
         String byteTypeValidValues = "Byte";
-        Byte[] byteValues = new Byte[]{-128, 127, 0};
+        Byte[] byteValues = new Byte[] { -128, 127, 0 };
 
         // Byte positive tests
         for (int i = 0; i < byteValues.length; i++) {
@@ -200,8 +201,8 @@ public void stringToValueByteTypeTest() throws Exception {
 
     @Test
     public void stringToValueCharTypeTest() throws Exception {
-        Character[] characterArray = new Character[]{'!', '#', '$', '%', '&', '(', ')', '=', '?', '*', '/', '1', '2', '3', '4', 'A', 'B', 'C', 'a', 'b', 'c'};
-        String[] charInvalidType = new String[]{"cHar", "chaR", "Character", "cHaracter", "CHARACTER", "CHAR"};
+        Character[] characterArray = new Character[] { '!', '#', '$', '%', '&', '(', ')', '=', '?', '*', '/', '1', '2', '3', '4', 'A', 'B', 'C', 'a', 'b', 'c' };
+        String[] charInvalidType = new String[] { "cHar", "chaR", "Character", "cHaracter", "CHARACTER", "CHAR" };
         String charValidType = "Char";
 
         // Character positive tests
@@ -228,8 +229,8 @@ public void stringToValueCharTypeTest() throws Exception {
     @Test
     public void stringToValueDoubleTypeTest() throws Exception {
         String doubleValidType = "Double";
-        String[] doubleInvalidType = new String[]{"dOuble", "doublE", "DOUBLE"};
-        Double[] doubleValues = new Double[]{-1.781273812737812731273129312, 1.781273812737812731273129312, 0.0};
+        String[] doubleInvalidType = new String[] { "dOuble", "doublE", "DOUBLE" };
+        Double[] doubleValues = new Double[] { -1.781273812737812731273129312, 1.781273812737812731273129312, 0.0 };
 
         // Double positive tests
         for (int i = 0; i < doubleValues.length; i++) {
@@ -255,8 +256,8 @@ public void stringToValueDoubleTypeTest() throws Exception {
     @Test
     public void stringToValueFloatTypeTest() throws Exception {
         String floatValidType = "Float";
-        String[] floatinvalidType = new String[]{"fLoat", "floaT", "FLOAT"};
-        Float[] floatValues = new Float[]{-1.7811233F, 1.7811233F, 0F};
+        String[] floatinvalidType = new String[] { "fLoat", "floaT", "FLOAT" };
+        Float[] floatValues = new Float[] { -1.7811233F, 1.7811233F, 0F };
 
         // Float positive tests
         for (int i = 0; i < floatValues.length; i++) {
@@ -282,8 +283,8 @@ public void stringToValueFloatTypeTest() throws Exception {
     @Test
     public void stringToValueIntegerTypeTest() throws Exception {
         String integerValidType = "Integer";
-        String[] integerInvalidType = new String[]{"iNteger", "integeR", "INTEGER"};
-        Integer[] integerValues = new Integer[]{-2147483648, 2147483647, 0};
+        String[] integerInvalidType = new String[] { "iNteger", "integeR", "INTEGER" };
+        Integer[] integerValues = new Integer[] { -2147483648, 2147483647, 0 };
 
         // Float positive tests
         for (int i = 0; i < integerValues.length; i++) {
@@ -309,8 +310,8 @@ public void stringToValueIntegerTypeTest() throws Exception {
     @Test
     public void stringToValueLongTypeTest() throws Exception {
         String longValidType = "Long";
-        String[] longInvalidType = new String[]{"lOng", "lonG", "LONG"};
-        Long[] longValues = new Long[]{-922337203685477600L, 922337203685477600L, 0L};
+        String[] longInvalidType = new String[] { "lOng", "lonG", "LONG" };
+        Long[] longValues = new Long[] { -922337203685477600L, 922337203685477600L, 0L };
 
         // Long positive tests
         for (int i = 0; i < longValues.length; i++) {
@@ -336,8 +337,8 @@ public void stringToValueLongTypeTest() throws Exception {
     @Test
     public void stringToValueShortTypeTest() throws Exception {
         String shortValidType = "Short";
-        String[] shortInvalidType = new String[]{"sHort", "shorT", "SHORT"};
-        Short[] shortValues = new Short[]{-32768, 32767, 0};
+        String[] shortInvalidType = new String[] { "sHort", "shorT", "SHORT" };
+        Short[] shortValues = new Short[] { -32768, 32767, 0 };
 
         // Short positive tests
         for (int i = 0; i < shortValues.length; i++) {
@@ -363,17 +364,18 @@ public void stringToValueShortTypeTest() throws Exception {
     @Test
     public void stringToValuePasswordTypeTest() throws Exception {
         String passwordValidType = "Password";
-        String[] passwordInvalidType = new String[]{"pAssword", "passworD", "PASSWORD"};
+        String[] passwordInvalidType = new String[] { "pAssword", "passworD", "PASSWORD" };
         Password password1 = new Password("a");
         Password password2 = new Password("aaaaaaaaaaaaaaaaaaaa");
         Password password3 = new Password("⁄@‹›€°·‚Short}{∏ÆæÒ”");
-        Object[] passwordValues = new Object[]{password1, password2, password3};
+        Object[] passwordValues = new Object[] { password1, password2, password3 };
         // Password [] passwordValues = new Password[]{"a", "aaaaaaaaaaaaaaaaaaaa", "⁄@‹›€°·‚Short}{∏ÆæÒ”"};
 
         // Password positive tests
         for (int i = 0; i < passwordValues.length; i++) {
             try {
-                Assert.assertEquals("Expected and actual values should be the same.", String.valueOf(passwordValues[i]), StringUtil.stringToValue(passwordValidType, String.valueOf(passwordValues[i])).toString());
+                Assert.assertEquals("Expected and actual values should be the same.", String.valueOf(passwordValues[i]),
+                        StringUtil.stringToValue(passwordValidType, String.valueOf(passwordValues[i])).toString());
             } catch (Exception e) {
                 Assert.fail("No exception expected for" + passwordValues[i]);
             }
@@ -398,7 +400,8 @@ public void valueToStringNullTest() {
 
     @Test
     public void valueToStringTypeStringTest() {
-        String[] stringValues = new String[]{"", "s", "string", "STRING", "abcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweq"};
+        String[] stringValues = new String[] { "", "s", "string", "STRING",
+                "abcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweqabcdefgrtqyweuqywueuqeuuqweq" };
 
         for (int i = 0; i < stringValues.length; i++) {
             try {
@@ -411,7 +414,7 @@ public void valueToStringTypeStringTest() {
 
     @Test
     public void valueToStringTypeLongTest() {
-        Long[] longValues = new Long[]{0L, 922337203685477600L, -922337203685477600L};
+        Long[] longValues = new Long[] { 0L, 922337203685477600L, -922337203685477600L };
         for (int i = 0; i < longValues.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", longValues[i].toString(), StringUtil.valueToString(longValues[i]));
@@ -423,7 +426,7 @@ public void valueToStringTypeLongTest() {
 
     @Test
     public void valueToStringTypeDoubleTest() {
-        Double[] doubleValues = new Double[]{0.0, 1.781273812737812731273129312, -1.781273812737812731273129312};
+        Double[] doubleValues = new Double[] { 0.0, 1.781273812737812731273129312, -1.781273812737812731273129312 };
         for (int i = 0; i < doubleValues.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", doubleValues[i].toString(), StringUtil.valueToString(doubleValues[i]));
@@ -435,7 +438,7 @@ public void valueToStringTypeDoubleTest() {
 
     @Test
     public void valueToStringTypeFloatTest() {
-        Float[] floatValues = new Float[]{0F, 1.781123312321311231F, -1.7811233323123F};
+        Float[] floatValues = new Float[] { 0F, 1.781123312321311231F, -1.7811233323123F };
         for (int i = 0; i < floatValues.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", floatValues[i].toString(), StringUtil.valueToString(floatValues[i]));
@@ -447,7 +450,7 @@ public void valueToStringTypeFloatTest() {
 
     @Test
     public void valueToStringTypeIntegerTest() {
-        Integer[] integerValues = new Integer[]{2147483647, -2147483647, 0};
+        Integer[] integerValues = new Integer[] { 2147483647, -2147483647, 0 };
         for (int i = 0; i < integerValues.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", integerValues[i].toString(), StringUtil.valueToString(integerValues[i]));
@@ -459,7 +462,7 @@ public void valueToStringTypeIntegerTest() {
 
     @Test
     public void valueToStringTypeByteTest() {
-        Byte[] byteValues = new Byte[]{-128, 127, 0};
+        Byte[] byteValues = new Byte[] { -128, 127, 0 };
         for (int i = 0; i < byteValues.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", byteValues[i].toString(), StringUtil.valueToString(byteValues[i]));
@@ -471,7 +474,7 @@ public void valueToStringTypeByteTest() {
 
     @Test
     public void valueToStringTypeCharacterTest() {
-        Character[] characterValues = new Character[]{'a', '1', '@'};
+        Character[] characterValues = new Character[] { 'a', '1', '@' };
         for (int i = 0; i < characterValues.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", characterValues[i].toString(), StringUtil.valueToString(characterValues[i]));
@@ -483,7 +486,7 @@ public void valueToStringTypeCharacterTest() {
 
     @Test
     public void valueToStringTypeBooleanTest() {
-        Boolean[] booleanValues = new Boolean[]{Boolean.TRUE, Boolean.FALSE};
+        Boolean[] booleanValues = new Boolean[] { Boolean.TRUE, Boolean.FALSE };
         for (int i = 0; i < booleanValues.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", booleanValues[i].toString(), StringUtil.valueToString(booleanValues[i]));
@@ -495,7 +498,7 @@ public void valueToStringTypeBooleanTest() {
 
     @Test
     public void valueToStringTypeShortTest() {
-        Short[] shortValues = new Short[]{-32768, 32767, 0};
+        Short[] shortValues = new Short[] { -32768, 32767, 0 };
         for (int i = 0; i < shortValues.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", shortValues[i].toString(), StringUtil.valueToString(shortValues[i]));
@@ -510,7 +513,7 @@ public void valueToStringTypePassword() {
         Password password1 = new Password("abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPRQSTUVXYZ");
         Password password2 = new Password("01234567890");
         Password password3 = new Password("!#$%&'()=?*/+-.,<>;:_⁄@‹›€°·‚Password±}{∏¿ˇÈ~");
-        Password[] passwordValue = new Password[]{password1, password2, password3};
+        Password[] passwordValue = new Password[] { password1, password2, password3 };
         for (int i = 0; i < passwordValue.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", passwordValue[i].toString(), StringUtil.valueToString(passwordValue[i]));
@@ -522,63 +525,63 @@ public void valueToStringTypePassword() {
 
     @Test
     public void valueToStringTypeStringArrayTest() {
-        String[] stringArray = new String[]{null, "string", "string2", "string3"};
+        String[] stringArray = new String[] { null, "string", "string2", "string3" };
         String resultString = "string,string2,string3";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(stringArray));
     }
 
     @Test
     public void valueToStringTypeLongArrayTest() {
-        Long[] longArray = new Long[]{null, 0L, 1L, 12L, 123L, 1234L, 12345L, 123456L, 1234567L, 922337203685477600L, -1L, -12L, -123L, -1234L, -12345L, -922337203685477600L};
+        Long[] longArray = new Long[] { null, 0L, 1L, 12L, 123L, 1234L, 12345L, 123456L, 1234567L, 922337203685477600L, -1L, -12L, -123L, -1234L, -12345L, -922337203685477600L };
         String resultString = "0,1,12,123,1234,12345,123456,1234567,922337203685477600,-1,-12,-123,-1234,-12345,-922337203685477600";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(longArray));
     }
 
     @Test
     public void valueToStringTypeDoubleArrayTest() {
-        Double[] doubleArray = new Double[]{null, 0.0, 1.1, 1.23, 1.234, 1.2345, 1.23456, 1.234567, 1.7812738127378127};
+        Double[] doubleArray = new Double[] { null, 0.0, 1.1, 1.23, 1.234, 1.2345, 1.23456, 1.234567, 1.7812738127378127 };
         String resultString = "0.0,1.1,1.23,1.234,1.2345,1.23456,1.234567,1.7812738127378127";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(doubleArray));
     }
 
     @Test
     public void valueToStringTypeFloatArrayTest() {
-        Float[] floatArray = new Float[]{null, 0.0F, 1.0F, 1.2F, 12.34F, 123.45F, 1234.56F, 12345.6789F, 1.7811233F, -0.0F, -1.23F, -12345.12345F};
+        Float[] floatArray = new Float[] { null, 0.0F, 1.0F, 1.2F, 12.34F, 123.45F, 1234.56F, 12345.6789F, 1.7811233F, -0.0F, -1.23F, -12345.12345F };
         String resultString = "0.0,1.0,1.2,12.34,123.45,1234.56,12345.679,1.7811233,-0.0,-1.23,-12345.123";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(floatArray));
     }
 
     @Test
     public void valueToStringTypeIntegerArrayTest() {
-        Integer[] integerArray = new Integer[]{null, 0, 1, 123, 12345, 12345, 32678, -0, -1, -12, -1234, -12345, -32676};
+        Integer[] integerArray = new Integer[] { null, 0, 1, 123, 12345, 12345, 32678, -0, -1, -12, -1234, -12345, -32676 };
         String resultString = "0,1,123,12345,12345,32678,0,-1,-12,-1234,-12345,-32676";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(integerArray));
     }
 
     @Test
     public void valueToStringTypeByteArrayTest() {
-        Byte[] byteArray = new Byte[]{null, 0, 1, 12, 123, 127, -0, -1, -12, -123, -128};
+        Byte[] byteArray = new Byte[] { null, 0, 1, 12, 123, 127, -0, -1, -12, -123, -128 };
         String resultString = "0,1,12,123,127,0,-1,-12,-123,-128";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(byteArray));
     }
 
     @Test
     public void valueToStringTypeCharacterArrayTest() {
-        Character[] characterArray = new Character[]{null, 'a', 'A', 'z', 'Z', '@', '!'};
+        Character[] characterArray = new Character[] { null, 'a', 'A', 'z', 'Z', '@', '!' };
         String resultString = "a,A,z,Z,@,!";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(characterArray));
     }
 
     @Test
     public void valueToStringTypeBooleanArrayTest() {
-        Boolean[] booleanArray = new Boolean[]{null, Boolean.FALSE, Boolean.TRUE};
+        Boolean[] booleanArray = new Boolean[] { null, Boolean.FALSE, Boolean.TRUE };
         String resultString = "false,true";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(booleanArray));
     }
 
     @Test
     public void valueToStringTypeShortArrayTest() {
-        Short[] shortArray = new Short[]{null, 0, 1, 12, 123, 1234, 32767, -32768, -1234, -123, -12, -1, -0};
+        Short[] shortArray = new Short[] { null, 0, 1, 12, 123, 1234, 32767, -32768, -1234, -123, -12, -1, -0 };
         String resultString = "0,1,12,123,1234,32767,-32768,-1234,-123,-12,-1,0";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(shortArray));
     }
@@ -588,7 +591,7 @@ public void valueToStringTypePasswordArrayTest() {
         Password password1 = new Password("abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPRQSTUVXYZ");
         Password password2 = new Password("01234567890");
         Password password3 = new Password("!#$%&'()=?*/+-.<>;:_⁄@‹›€°·‚Password±}{∏¿ˇÈ~");
-        Password[] passwordArray = new Password[]{null, password1, password2, password3};
+        Password[] passwordArray = new Password[] { null, password1, password2, password3 };
         String resultString = "abcdefghijklmnopqrstuvxyzABCDEFGHIJKLMNOPRQSTUVXYZ,01234567890,!#$%&'()=?*/+-.<>;:_⁄@‹›€°·‚Password±}{∏¿ˇÈ~";
         Assert.assertEquals("Expected and actual values should be the same.", resultString, StringUtil.valueToString(passwordArray));
     }
@@ -617,8 +620,8 @@ public void escapeStringNullTest() {
 
     @Test
     public void unescapeStringTest() {
-        String[] stringArray = new String[]{"        string", "string      ", "   str  ing", "str  ing   ", "str ing", "str\\ ing", "str\\\\\\,ing", "   str\\ \\, ing   "};
-        String[] resultString = new String[]{"string", "string", "str  ing", "str  ing", "str ing", "str ing", "str,ing", "str , ing"};
+        String[] stringArray = new String[] { "        string", "string      ", "   str  ing", "str  ing   ", "str ing", "str\\ ing", "str\\\\\\,ing", "   str\\ \\, ing   " };
+        String[] resultString = new String[] { "string", "string", "str  ing", "str  ing", "str ing", "str ing", "str,ing", "str , ing" };
         for (int i = 0; i < stringArray.length; i++) {
             try {
                 Assert.assertEquals("Expected and actual values should be the same.", resultString[i], StringUtil.unescapeString(stringArray[i]));
diff --git a/console/module/account/src/main/java/org/eclipse/kapua/app/console/module/account/server/GwtAccountServiceImpl.java b/console/module/account/src/main/java/org/eclipse/kapua/app/console/module/account/server/GwtAccountServiceImpl.java
index 36184b8f23e..8f56d5e7f48 100644
--- a/console/module/account/src/main/java/org/eclipse/kapua/app/console/module/account/server/GwtAccountServiceImpl.java
+++ b/console/module/account/src/main/java/org/eclipse/kapua/app/console/module/account/server/GwtAccountServiceImpl.java
@@ -12,12 +12,26 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.console.module.account.server;
 
-import com.extjs.gxt.ui.client.data.BaseListLoadResult;
-import com.extjs.gxt.ui.client.data.BasePagingLoadResult;
-import com.extjs.gxt.ui.client.data.ListLoadResult;
-import com.extjs.gxt.ui.client.data.PagingLoadConfig;
-import com.extjs.gxt.ui.client.data.PagingLoadResult;
-import com.google.common.collect.Sets;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.concurrent.Callable;
+
+import javax.xml.namespace.QName;
+
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
@@ -38,13 +52,13 @@
 import org.eclipse.kapua.app.console.module.api.shared.model.GwtGroupedNVPair;
 import org.eclipse.kapua.app.console.module.api.shared.model.GwtXSRFToken;
 import org.eclipse.kapua.app.console.module.api.shared.util.GwtKapuaCommonsModelConverter;
-import org.eclipse.kapua.commons.configuration.metatype.EmptyTocd;
 import org.eclipse.kapua.commons.model.domains.Domains;
 import org.eclipse.kapua.commons.model.id.KapuaEid;
 import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
 import org.eclipse.kapua.commons.service.internal.KapuaServiceDisabledException;
 import org.eclipse.kapua.commons.util.ThrowingRunnable;
 import org.eclipse.kapua.locator.KapuaLocator;
+import org.eclipse.kapua.model.config.metatype.EmptyTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaTad;
 import org.eclipse.kapua.model.config.metatype.KapuaTicon;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
@@ -77,24 +91,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.concurrent.Callable;
+import com.extjs.gxt.ui.client.data.BaseListLoadResult;
+import com.extjs.gxt.ui.client.data.BasePagingLoadResult;
+import com.extjs.gxt.ui.client.data.ListLoadResult;
+import com.extjs.gxt.ui.client.data.PagingLoadConfig;
+import com.extjs.gxt.ui.client.data.PagingLoadResult;
+import com.google.common.collect.Sets;
 
 /**
  * The server side implementation of the RPC service.
@@ -207,7 +209,7 @@ public ListLoadResult<GwtGroupedNVPair> getAccountInfo(String scopeIdString, Str
         try {
             final Account account = ACCOUNT_SERVICE.find(scopeId, accountId);
 
-//TODO: #LAYER_VIOLATION - user lookup should not be done here
+            //TODO: #LAYER_VIOLATION - user lookup should not be done here
             UserListResult userListResult = KapuaSecurityUtils.doPrivileged(new Callable<UserListResult>() {
 
                 @Override
@@ -490,7 +492,7 @@ public List<GwtConfigComponent> findServiceConfigurations(String scopeId) throws
                                                         strValues.add(v.toString());
                                                     }
                                                 }
-                                                gwtParam.setValues(strValues.toArray(new String[]{}));
+                                                gwtParam.setValues(strValues.toArray(new String[] {}));
                                             }
                                         }
                                     }
diff --git a/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/server/GwtDeviceManagementServiceImpl.java b/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/server/GwtDeviceManagementServiceImpl.java
index 241de57aeaa..5c7e51a348a 100644
--- a/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/server/GwtDeviceManagementServiceImpl.java
+++ b/console/module/device/src/main/java/org/eclipse/kapua/app/console/module/device/server/GwtDeviceManagementServiceImpl.java
@@ -12,8 +12,28 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.console.module.device.server;
 
-import com.extjs.gxt.ui.client.data.BaseListLoadResult;
-import com.extjs.gxt.ui.client.data.ListLoadResult;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.MessageDigest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.StringTokenizer;
+
+import javax.xml.namespace.QName;
+
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.imaging.ImageFormat;
 import org.apache.commons.imaging.ImageFormats;
@@ -42,13 +62,13 @@
 import org.eclipse.kapua.app.console.module.device.shared.model.management.packages.GwtPackageOperation;
 import org.eclipse.kapua.app.console.module.device.shared.model.management.packages.GwtPackageUninstallRequest;
 import org.eclipse.kapua.app.console.module.device.shared.service.GwtDeviceManagementService;
-import org.eclipse.kapua.commons.configuration.metatype.Password;
 import org.eclipse.kapua.commons.model.id.KapuaEid;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.model.config.metatype.KapuaTad;
 import org.eclipse.kapua.model.config.metatype.KapuaTicon;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
+import org.eclipse.kapua.model.config.metatype.Password;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.device.management.bundle.DeviceBundle;
 import org.eclipse.kapua.service.device.management.bundle.DeviceBundleManagementService;
@@ -83,26 +103,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.namespace.QName;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.StringTokenizer;
+import com.extjs.gxt.ui.client.data.BaseListLoadResult;
+import com.extjs.gxt.ui.client.data.ListLoadResult;
 
 /**
  * The server side implementation of the Device RPC service.
@@ -372,7 +374,7 @@ public int compare(DeviceComponentConfiguration arg0, DeviceComponentConfigurati
                                                         strValues.add(v.toString());
                                                     }
                                                 }
-                                                gwtParam.setValues(strValues.toArray(new String[]{}));
+                                                gwtParam.setValues(strValues.toArray(new String[] {}));
                                             }
                                         }
                                     }
@@ -462,7 +464,8 @@ public GwtDeviceConfigurationStoreSettings getApplicationSettings(String scopeId
 
             deviceConfigurationStoreSettings = DEVICE_CONFIGURATION_STORE_SERVICE.getApplicationSettings(scopeId, deviceId);
             gwtDeviceConfigurationStoreSettings = new GwtDeviceConfigurationStoreSettings();
-            gwtDeviceConfigurationStoreSettings.setStoreEnablementPolicy(GwtDeviceConfigurationStoreSettings.GwtDeviceConfigurationStoreEnablementPolicy.valueOf(deviceConfigurationStoreSettings.getEnablementPolicy().name()));
+            gwtDeviceConfigurationStoreSettings.setStoreEnablementPolicy(
+                    GwtDeviceConfigurationStoreSettings.GwtDeviceConfigurationStoreEnablementPolicy.valueOf(deviceConfigurationStoreSettings.getEnablementPolicy().name()));
             return gwtDeviceConfigurationStoreSettings;
         } catch (Throwable t) {
             throw KapuaExceptionHandler.buildExceptionFromError(t);
@@ -470,7 +473,8 @@ public GwtDeviceConfigurationStoreSettings getApplicationSettings(String scopeId
     }
 
     @Override
-    public void setApplicationSettings(GwtXSRFToken xsrfToken, String scopeIdString, String deviceIdString, GwtDeviceConfigurationStoreSettings gwtDeviceConfigurationStoreSettings) throws GwtKapuaException {
+    public void setApplicationSettings(GwtXSRFToken xsrfToken, String scopeIdString, String deviceIdString, GwtDeviceConfigurationStoreSettings gwtDeviceConfigurationStoreSettings)
+            throws GwtKapuaException {
         checkXSRFToken(xsrfToken);
 
         try {
@@ -677,36 +681,36 @@ private Object getObjectValue(GwtConfigParameter gwtConfigParam, String strValue
         if (strValue != null) {
             GwtConfigParameterType gwtType = gwtConfigParam.getType();
             switch (gwtType) {
-                case LONG:
-                    objValue = Long.parseLong(strValue);
-                    break;
-                case DOUBLE:
-                    objValue = Double.parseDouble(strValue);
-                    break;
-                case FLOAT:
-                    objValue = Float.parseFloat(strValue);
-                    break;
-                case INTEGER:
-                    objValue = Integer.parseInt(strValue);
-                    break;
-                case SHORT:
-                    objValue = Short.parseShort(strValue);
-                    break;
-                case BYTE:
-                    objValue = Byte.parseByte(strValue);
-                    break;
-                case BOOLEAN:
-                    objValue = Boolean.parseBoolean(strValue);
-                    break;
-                case PASSWORD:
-                    objValue = new Password(strValue);
-                    break;
-                case CHAR:
-                    objValue = strValue.charAt(0);
-                    break;
-                case STRING:
-                    objValue = strValue;
-                    break;
+            case LONG:
+                objValue = Long.parseLong(strValue);
+                break;
+            case DOUBLE:
+                objValue = Double.parseDouble(strValue);
+                break;
+            case FLOAT:
+                objValue = Float.parseFloat(strValue);
+                break;
+            case INTEGER:
+                objValue = Integer.parseInt(strValue);
+                break;
+            case SHORT:
+                objValue = Short.parseShort(strValue);
+                break;
+            case BYTE:
+                objValue = Byte.parseByte(strValue);
+                break;
+            case BOOLEAN:
+                objValue = Boolean.parseBoolean(strValue);
+                break;
+            case PASSWORD:
+                objValue = new Password(strValue);
+                break;
+            case CHAR:
+                objValue = strValue.charAt(0);
+                break;
+            case STRING:
+                objValue = strValue;
+                break;
             }
         }
         return objValue;
@@ -716,79 +720,76 @@ private Object[] getObjectValue(GwtConfigParameter gwtConfigParam, String[] defa
         List<Object> values = new ArrayList<Object>();
         GwtConfigParameterType type = gwtConfigParam.getType();
         switch (type) {
-            case BOOLEAN:
-                for (String value : defaultValues) {
-                    values.add(Boolean.valueOf(value));
-                }
-                return values.toArray();
+        case BOOLEAN:
+            for (String value : defaultValues) {
+                values.add(Boolean.valueOf(value));
+            }
+            return values.toArray();
 
-            case BYTE:
-                for (String value : defaultValues) {
-                    values.add(Byte.valueOf(value));
-                }
-                return values.toArray();
+        case BYTE:
+            for (String value : defaultValues) {
+                values.add(Byte.valueOf(value));
+            }
+            return values.toArray();
 
-            case CHAR:
-                for (String value : defaultValues) {
-                    values.add(value.charAt(0));
-                }
-                return values.toArray();
+        case CHAR:
+            for (String value : defaultValues) {
+                values.add(value.charAt(0));
+            }
+            return values.toArray();
 
-            case DOUBLE:
-                for (String value : defaultValues) {
-                    values.add(Double.valueOf(value));
-                }
-                return values.toArray();
+        case DOUBLE:
+            for (String value : defaultValues) {
+                values.add(Double.valueOf(value));
+            }
+            return values.toArray();
 
-            case FLOAT:
-                for (String value : defaultValues) {
-                    values.add(Float.valueOf(value));
-                }
-                return values.toArray();
+        case FLOAT:
+            for (String value : defaultValues) {
+                values.add(Float.valueOf(value));
+            }
+            return values.toArray();
 
-            case INTEGER:
-                for (String value : defaultValues) {
-                    values.add(Integer.valueOf(value));
-                }
-                return values.toArray();
+        case INTEGER:
+            for (String value : defaultValues) {
+                values.add(Integer.valueOf(value));
+            }
+            return values.toArray();
 
-            case LONG:
-                for (String value : defaultValues) {
-                    values.add(Long.valueOf(value));
-                }
-                return values.toArray();
+        case LONG:
+            for (String value : defaultValues) {
+                values.add(Long.valueOf(value));
+            }
+            return values.toArray();
 
-            case SHORT:
-                for (String value : defaultValues) {
-                    values.add(Short.valueOf(value));
-                }
-                return values.toArray();
+        case SHORT:
+            for (String value : defaultValues) {
+                values.add(Short.valueOf(value));
+            }
+            return values.toArray();
 
-            case PASSWORD:
-                for (String value : defaultValues) {
-                    values.add(new Password(value));
-                }
-                return values.toArray();
+        case PASSWORD:
+            for (String value : defaultValues) {
+                values.add(new Password(value));
+            }
+            return values.toArray();
 
-            case STRING:
-            default:
-                return defaultValues;
+        case STRING:
+        default:
+            return defaultValues;
         }
     }
 
     /**
-     * Checks the source of the icon.
-     * The component config icon can be one of the well known icon (i.e. MqttDataTransport icon)
-     * as well as an icon loaded from external source with an HTTP link.
+     * Checks the source of the icon. The component config icon can be one of the well known icon (i.e. MqttDataTransport icon) as well as an icon loaded from external source with an HTTP link.
      * <p>
-     * We need to filter HTTP link to protect the console page and also to have content always served from
-     * EC console. Otherwise browsers can alert the user that content is served from domain different from
-     * *.everyware-cloud.com and over insicure connection.
+     * We need to filter HTTP link to protect the console page and also to have content always served from EC console. Otherwise browsers can alert the user that content is served from domain
+     * different from *.everyware-cloud.com and over insicure connection.
      * <p>
-     * To avoid this we will download the image locally on the server temporary directory and give back the page
-     * a token URL to get the file.
+     * To avoid this we will download the image locally on the server temporary directory and give back the page a token URL to get the file.
      *
-     * @param icon The icon from the OCD of the component configuration.
+     * @param icon
+     *         The icon from the OCD of the component configuration.
      */
     private void checkIconResource(KapuaTicon icon) {
         ConsoleSetting config = ConsoleSetting.getInstance();
diff --git a/console/web/src/main/java/org/eclipse/kapua/app/console/ConsoleJAXBContextProvider.java b/console/web/src/main/java/org/eclipse/kapua/app/console/ConsoleJAXBContextProvider.java
index 0bdd7251e84..507ec9735e3 100644
--- a/console/web/src/main/java/org/eclipse/kapua/app/console/ConsoleJAXBContextProvider.java
+++ b/console/web/src/main/java/org/eclipse/kapua/app/console/ConsoleJAXBContextProvider.java
@@ -12,8 +12,12 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.console;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.JAXBContext;
+
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
 import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
 import org.eclipse.kapua.commons.rest.model.errors.CleanJobDataExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.ExceptionInfo;
@@ -43,7 +47,6 @@
 import org.eclipse.kapua.model.config.metatype.KapuaTmetadata;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.MetatypeXmlRegistry;
 import org.eclipse.kapua.service.device.call.kura.model.bundle.KuraBundle;
 import org.eclipse.kapua.service.device.call.kura.model.bundle.KuraBundles;
 import org.eclipse.kapua.service.device.call.kura.model.configuration.KuraDeviceComponentConfiguration;
@@ -102,10 +105,6 @@
 import org.eclipse.persistence.jaxb.JAXBContextFactory;
 import org.eclipse.persistence.jaxb.MarshallerProperties;
 
-import javax.xml.bind.JAXBContext;
-import java.util.HashMap;
-import java.util.Map;
-
 public class ConsoleJAXBContextProvider implements JAXBContextProvider {
 
     private JAXBContext context;
@@ -117,7 +116,7 @@ public JAXBContext getJAXBContext() throws KapuaException {
                 Map<String, Object> properties = new HashMap<String, Object>(1);
                 properties.put(MarshallerProperties.JSON_WRAPPER_AS_ARRAY_NAME, true);
 
-                context = JAXBContextFactory.createContext(new Class<?>[]{
+                context = JAXBContextFactory.createContext(new Class<?>[] {
                         // REST API exception models
                         ThrowableInfo.class,
                         ExceptionInfo.class,
@@ -204,8 +203,6 @@ public JAXBContext getJAXBContext() throws KapuaException {
                         KapuaTicon.class,
                         KapuaToption.class,
                         KapuaTmetadata.class,
-                        TscalarImpl.class,
-                        MetatypeXmlRegistry.class,
 
                         // Device Management Assets
                         DeviceAssets.class,
diff --git a/console/web/src/main/resources/locator.xml b/console/web/src/main/resources/locator.xml
index 5ef23cb8223..6c1114a0bfd 100644
--- a/console/web/src/main/resources/locator.xml
+++ b/console/web/src/main/resources/locator.xml
@@ -18,6 +18,7 @@
         <package>org.eclipse.kapua.app.console</package>
         <package>org.eclipse.kapua.plugin.sso</package>
         <package>org.eclipse.kapua.commons</package>
+        <package>org.eclipse.kapua.model</package>
         <package>org.eclipse.kapua.job.engine.client</package>
         <package>org.eclipse.kapua.message</package>
         <package>org.eclipse.kapua.service</package>
diff --git a/consumer/lifecycle-app/src/main/java/org/eclipse/kapua/consumer/lifecycle/LifecycleJAXBContextProvider.java b/consumer/lifecycle-app/src/main/java/org/eclipse/kapua/consumer/lifecycle/LifecycleJAXBContextProvider.java
index 2594c9dba1a..90c25f1f136 100644
--- a/consumer/lifecycle-app/src/main/java/org/eclipse/kapua/consumer/lifecycle/LifecycleJAXBContextProvider.java
+++ b/consumer/lifecycle-app/src/main/java/org/eclipse/kapua/consumer/lifecycle/LifecycleJAXBContextProvider.java
@@ -18,7 +18,6 @@
 import javax.xml.bind.JAXBContext;
 
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
 import org.eclipse.kapua.commons.rest.model.errors.CleanJobDataExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.JobAlreadyRunningExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.JobEngineExceptionInfo;
@@ -47,7 +46,7 @@
 import org.eclipse.kapua.model.config.metatype.KapuaTobject;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.MetatypeXmlRegistry;
+import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
 import org.eclipse.kapua.service.device.call.kura.model.bundle.KuraBundle;
 import org.eclipse.kapua.service.device.call.kura.model.bundle.KuraBundles;
 import org.eclipse.kapua.service.device.call.kura.model.configuration.KuraDeviceComponentConfiguration;
@@ -98,11 +97,10 @@ public JAXBContext getJAXBContext() throws KapuaException {
                     KapuaTocd.class,
                     KapuaTad.class,
                     KapuaTicon.class,
-                    TscalarImpl.class,
+                    KapuaTscalar.class,
                     KapuaToption.class,
                     KapuaTdesignate.class,
                     KapuaTobject.class,
-                    MetatypeXmlRegistry.class,
 
                     // Kapua Service Event
                     ServiceEvent.class,
diff --git a/consumer/telemetry-app/src/main/java/org/eclipse/kapua/consumer/telemetry/TelemetryJAXBContextProvider.java b/consumer/telemetry-app/src/main/java/org/eclipse/kapua/consumer/telemetry/TelemetryJAXBContextProvider.java
index 4a5285ed66a..6189c5f0834 100644
--- a/consumer/telemetry-app/src/main/java/org/eclipse/kapua/consumer/telemetry/TelemetryJAXBContextProvider.java
+++ b/consumer/telemetry-app/src/main/java/org/eclipse/kapua/consumer/telemetry/TelemetryJAXBContextProvider.java
@@ -18,7 +18,6 @@
 import javax.xml.bind.JAXBContext;
 
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordCreator;
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordListResult;
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordQuery;
@@ -32,7 +31,7 @@
 import org.eclipse.kapua.model.config.metatype.KapuaTobject;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.MetatypeXmlRegistry;
+import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
 import org.eclipse.persistence.jaxb.JAXBContextFactory;
 import org.eclipse.persistence.jaxb.MarshallerProperties;
 import org.slf4j.Logger;
@@ -56,11 +55,10 @@ public JAXBContext getJAXBContext() throws KapuaException {
                     KapuaTocd.class,
                     KapuaTad.class,
                     KapuaTicon.class,
-                    TscalarImpl.class,
+                    KapuaTscalar.class,
                     KapuaToption.class,
                     KapuaTdesignate.class,
                     KapuaTobject.class,
-                    MetatypeXmlRegistry.class,
 
                     // KapuaEvent
                     ServiceEvent.class,
diff --git a/extras/encryption-migrator/src/main/resources/locator.xml b/extras/encryption-migrator/src/main/resources/locator.xml
index b3a26a5f24a..8ec07560ceb 100644
--- a/extras/encryption-migrator/src/main/resources/locator.xml
+++ b/extras/encryption-migrator/src/main/resources/locator.xml
@@ -17,5 +17,6 @@
         <package>org.eclipse.kapua.commons</package>
         <package>org.eclipse.kapua.service</package>
         <package>org.eclipse.kapua.extras</package>
+        <package>org.eclipse.kapua.model</package>
     </packages>
 </locator-config>
diff --git a/qa/common/src/main/java/org/eclipse/kapua/qa/common/TestJAXBContextProvider.java b/qa/common/src/main/java/org/eclipse/kapua/qa/common/TestJAXBContextProvider.java
index 3b239bf124b..7ba9f1673e5 100644
--- a/qa/common/src/main/java/org/eclipse/kapua/qa/common/TestJAXBContextProvider.java
+++ b/qa/common/src/main/java/org/eclipse/kapua/qa/common/TestJAXBContextProvider.java
@@ -12,8 +12,12 @@
  *******************************************************************************/
 package org.eclipse.kapua.qa.common;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.JAXBContext;
+
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
 import org.eclipse.kapua.commons.rest.model.IsJobRunningResponse;
 import org.eclipse.kapua.commons.rest.model.errors.ExceptionInfo;
 import org.eclipse.kapua.commons.rest.model.errors.JobAlreadyRunningExceptionInfo;
@@ -42,7 +46,6 @@
 import org.eclipse.kapua.model.config.metatype.KapuaTobject;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.MetatypeXmlRegistry;
 import org.eclipse.kapua.service.authentication.token.AccessToken;
 import org.eclipse.kapua.service.device.call.kura.model.bundle.KuraBundle;
 import org.eclipse.kapua.service.device.call.kura.model.bundle.KuraBundles;
@@ -103,10 +106,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBContext;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * JAXB context provided for proper (un)marshalling of interface annotated classes.
  * This particular implementation is used only in unit and integration tests.
@@ -122,16 +121,14 @@ public class TestJAXBContextProvider implements JAXBContextProvider {
     @Override
     public JAXBContext getJAXBContext() throws KapuaException {
         if (context == null) {
-            Class<?>[] classes = new Class<?>[]{
+            Class<?>[] classes = new Class<?>[] {
                     KapuaTmetadata.class,
                     KapuaTocd.class,
                     KapuaTad.class,
                     KapuaTicon.class,
-                    TscalarImpl.class,
                     KapuaToption.class,
                     KapuaTdesignate.class,
                     KapuaTobject.class,
-                    MetatypeXmlRegistry.class,
                     ExceptionInfo.class,
 
                     // KapuaEvent
diff --git a/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/KapuaTscalarAdapterTest.java b/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/KapuaTscalarAdapterTest.java
index 009ab32d4bb..d5638ca1ef5 100644
--- a/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/KapuaTscalarAdapterTest.java
+++ b/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/KapuaTscalarAdapterTest.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.integration.misc;
 
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
+import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
 import org.eclipse.kapua.model.config.metatype.KapuaTscalarAdapter;
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
@@ -20,22 +20,21 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-
 @Category(JUnitTests.class)
 public class KapuaTscalarAdapterTest {
 
     KapuaTscalarAdapter kapuaTscalarAdapter;
-    TscalarImpl[] kapuaTscalar;
+    KapuaTscalar[] kapuaTscalar;
     String[] stringValue;
     String[] invalidStringValue;
 
     @Before
     public void initialize() {
         kapuaTscalarAdapter = new KapuaTscalarAdapter();
-        kapuaTscalar = new TscalarImpl[]{TscalarImpl.STRING, TscalarImpl.LONG, TscalarImpl.DOUBLE, TscalarImpl.FLOAT, TscalarImpl.INTEGER,
-                TscalarImpl.BYTE, TscalarImpl.CHAR, TscalarImpl.BOOLEAN, TscalarImpl.SHORT, TscalarImpl.PASSWORD};
-        stringValue = new String[]{"String", "Long", "Double", "Float", "Integer", "Byte", "Char", "Boolean", "Short", "Password"};
-        invalidStringValue = new String[]{null, "Invalid Value"};
+        kapuaTscalar = new KapuaTscalar[] { KapuaTscalar.STRING, KapuaTscalar.LONG, KapuaTscalar.DOUBLE, KapuaTscalar.FLOAT, KapuaTscalar.INTEGER,
+                KapuaTscalar.BYTE, KapuaTscalar.CHAR, KapuaTscalar.BOOLEAN, KapuaTscalar.SHORT, KapuaTscalar.PASSWORD };
+        stringValue = new String[] { "String", "Long", "Double", "Float", "Integer", "Byte", "Char", "Boolean", "Short", "Password" };
+        invalidStringValue = new String[] { null, "Invalid Value" };
     }
 
     @Test
@@ -53,7 +52,7 @@ public void marshalNullParameterTest() throws Exception {
 
     @Test
     public void unmarshalTest() throws Exception {
-        TscalarImpl[] expectedTscalars = kapuaTscalar;
+        KapuaTscalar[] expectedTscalars = kapuaTscalar;
         for (int i = 0; i < stringValue.length; i++) {
             Assert.assertEquals("Expected and actual values should be the same.", expectedTscalars[i], kapuaTscalarAdapter.unmarshal(stringValue[i]));
         }
diff --git a/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/MetatypeXmlRegistryTest.java b/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/MetatypeXmlRegistryTest.java
deleted file mode 100644
index 2de732a820d..00000000000
--- a/qa/integration/src/test/java/org/eclipse/kapua/integration/misc/MetatypeXmlRegistryTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.integration.misc;
-
-import org.eclipse.kapua.model.config.metatype.KapuaTad;
-import org.eclipse.kapua.model.config.metatype.KapuaTicon;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.KapuaTmetadata;
-import org.eclipse.kapua.model.config.metatype.KapuaTdesignate;
-import org.eclipse.kapua.model.config.metatype.KapuaTobject;
-
-import org.eclipse.kapua.model.config.metatype.MetatypeXmlRegistry;
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-
-@Category(JUnitTests.class)
-public class MetatypeXmlRegistryTest {
-
-    MetatypeXmlRegistry metatypeXmlRegistry;
-
-    @Before
-    public void createInstanceOfClass() {
-        metatypeXmlRegistry = new MetatypeXmlRegistry();
-    }
-
-    @Test
-    public void newKapuaTocdTest() {
-        Assert.assertThat("Instance of KapuaTocd expected.", metatypeXmlRegistry.newKapuaTocd(), IsInstanceOf.instanceOf(KapuaTocd.class));
-    }
-
-    @Test
-    public void newKapuaTadTest() {
-        Assert.assertThat("Instance of KapuaTad expected.", metatypeXmlRegistry.newKapuaTad(), IsInstanceOf.instanceOf(KapuaTad.class));
-    }
-
-    @Test
-    public void newKapuaTiconTest() {
-        Assert.assertThat("Instance of KapuaTicon expected.", metatypeXmlRegistry.newKapuaTicon(), IsInstanceOf.instanceOf(KapuaTicon.class));
-    }
-
-    @Test
-    public void newKapuaToptionTest() {
-        Assert.assertThat("Instance of KapuaToption expected.", metatypeXmlRegistry.newKapuaToption(), IsInstanceOf.instanceOf(KapuaToption.class));
-    }
-
-    @Test
-    public void newKapuaTmetadataTest() {
-        Assert.assertThat("Instance of KapuaTmetadata expected.", metatypeXmlRegistry.newKapuaTmetadata(), IsInstanceOf.instanceOf(KapuaTmetadata.class));
-    }
-
-    @Test
-    public void newKapuaTdesignateTest() {
-        Assert.assertThat("Instance of KapuaTdesignate expected.", metatypeXmlRegistry.newKapuaTdesignate(), IsInstanceOf.instanceOf(KapuaTdesignate.class));
-    }
-
-    @Test
-    public void newKapuaTobjectTest() {
-        Assert.assertThat("Instance of KapuaTobject expected.", metatypeXmlRegistry.newKapuaTobject(), IsInstanceOf.instanceOf(KapuaTobject.class));
-    }
-}
diff --git a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/ServiceConfigurations.java b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/ServiceConfigurations.java
index 4ffe9bab87b..c5bbb4728e2 100644
--- a/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/ServiceConfigurations.java
+++ b/rest-api/resources/src/main/java/org/eclipse/kapua/app/api/resources/v1/resources/ServiceConfigurations.java
@@ -14,9 +14,7 @@
 
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -27,134 +25,58 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.KapuaIllegalArgumentException;
 import org.eclipse.kapua.app.api.core.model.ScopeId;
 import org.eclipse.kapua.app.api.core.resources.AbstractKapuaResource;
-import org.eclipse.kapua.commons.configuration.metatype.EmptyTocd;
-import org.eclipse.kapua.locator.KapuaLocator;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-import org.eclipse.kapua.service.KapuaService;
-import org.eclipse.kapua.service.account.Account;
-import org.eclipse.kapua.service.account.AccountService;
-import org.eclipse.kapua.service.config.KapuaConfigurableService;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationsFacade;
 import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
 import org.eclipse.kapua.service.config.ServiceConfiguration;
-import org.eclipse.kapua.service.config.ServiceConfigurationFactory;
 
 @Path("{scopeId}/serviceConfigurations")
 public class ServiceConfigurations extends AbstractKapuaResource {
 
-    //TODO: rewrite this to work directly with ServiceConfigurationManagers
-    public final KapuaLocator locator = KapuaLocator.getInstance();
-    @Inject
-    public AccountService accountService;
     @Inject
-    public ServiceConfigurationFactory serviceConfigurationFactory;
+    public ServiceConfigurationsFacade serviceConfigurationsFacade;
 
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public ServiceConfiguration get(@PathParam("scopeId") ScopeId scopeId) throws KapuaException {
-        List<KapuaConfigurableService> configurableServices = locator.getServices().stream().filter(service -> service instanceof KapuaConfigurableService).map(kapuaService -> (KapuaConfigurableService) kapuaService).collect(Collectors.toList());
-        ServiceConfiguration serviceConfiguration = serviceConfigurationFactory.newConfigurationInstance();
-        for (KapuaConfigurableService configurableService : configurableServices) {
-            KapuaTocd metadata = configurableService.getConfigMetadata(scopeId);
-            Map<String, Object> values = configurableService.getConfigValues(scopeId);
-            if (metadata != null && !(metadata instanceof EmptyTocd)) {
-                ServiceComponentConfiguration serviceComponentConfiguration = serviceConfigurationFactory.newComponentConfigurationInstance(metadata.getId());
-                serviceComponentConfiguration.setDefinition(metadata);
-                serviceComponentConfiguration.setName(metadata.getName());
-                serviceComponentConfiguration.setProperties(values);
-                serviceConfiguration.getComponentConfigurations().add(serviceComponentConfiguration);
-            }
-        }
-        Collections.sort(serviceConfiguration.getComponentConfigurations(), Comparator.comparing(ServiceComponentConfiguration::getName));
-
-        return serviceConfiguration;
+        final ServiceConfiguration res = serviceConfigurationsFacade.fetchAllConfigurations(scopeId);
+        Collections.sort(res.getComponentConfigurations(), Comparator.comparing(ServiceComponentConfiguration::getName));
+        return res;
     }
 
     @PUT
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+    @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     public Response update(
             @PathParam("scopeId") ScopeId scopeId,
             ServiceConfiguration serviceConfiguration
     ) throws KapuaException {
-        Account account = accountService.find(scopeId);
-        if (account == null) {
-            throw new KapuaEntityNotFoundException(Account.TYPE, scopeId);
-        }
-        for (ServiceComponentConfiguration serviceComponentConfiguration : serviceConfiguration.getComponentConfigurations()) {
-            Class<KapuaService> configurableServiceClass;
-            try {
-                configurableServiceClass =
-                    (Class<KapuaService>) Class.forName(serviceComponentConfiguration.getId()).asSubclass(KapuaService.class);
-            } catch (ClassNotFoundException e) {
-                throw new KapuaIllegalArgumentException("serviceConfiguration.componentConfiguration.id", serviceComponentConfiguration.getId());
-            }
-            if (!KapuaConfigurableService.class.isAssignableFrom(configurableServiceClass)) {
-                throw new KapuaIllegalArgumentException("serviceComponentConfiguration.id", serviceComponentConfiguration.getId());
-            }
-            KapuaConfigurableService configurableService = (KapuaConfigurableService) locator.getService(configurableServiceClass);
-            configurableService.setConfigValues(scopeId, account.getScopeId(), serviceComponentConfiguration.getProperties());
-        }
+        serviceConfigurationsFacade.update(scopeId, serviceConfiguration);
         return Response.noContent().build();
     }
 
     @GET
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Path("{serviceId}")
     public ServiceComponentConfiguration getComponent(
             @PathParam("scopeId") ScopeId scopeId,
             @PathParam("serviceId") String serviceId
     ) throws KapuaException {
-        Class<KapuaService> configurableServiceClass;
-        try {
-            configurableServiceClass = (Class<KapuaService>) Class.forName(serviceId).asSubclass(KapuaService.class);
-        } catch (ClassNotFoundException e) {
-            throw new KapuaIllegalArgumentException("service.pid", serviceId);
-        }
-        if (!KapuaConfigurableService.class.isAssignableFrom(configurableServiceClass)) {
-            throw new KapuaIllegalArgumentException("service.pid", serviceId);
-        }
-        KapuaConfigurableService configurableService = (KapuaConfigurableService) locator.getService(configurableServiceClass);
-        KapuaTocd metadata = configurableService.getConfigMetadata(scopeId);
-        Map<String, Object> values = configurableService.getConfigValues(scopeId);
-        if (metadata != null && !(metadata instanceof EmptyTocd)) {
-            ServiceComponentConfiguration serviceComponentConfiguration = serviceConfigurationFactory.newComponentConfigurationInstance(metadata.getId());
-            serviceComponentConfiguration.setDefinition(metadata);
-            serviceComponentConfiguration.setName(metadata.getName());
-            serviceComponentConfiguration.setProperties(values);
-            return serviceComponentConfiguration;
-        }
-        return null;
+        return serviceConfigurationsFacade.fetchConfiguration(scopeId, serviceId);
     }
 
     @PUT
-    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+    @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
+    @Consumes({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
     @Path("{serviceId}")
     public Response updateComponent(
             @PathParam("scopeId") ScopeId scopeId,
             @PathParam("serviceId") String serviceId,
             ServiceComponentConfiguration serviceComponentConfiguration
     ) throws KapuaException {
-        Account account = accountService.find(scopeId);
-        if (account == null) {
-            throw new KapuaEntityNotFoundException(Account.TYPE, scopeId);
-        }
-        Class<KapuaService> configurableServiceClass;
-        try {
-            configurableServiceClass = (Class<KapuaService>) Class.forName(serviceId).asSubclass(KapuaService.class);
-        } catch (ClassNotFoundException e) {
-            throw new KapuaIllegalArgumentException("service.pid", serviceId);
-        }
-        if (!KapuaConfigurableService.class.isAssignableFrom(configurableServiceClass)) {
-            throw new KapuaIllegalArgumentException("service.pid", serviceId);
-        }
-        KapuaConfigurableService configurableService = (KapuaConfigurableService) locator.getService(configurableServiceClass);
-        configurableService.setConfigValues(scopeId, account.getScopeId(), serviceComponentConfiguration.getProperties());
+        serviceConfigurationsFacade.update(scopeId, serviceId, serviceComponentConfiguration);
         return Response.noContent().build();
     }
 
diff --git a/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/AppModule.java b/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/AppModule.java
index 2590eb88367..37b459293ca 100644
--- a/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/AppModule.java
+++ b/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/AppModule.java
@@ -12,6 +12,8 @@
  *******************************************************************************/
 package org.eclipse.kapua.app.api.web;
 
+import java.util.Map;
+
 import javax.inject.Named;
 import javax.inject.Singleton;
 
@@ -21,6 +23,9 @@
 import org.eclipse.kapua.app.api.core.settings.KapuaApiCoreSetting;
 import org.eclipse.kapua.app.api.core.settings.KapuaApiCoreSettingKeys;
 import org.eclipse.kapua.app.api.resources.v1.resources.model.device.management.keystore.DeviceKeystoreCertificateInfo;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationsFacade;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationsFacadeImpl;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
 import org.eclipse.kapua.commons.core.JaxbClassProvider;
 import org.eclipse.kapua.commons.core.SimpleJaxbClassProvider;
@@ -29,6 +34,9 @@
 import org.eclipse.kapua.commons.util.xml.JAXBContextProviderImpl;
 import org.eclipse.kapua.commons.util.xml.XmlRootAnnotatedJaxbClassesScanner;
 import org.eclipse.kapua.locator.LocatorConfig;
+import org.eclipse.kapua.service.account.AccountService;
+import org.eclipse.kapua.service.authorization.AuthorizationService;
+import org.eclipse.kapua.service.authorization.permission.PermissionFactory;
 
 import com.google.inject.Provides;
 import com.google.inject.multibindings.ProvidesIntoSet;
@@ -48,6 +56,14 @@ protected void configureModule() {
         bind(JAXBContextProvider.class).to(JAXBContextProviderImpl.class).in(Singleton.class);
     }
 
+    @Provides
+    @Singleton
+    ServiceConfigurationsFacade serviceConfigurationsFacade(
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass, AuthorizationService authorizationService,
+            PermissionFactory permissionFactory, AccountService accountService) {
+        return new ServiceConfigurationsFacadeImpl(serviceConfigurationManagersByServiceClass, authorizationService, permissionFactory, accountService);
+    }
+
     @ProvidesIntoSet
     JaxbClassProvider jaxbClassesAutoDiscoverer(LocatorConfig locatorConfig) {
         return new XmlRootAnnotatedJaxbClassesScanner(locatorConfig);
diff --git a/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApiJAXBContextProvider.java b/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApiJAXBContextProvider.java
index 0203a1f1c31..2bcc3851d41 100644
--- a/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApiJAXBContextProvider.java
+++ b/rest-api/web/src/main/java/org/eclipse/kapua/app/api/web/RestApiJAXBContextProvider.java
@@ -148,7 +148,6 @@
 import org.eclipse.kapua.service.authorization.role.RoleXmlRegistry;
 import org.eclipse.kapua.service.config.ServiceComponentConfiguration;
 import org.eclipse.kapua.service.config.ServiceConfiguration;
-import org.eclipse.kapua.service.config.ServiceConfigurationXmlRegistry;
 import org.eclipse.kapua.service.datastore.model.ChannelInfo;
 import org.eclipse.kapua.service.datastore.model.ChannelInfoListResult;
 import org.eclipse.kapua.service.datastore.model.ClientInfo;
@@ -715,7 +714,6 @@ public JAXBContext getJAXBContext() throws KapuaException {
                     EventStoreXmlRegistry.class,
 
                     // Service Config
-                    ServiceConfigurationXmlRegistry.class,
                     ServiceConfiguration.class,
                     ServiceComponentConfiguration.class,
 
diff --git a/rest-api/web/src/main/resources/locator.xml b/rest-api/web/src/main/resources/locator.xml
index d89364f724d..6febf14e5a0 100644
--- a/rest-api/web/src/main/resources/locator.xml
+++ b/rest-api/web/src/main/resources/locator.xml
@@ -17,6 +17,7 @@
         <package>org.eclipse.kapua.app.api.web</package>
         <package>org.eclipse.kapua.app.api.core</package>
         <package>org.eclipse.kapua.plugin</package>
+        <package>org.eclipse.kapua.model</package>
         <package>org.eclipse.kapua.commons</package>
         <package>org.eclipse.kapua.job.engine.client</package>
         <package>org.eclipse.kapua.message</package>
diff --git a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountModule.java b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountModule.java
index 60b6481a0fa..53c2710e204 100644
--- a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountModule.java
+++ b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountModule.java
@@ -12,21 +12,16 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.account.internal;
 
+import java.util.Map;
+
 import javax.inject.Named;
 import javax.inject.Singleton;
 
 import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
-import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
-import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
-import org.eclipse.kapua.commons.configuration.RootUserTester;
-import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
-import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
 import org.eclipse.kapua.commons.core.ServiceModule;
 import org.eclipse.kapua.commons.event.ServiceEventHouseKeeperFactoryImpl;
-import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
 import org.eclipse.kapua.commons.jpa.EventStorer;
 import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
 import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
@@ -36,7 +31,6 @@
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordRepository;
 import org.eclipse.kapua.commons.service.event.store.internal.EventStoreServiceImpl;
 import org.eclipse.kapua.commons.service.internal.cache.NamedEntityCache;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.event.ServiceEventBus;
 import org.eclipse.kapua.event.ServiceEventBusException;
 import org.eclipse.kapua.model.domain.Actions;
@@ -118,7 +112,7 @@ AccountService accountService(AccountRepository accountRepository,
             AccountFactory accountFactory,
             PermissionFactory permissionFactory,
             AuthorizationService authorizationService,
-            @Named("AccountServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             EventStorer eventStorer,
             KapuaJpaTxManagerFactory jpaTxManagerFactory,
             AccountMapper accountMapper) {
@@ -127,39 +121,11 @@ AccountService accountService(AccountRepository accountRepository,
                 accountRepository,
                 permissionFactory,
                 authorizationService,
-                serviceConfigurationManager,
+                serviceConfigurationManagersByServiceClass.get(AccountService.class),
                 eventStorer,
                 accountMapper);
     }
 
-    @Provides
-    @Singleton
-    @Named("AccountServiceConfigurationManager")
-    ServiceConfigurationManager accountServiceConfigurationManager(
-            AccountFactory factory,
-            RootUserTester rootUserTester,
-            AccountRelativeFinder accountRelativeFinder,
-            AccountRepository accountRepository,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil
-    ) {
-        return new ServiceConfigurationManagerCachingWrapper(
-                new ResourceLimitedServiceConfigurationManagerImpl(
-                        AccountService.class.getName(),
-                        new CachingServiceConfigRepository(
-                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                        ),
-                        rootUserTester,
-                        accountRelativeFinder,
-                        new UsedEntitiesCounterImpl(
-                                factory,
-                                accountRepository),
-                        xmlUtil
-                ));
-    }
-
     @Provides
     @Singleton
     AccountRepository accountRepository(NamedCacheFactory namedCacheFactory, KapuaJpaRepositoryConfiguration jpaRepoConfig) {
diff --git a/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountServiceConfigurationManagerModule.java b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..871e0ffb6b9
--- /dev/null
+++ b/service/account/internal/src/main/java/org/eclipse/kapua/service/account/internal/AccountServiceConfigurationManagerModule.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.account.internal;
+
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
+import org.eclipse.kapua.commons.model.domains.Domains;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.service.account.AccountFactory;
+import org.eclipse.kapua.service.account.AccountRepository;
+import org.eclipse.kapua.service.account.AccountService;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the AccountService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class AccountServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(AccountService.class)
+    @Singleton
+    ServiceConfigurationManager accountServiceConfigurationManager(
+            KapuaJpaTxManagerFactory txManagerFactory,
+            AccountFactory factory,
+            RootUserTester rootUserTester,
+            AccountRelativeFinder accountRelativeFinder,
+            AccountRepository accountRepository,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil
+    ) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new ResourceLimitedServiceConfigurationManagerImpl(
+                        AccountService.class.getName(),
+                        Domains.ACCOUNT,
+                        txManagerFactory.create("kapua-account"),
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        rootUserTester,
+                        accountRelativeFinder,
+                        new UsedEntitiesCounterImpl(
+                                factory,
+                                accountRepository),
+                        new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)
+                ));
+    }
+}
diff --git a/service/account/test/src/test/java/org/eclipse/kapua/service/account/test/AccountLocatorConfiguration.java b/service/account/test/src/test/java/org/eclipse/kapua/service/account/test/AccountLocatorConfiguration.java
index 27e46090c29..ae892f2e608 100644
--- a/service/account/test/src/test/java/org/eclipse/kapua/service/account/test/AccountLocatorConfiguration.java
+++ b/service/account/test/src/test/java/org/eclipse/kapua/service/account/test/AccountLocatorConfiguration.java
@@ -14,11 +14,11 @@
 
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
 import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -28,6 +28,7 @@
 import org.eclipse.kapua.commons.metric.CommonsMetric;
 import org.eclipse.kapua.commons.metric.MetricsService;
 import org.eclipse.kapua.commons.metric.MetricsServiceImpl;
+import org.eclipse.kapua.commons.model.domains.Domains;
 import org.eclipse.kapua.commons.model.mappers.KapuaBaseMapperImpl;
 import org.eclipse.kapua.commons.model.query.QueryFactoryImpl;
 import org.eclipse.kapua.commons.service.event.store.internal.EventStoreRecordImplJpaRepository;
@@ -35,7 +36,6 @@
 import org.eclipse.kapua.commons.setting.system.SystemSetting;
 import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.locator.KapuaLocator;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.query.QueryFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.qa.common.TestJAXBContextProvider;
@@ -53,6 +53,7 @@
 import org.eclipse.kapua.service.authorization.domain.DomainRegistryService;
 import org.eclipse.kapua.service.authorization.permission.Permission;
 import org.eclipse.kapua.service.authorization.permission.PermissionFactory;
+import org.eclipse.kapua.storage.TxManager;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
@@ -105,9 +106,12 @@ protected void configure() {
                 bind(AuthorizationService.class).toInstance(mockedAuthorization);
                 // Inject mocked Permission Factory
                 final PermissionFactory mockPermissionFactory = Mockito.mock(PermissionFactory.class);
+                try {
+                    Mockito.when(mockedAuthorization.isPermitted(Mockito.any(Permission.class))).thenReturn(true);
+                } catch (KapuaException e) {
+                    throw new RuntimeException(e);
+                }
                 bind(PermissionFactory.class).toInstance(mockPermissionFactory);
-                // Set KapuaMetatypeFactory for Metatype configuration
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
                 // Inject actual account related services
                 //                final AccountEntityManagerFactory entityManagerFactory = AccountEntityManagerFactory.getInstance();
                 //                bind(AccountEntityManagerFactory.class).toInstance(entityManagerFactory);
@@ -117,20 +121,23 @@ protected void configure() {
                 final KapuaJpaRepositoryConfiguration jpaRepoConfig = new KapuaJpaRepositoryConfiguration();
                 final AccountRepository accountRepository = new AccountImplJpaRepository(jpaRepoConfig);
                 final AccountMapperImpl accountMapper = new AccountMapperImpl(new KapuaBaseMapperImpl());
+                final TxManager txManager = new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-account");
                 bind(AccountService.class).toInstance(new AccountServiceImpl(
-                        new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-account"),
+                        txManager,
                         new AccountImplJpaRepository(jpaRepoConfig),
                         mockPermissionFactory,
                         mockedAuthorization,
                         new ResourceLimitedServiceConfigurationManagerImpl(
                                 AccountService.class.getName(),
+                                Domains.ACCOUNT,
+                                txManager,
                                 new ServiceConfigImplJpaRepository(jpaRepoConfig),
                                 Mockito.mock(RootUserTester.class),
                                 Mockito.mock(AccountRelativeFinder.class),
                                 new UsedEntitiesCounterImpl(
                                         accountFactory,
                                         accountRepository),
-                                new XmlUtil(new TestJAXBContextProvider())
+                                new ResourceBasedServiceConfigurationMetadataProvider(new XmlUtil(new TestJAXBContextProvider()))
                         ),
                         new EventStorerImpl(new EventStoreRecordImplJpaRepository(jpaRepoConfig)),
                         accountMapper));
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/EmptyTocd.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/EmptyTocd.java
similarity index 88%
rename from commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/EmptyTocd.java
rename to service/api/src/main/java/org/eclipse/kapua/model/config/metatype/EmptyTocd.java
index 774c8460304..d403fafee0d 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/EmptyTocd.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/EmptyTocd.java
@@ -10,18 +10,15 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
 
-import org.eclipse.kapua.model.config.metatype.KapuaTad;
-import org.eclipse.kapua.model.config.metatype.KapuaTicon;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-
-import javax.xml.namespace.QName;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-public class EmptyTocd implements KapuaTocd {
+import javax.xml.namespace.QName;
+
+public class EmptyTocd extends KapuaTocd {
 
     private String id;
     private String name;
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaMetatypeFactory.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaMetatypeFactory.java
deleted file mode 100644
index b73b7828e78..00000000000
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaMetatypeFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.model.config.metatype;
-
-import org.eclipse.kapua.model.KapuaObjectFactory;
-
-/**
- * Kapua metatype objects factory service definition.<br>
- * This class provides, through locator and factory service, a factory for few objects types.
- *
- * @since 1.0
- */
-public interface KapuaMetatypeFactory extends KapuaObjectFactory {
-
-    /**
-     * Returns a {@link KapuaTocd} instance
-     *
-     * @return
-     */
-    KapuaTocd newKapuaTocd();
-
-    /**
-     * Returns a {@link KapuaTad} instance
-     *
-     * @return
-     */
-    KapuaTad newKapuaTad();
-
-    /**
-     * Returns a {@link KapuaTscalar} instance
-     *
-     * @param type
-     * @return
-     */
-    KapuaTscalar newKapuaTscalar(String type);
-
-    /**
-     * Returns a {@link KapuaToption} instance
-     *
-     * @return
-     */
-    KapuaToption newKapuaToption();
-
-    /**
-     * Returns a {@link KapuaTicon} instance
-     *
-     * @return
-     */
-    KapuaTicon newKapuaTicon();
-
-    /**
-     * Returns a {@link KapuaTmetadata} instance
-     *
-     * @return
-     */
-    KapuaTmetadata newKapuaTmetadata();
-
-    /**
-     * Returns a {@link KapuaTdesignate} instance
-     *
-     * @return
-     */
-    KapuaTdesignate newKapuaTdesignate();
-
-    /**
-     * Returns a {@link KapuaTobject} instance
-     *
-     * @return
-     */
-    KapuaTobject newKapuaTobject();
-
-}
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTad.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTad.java
index 907a6cf5ab9..097f0ac1d26 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTad.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTad.java
@@ -12,18 +12,20 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
-import javax.xml.bind.annotation.XmlAnyElement;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -61,16 +63,27 @@
 @XmlType(name = "Tad", propOrder = {
         "option",
         "any"
-}, factoryClass = MetatypeXmlRegistry.class, factoryMethod = "newKapuaTad")
-public interface KapuaTad {
+})
+public class KapuaTad {
+
+    protected List<KapuaToption> option;
+    protected List<Object> any;
+    protected String name;
+    protected String description;
+    protected String id;
+    protected KapuaTscalar type;
+    protected Integer cardinality;
+    protected String min;
+    protected String max;
+    protected String defaultValue;
+    protected Boolean required;
+    private Map<QName, String> otherAttributes = new HashMap<>();
 
     /**
      * Gets the value of the option property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the option property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the option property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -80,17 +93,38 @@ public interface KapuaTad {
      * <p>
      */
     @XmlElement(name = "Option", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
-    List<KapuaToption> getOption();
+    public List<KapuaToption> getOption() {
+        if (option == null) {
+            option = new ArrayList<>();
+        }
+        return new ArrayList<>(this.option);
+    }
 
-    void setOption(List<KapuaToption> option);
+    /**
+     * Add an option to the internal list
+     *
+     * @param option
+     */
+    public void addOption(KapuaToption option) {
+        if (this.option == null) {
+            this.option = new ArrayList<>();
+        }
+
+        this.option.add(option);
+    }
+
+    public void setOption(List<KapuaToption> option) {
+        this.option = new ArrayList<>();
+        for (KapuaToption singleOption : option) {
+            this.option.add(singleOption);
+        }
+    }
 
     /**
      * Gets the value of the any property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the any property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -99,10 +133,16 @@ public interface KapuaTad {
      * </pre>
      * <p>
      */
-    @XmlAnyElement(lax = true)
-    List<Object> getAny();
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
 
-    void setAny(List<Object> any);
+    public void setAny(List<Object> any) {
+        this.any = any;
+    }
 
     /**
      * Gets the value of the name property.
@@ -110,14 +150,19 @@ public interface KapuaTad {
      * @return possible object is {@link String}
      */
     @XmlAttribute(name = "name")
-    String getName();
+    public String getName() {
+        return name;
+    }
 
     /**
      * Sets the value of the name property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setName(String value);
+    public void setName(String value) {
+        this.name = value;
+    }
 
     /**
      * Gets the value of the description property.
@@ -125,14 +170,19 @@ public interface KapuaTad {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "description")
-    String getDescription();
+    public String getDescription() {
+        return description;
+    }
 
     /**
      * Sets the value of the description property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setDescription(String value);
+    public void setDescription(String value) {
+        this.description = value;
+    }
 
     /**
      * Gets the value of the id property.
@@ -140,14 +190,19 @@ public interface KapuaTad {
      * @return possible object is {@link String}
      */
     @XmlAttribute(name = "id", required = true)
-    String getId();
+    public String getId() {
+        return id;
+    }
 
     /**
      * Sets the value of the id property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setId(String value);
+    public void setId(String value) {
+        this.id = value;
+    }
 
     /**
      * Gets the value of the type property.
@@ -156,14 +211,19 @@ public interface KapuaTad {
      */
     @XmlAttribute(name = "type", required = true)
     @XmlJavaTypeAdapter(KapuaTscalarAdapter.class)
-    KapuaTscalar getType();
+    public KapuaTscalar getType() {
+        return type;
+    }
 
     /**
      * Sets the value of the type property.
      *
-     * @param value allowed object is {@link KapuaTscalar }
+     * @param value
+     *         allowed object is {@link KapuaTscalar }
      */
-    void setType(KapuaTscalar value);
+    public void setType(KapuaTscalar value) {
+        this.type = value;
+    }
 
     /**
      * Gets the value of the cardinality property.
@@ -171,14 +231,23 @@ public interface KapuaTad {
      * @return possible object is {@link Integer }
      */
     @XmlAttribute(name = "cardinality")
-    Integer getCardinality();
+    public Integer getCardinality() {
+        if (cardinality == null) {
+            return 0;
+        } else {
+            return cardinality;
+        }
+    }
 
     /**
      * Sets the value of the cardinality property.
      *
-     * @param value allowed object is {@link Integer }
+     * @param value
+     *         allowed object is {@link Integer }
      */
-    void setCardinality(Integer value);
+    public void setCardinality(Integer value) {
+        this.cardinality = value;
+    }
 
     /**
      * Gets the value of the min property.
@@ -186,14 +255,19 @@ public interface KapuaTad {
      * @return possible object is  {@link String }
      */
     @XmlAttribute(name = "min")
-    String getMin();
+    public String getMin() {
+        return min;
+    }
 
     /**
      * Sets the value of the min property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setMin(String value);
+    public void setMin(String value) {
+        this.min = value;
+    }
 
     /**
      * Gets the value of the max property.
@@ -201,14 +275,19 @@ public interface KapuaTad {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "max")
-    String getMax();
+    public String getMax() {
+        return max;
+    }
 
     /**
      * Sets the value of the max property.
      *
-     * @param value allowed object is  {@link String }
+     * @param value
+     *         allowed object is  {@link String }
      */
-    void setMax(String value);
+    public void setMax(String value) {
+        this.max = value;
+    }
 
     /**
      * Gets the value of the default property.
@@ -216,14 +295,19 @@ public interface KapuaTad {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "default")
-    String getDefault();
+    public String getDefault() {
+        return defaultValue;
+    }
 
     /**
      * Sets the value of the default property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setDefault(String value);
+    public void setDefault(String value) {
+        this.defaultValue = value;
+    }
 
     /**
      * Gets the value of the required property.
@@ -231,27 +315,41 @@ public interface KapuaTad {
      * @return possible object is {@link Boolean }
      */
     @XmlAttribute(name = "required")
-    Boolean isRequired();
+    public Boolean isRequired() {
+        if (required == null) {
+            return true;
+        } else {
+            return required;
+        }
+    }
 
     /**
      * Sets the value of the required property.
      *
-     * @param value allowed object is  {@link Boolean }
+     * @param value
+     *         allowed object is  {@link Boolean }
      */
-    void setRequired(Boolean value);
+    public void setRequired(Boolean value) {
+        this.required = value;
+    }
 
     /**
      * Gets a map that contains attributes that aren't bound to any typed property on this class.
      * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
+     * the map is keyed by the name of the attribute and the value is the string value of the attribute.
      * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
+     * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
      *
      * @return always non-null
      */
     @XmlAnyAttribute
-    Map<QName, String> getOtherAttributes();
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
+
+    public void putOtherAttribute(QName key, String value) {
+        getOtherAttributes().put(key,
+                value);
+    }
 
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTattribute.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTattribute.java
index 89f114d8564..2cab59a667d 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTattribute.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTattribute.java
@@ -12,10 +12,21 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
-import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
 /**
  * <p>
  * Java class for Tattribute complex type.
@@ -40,15 +51,30 @@
  *
  * @since 1.0
  */
-public interface KapuaTattribute {
+@XmlRootElement(name = "Attribute", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Tattribute", propOrder = {
+        "value",
+        "any"
+})
+public class KapuaTattribute {
+
+    @XmlElement(name = "Value", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
+    protected List<String> value;
+    @XmlAnyElement(lax = true)
+    protected List<Object> any;
+    @XmlAttribute(name = "adref", required = true)
+    protected String adref;
+    @XmlAttribute(name = "content")
+    protected String content;
+    @XmlAnyAttribute
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
      * Gets the value of the value property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the value property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the value property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -57,15 +83,18 @@ public interface KapuaTattribute {
      * </pre>
      * <p>
      */
-    List<String> getValue();
+    public List<String> getValue() {
+        if (value == null) {
+            value = new ArrayList<String>();
+        }
+        return this.value;
+    }
 
     /**
      * Gets the value of the any property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the any property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -74,46 +103,61 @@ public interface KapuaTattribute {
      * </pre>
      * <p>
      */
-    List<Object> getAny();
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
 
     /**
      * Gets the value of the adref property.
      *
      * @return possible object is {@link String }
      */
-    String getAdref();
+    public String getAdref() {
+        return adref;
+    }
 
     /**
      * Sets the value of the adref property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setAdref(String value);
+    public void setAdref(String value) {
+        this.adref = value;
+    }
 
     /**
      * Gets the value of the content property.
      *
      * @return possible object is {@link String }
      */
-    String getContent();
+    public String getContent() {
+        return content;
+    }
 
     /**
      * Sets the value of the content property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setContent(String value);
+    public void setContent(String value) {
+        this.content = value;
+    }
 
     /**
      * Gets a map that contains attributes that aren't bound to any typed property on this class.
      * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
+     * the map is keyed by the name of the attribute and the value is the string value of the attribute.
      * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
+     * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
      *
      * @return always non-null
      */
-    Map<QName, String> getOtherAttributes();
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTdesignate.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTdesignate.java
index df2ecfbeca7..1f3bef877e4 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTdesignate.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTdesignate.java
@@ -12,6 +12,11 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
@@ -21,8 +26,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -60,8 +63,17 @@
         "optional",
         "merge",
         "otherAttributes"
-}, factoryClass = MetatypeXmlRegistry.class, factoryMethod = "newKapuaTdesignate")
-public interface KapuaTdesignate {
+})
+public class KapuaTdesignate {
+
+    protected KapuaTobject object;
+    protected List<Object> any;
+    protected String pid;
+    protected String factoryPid;
+    protected String bundle;
+    protected Boolean optional;
+    protected Boolean merge;
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
      * Gets the value of the object property.
@@ -69,22 +81,25 @@ public interface KapuaTdesignate {
      * @return possible object is {@link KapuaTobject }
      */
     @XmlElement(name = "Object", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0", required = true)
-    KapuaTobject getObject();
+    public KapuaTobject getObject() {
+        return object;
+    }
 
     /**
      * Sets the value of the object property.
      *
-     * @param value allowed object is   {@link KapuaTobject }
+     * @param value
+     *         allowed object is   {@link KapuaTobject }
      */
-    void setObject(KapuaTobject value);
+    public void setObject(KapuaTobject value) {
+        this.object = value;
+    }
 
     /**
      * Gets the value of the any property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the any property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -94,9 +109,16 @@ public interface KapuaTdesignate {
      * <p>
      */
     @XmlAnyElement(lax = true)
-    List<Object> getAny();
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
 
-    void setAny(List<Object> any);
+    public void setAny(List<Object> any) {
+        this.any = any;
+    }
 
     /**
      * Gets the value of the pid property.
@@ -104,14 +126,19 @@ public interface KapuaTdesignate {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "pid")
-    String getPid();
+    public String getPid() {
+        return pid;
+    }
 
     /**
      * Sets the value of the pid property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setPid(String value);
+    public void setPid(String value) {
+        this.pid = value;
+    }
 
     /**
      * Gets the value of the factoryPid property.
@@ -119,14 +146,19 @@ public interface KapuaTdesignate {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "factoryPid")
-    String getFactoryPid();
+    public String getFactoryPid() {
+        return factoryPid;
+    }
 
     /**
      * Sets the value of the factoryPid property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setFactoryPid(String value);
+    public void setFactoryPid(String value) {
+        this.factoryPid = value;
+    }
 
     /**
      * Gets the value of the bundle property.
@@ -134,14 +166,19 @@ public interface KapuaTdesignate {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "bundle")
-    String getBundle();
+    public String getBundle() {
+        return bundle;
+    }
 
     /**
      * Sets the value of the bundle property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setBundle(String value);
+    public void setBundle(String value) {
+        this.bundle = value;
+    }
 
     /**
      * Gets the value of the optional property.
@@ -149,14 +186,23 @@ public interface KapuaTdesignate {
      * @return possible object is {@link Boolean }
      */
     @XmlAttribute(name = "optional")
-    Boolean isOptional();
+    public Boolean isOptional() {
+        if (optional == null) {
+            return false;
+        } else {
+            return optional;
+        }
+    }
 
     /**
      * Sets the value of the optional property.
      *
-     * @param value allowed object is {@link Boolean }
+     * @param value
+     *         allowed object is {@link Boolean }
      */
-    void setOptional(Boolean value);
+    public void setOptional(Boolean value) {
+        this.optional = value;
+    }
 
     /**
      * Gets the value of the merge property.
@@ -164,29 +210,40 @@ public interface KapuaTdesignate {
      * @return possible object is {@link Boolean }
      */
     @XmlAttribute(name = "merge")
-    Boolean isMerge();
+    public Boolean isMerge() {
+        if (merge == null) {
+            return false;
+        } else {
+            return merge;
+        }
+    }
 
     /**
      * Sets the value of the merge property.
      *
-     * @param value allowed object is {@link Boolean }
+     * @param value
+     *         allowed object is {@link Boolean }
      */
-    void setMerge(Boolean value);
+    public void setMerge(Boolean value) {
+        this.merge = value;
+    }
 
     /**
      * Gets a map that contains attributes that aren't bound to any typed property on this class.
      * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
+     * the map is keyed by the name of the attribute and the value is the string value of the attribute.
      * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
+     * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
      *
      * @return always non-null
      */
     @XmlAnyAttribute
-    Map<QName, String> getOtherAttributes();
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
 
-    void setOtherAttributes(Map<QName, String> otherAttributes);
+    public void setOtherAttributes(Map<QName, String> otherAttributes) {
+        this.otherAttributes = otherAttributes;
+    }
 
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTicon.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTicon.java
index 2e167445701..1fe2ad0ffcc 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTicon.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTicon.java
@@ -12,6 +12,12 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
@@ -21,9 +27,6 @@
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -50,16 +53,19 @@
  */
 @XmlRootElement(name = "Icon", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
 @XmlAccessorType(XmlAccessType.PROPERTY)
-@XmlType(name = "Icon", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0", factoryClass = MetatypeXmlRegistry.class, factoryMethod = "newKapuaTicon")
-public interface KapuaTicon {
+@XmlType(name = "Icon", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
+public class KapuaTicon {
+
+    protected List<Object> any;
+    protected String resource;
+    protected BigInteger size;
+    private Map<QName, String> otherAttributes = new HashMap<>();
 
     /**
      * Gets the value of the any property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the any property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -68,7 +74,12 @@ public interface KapuaTicon {
      * </pre>
      */
     @XmlAnyElement(lax = true)
-    List<Object> getAny();
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<>();
+        }
+        return this.any;
+    }
 
     /**
      * Gets the value of the resource property.
@@ -76,14 +87,19 @@ public interface KapuaTicon {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "resource", required = true)
-    String getResource();
+    public String getResource() {
+        return resource;
+    }
 
     /**
      * Sets the value of the resource property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setResource(String value);
+    public void setResource(String value) {
+        this.resource = value;
+    }
 
     /**
      * Gets the value of the size property.
@@ -92,27 +108,32 @@ public interface KapuaTicon {
      */
     @XmlAttribute(name = "size", required = true)
     @XmlSchemaType(name = "positiveInteger")
-    BigInteger getSize();
+    public BigInteger getSize() {
+        return size;
+    }
 
     /**
      * Sets the value of the size property.
      *
-     * @param value allowed object is {@link BigInteger }
+     * @param value
+     *         allowed object is {@link BigInteger }
      */
-    void setSize(BigInteger value);
+    public void setSize(BigInteger value) {
+        this.size = value;
+    }
 
     /**
      * Gets a map that contains attributes that aren't bound to any typed property on this class.
      * <p></p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
+     * the map is keyed by the name of the attribute and the value is the string value of the attribute.
      * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
+     * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
      *
      * @return always non-null
      */
     @XmlAnyAttribute
-    Map<QName, String> getOtherAttributes();
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
 
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTmetadata.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTmetadata.java
index ee57799d1db..6ef6f8bcd15 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTmetadata.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTmetadata.java
@@ -12,6 +12,11 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
@@ -21,8 +26,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -54,16 +57,20 @@
         "any",
         "localization",
         "otherAttributes"
-}, factoryClass = MetatypeXmlRegistry.class, factoryMethod = "newKapuaTmetadata")
-public interface KapuaTmetadata {
+})
+public class KapuaTmetadata {
+
+    protected List<KapuaTocd> ocd;
+    protected List<KapuaTdesignate> designate;
+    protected List<Object> any;
+    protected String localization;
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
      * Gets the value of the ocd property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the ocd property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the ocd property.
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
@@ -71,17 +78,22 @@ public interface KapuaTmetadata {
      * </pre>
      */
     @XmlElement(name = "OCD", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
-    List<KapuaTocd> getOCD();
+    public List<KapuaTocd> getOCD() {
+        if (ocd == null) {
+            ocd = new ArrayList<>();
+        }
+        return new ArrayList<>(this.ocd);
+    }
 
-    void setOCD(List<KapuaTocd> ocd);
+    public void setOCD(List<KapuaTocd> ocd) {
+        this.ocd = ocd;
+    }
 
     /**
      * Gets the value of the designate property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the designate property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the designate property.
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
@@ -89,17 +101,22 @@ public interface KapuaTmetadata {
      * </pre>
      */
     @XmlElement(name = "Designate", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
-    List<KapuaTdesignate> getDesignate();
+    public List<KapuaTdesignate> getDesignate() {
+        if (designate == null) {
+            designate = new ArrayList<>();
+        }
+        return new ArrayList<>(this.designate);
+    }
 
-    void setDesignate(List<KapuaTdesignate> designate);
+    public void setDesignate(List<KapuaTdesignate> designate) {
+        this.designate = designate;
+    }
 
     /**
      * Gets the value of the any property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the any property.
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
@@ -107,9 +124,16 @@ public interface KapuaTmetadata {
      * </pre>
      */
     @XmlAnyElement(lax = true)
-    List<Object> getAny();
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
 
-    void setAny(List<Object> any);
+    public void setAny(List<Object> any) {
+        this.any = any;
+    }
 
     /**
      * Gets the value of the localization property.
@@ -117,28 +141,35 @@ public interface KapuaTmetadata {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "localization")
-    String getLocalization();
+    public String getLocalization() {
+        return localization;
+    }
 
     /**
      * Sets the value of the localization property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setLocalization(String value);
+    public void setLocalization(String value) {
+        this.localization = value;
+    }
 
     /**
      * Gets a map that contains attributes that aren't bound to any typed property on this class.
      * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
+     * the map is keyed by the name of the attribute and the value is the string value of the attribute.
      * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
+     * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
      *
      * @return always non-null
      */
     @XmlAnyAttribute
-    Map<QName, String> getOtherAttributes();
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
 
-    void setOtherAttributes(Map<QName, String> otherAttributes);
+    public void setOtherAttributes(Map<QName, String> otherAttributes) {
+        this.otherAttributes = otherAttributes;
+    }
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTobject.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTobject.java
index 2b86ef6b5e3..316add12964 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTobject.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTobject.java
@@ -12,6 +12,11 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
@@ -21,8 +26,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -50,16 +53,19 @@
 @XmlType(name = "Tobject", propOrder = {
         "attribute",
         "any"
-}, factoryClass = MetatypeXmlRegistry.class, factoryMethod = "newKapuaTobject")
-public interface KapuaTobject {
+})
+public class KapuaTobject {
+
+    protected List<KapuaTattribute> attribute;
+    protected List<Object> any;
+    protected String ocdref;
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
      * Gets the value of the attribute property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attribute property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the attribute property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -68,15 +74,18 @@ public interface KapuaTobject {
      * </pre>
      */
     @XmlElement(name = "Attribute", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
-    List<KapuaTattribute> getAttribute();
+    public List<KapuaTattribute> getAttribute() {
+        if (attribute == null) {
+            attribute = new ArrayList<>();
+        }
+        return new ArrayList<>(this.attribute);
+    }
 
     /**
      * Gets the value of the any property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the any property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -86,7 +95,12 @@ public interface KapuaTobject {
      * <p>
      */
     @XmlAnyElement(lax = true)
-    List<Object> getAny();
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
 
     /**
      * Gets the value of the ocdref property.
@@ -94,27 +108,32 @@ public interface KapuaTobject {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "ocdref", required = true)
-    String getOcdref();
+    public String getOcdref() {
+        return ocdref;
+    }
 
     /**
      * Sets the value of the ocdref property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setOcdref(String value);
+    public void setOcdref(String value) {
+        this.ocdref = value;
+    }
 
     /**
      * Gets a map that contains attributes that aren't bound to any typed property on this class.
      * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
+     * the map is keyed by the name of the attribute and the value is the string value of the attribute.
      * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
+     * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
      *
      * @return always non-null
      */
     @XmlAnyAttribute
-    Map<QName, String> getOtherAttributes();
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
 
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTocd.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTocd.java
index a45353d6040..908d912a5c0 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTocd.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTocd.java
@@ -12,6 +12,11 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
@@ -21,8 +26,8 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
-import java.util.List;
-import java.util.Map;
+
+import org.w3c.dom.Element;
 
 /**
  * <p>
@@ -52,35 +57,53 @@
  */
 @XmlRootElement(name = "OCD", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
 @XmlAccessorType(XmlAccessType.PROPERTY)
-@XmlType(factoryClass = MetatypeXmlRegistry.class, factoryMethod = "newKapuaTocd")
-public interface KapuaTocd {
+@XmlType
+public class KapuaTocd {
+
+    protected List<KapuaTad> ad;
+    protected List<KapuaTicon> icon;
+    protected List<Object> any;
+    protected String name;
+    protected String description;
+    protected String id;
+    private Map<QName, String> otherAttributes = new HashMap<>();
 
     /**
      * Gets the value of the ad property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the ad property.
+     * <p>
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the ad property.
+     * <p>
      * <p>
      * For example, to add a new item, do as follows:
-     *
+     * <p>
      * <pre>
      * getAD().add(newItem);
      * </pre>
+     * <p>
+     * <p>
+     * <p>
+     * Objects of the following type(s) are allowed in the list {@link KapuaTad }
      */
     @XmlElement(name = "AD", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0", required = true)
-    List<KapuaTad> getAD();
 
-    void setAD(List<KapuaTad> icon);
+    public List<KapuaTad> getAD() {
+        if (ad == null) {
+            ad = new ArrayList<>();
+        }
+        return this.ad;
+    }
+
+    public void setAD(List<KapuaTad> ad) {
+        this.ad = ad;
+    }
 
     /**
      * Gets the value of the icon property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the icon property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the icon property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -89,28 +112,77 @@ public interface KapuaTocd {
      * </pre>
      */
     @XmlElement(name = "Icon", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
-    List<KapuaTicon> getIcon();
 
-    void setIcon(List<KapuaTicon> icon);
+    /**
+     * Gets the value of the icon property.
+     * <p>
+     * <p>
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the icon property.
+     * <p>
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <p>
+     * <pre>
+     * getIcon().add(newItem);
+     * </pre>
+     * <p>
+     * <p>
+     * <p>
+     * Objects of the following type(s) are allowed in the list {@link TiconImpl }
+     */
+    public List<KapuaTicon> getIcon() {
+        if (icon == null) {
+            icon = new ArrayList<>();
+        }
+        return this.icon;
+    }
+
+    public void setIcon(List<KapuaTicon> icon) {
+        this.icon = icon;
+    }
+
+    /**
+     * Add icon to the internal list
+     *
+     * @param icon
+     */
+    public void addIcon(KapuaTicon icon) {
+        if (this.icon == null) {
+            this.icon = new ArrayList<>();
+        }
+        this.icon.add(icon);
+    }
 
     /**
      * Gets the value of the any property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * <p>
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the any property.
+     * <p>
      * <p>
      * For example, to add a new item, do as follows:
-     *
+     * <p>
      * <pre>
      * getAny().add(newItem);
      * </pre>
+     * <p>
+     * <p>
+     * <p>
+     * Objects of the following type(s) are allowed in the list {@link Element } {@link Object }
      */
     @XmlAnyElement(lax = true)
-    List<Object> getAny();
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<>();
+        }
+        return this.any;
+    }
 
-    void setAny(List<Object> any);
+    public void setAny(List<Object> any) {
+        this.any = any;
+    }
 
     /**
      * Gets the value of the name property.
@@ -118,14 +190,19 @@ public interface KapuaTocd {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "name", required = true)
-    String getName();
+    public String getName() {
+        return name;
+    }
 
     /**
      * Sets the value of the name property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setName(String value);
+    public void setName(String value) {
+        this.name = value;
+    }
 
     /**
      * Gets the value of the description property.
@@ -133,14 +210,19 @@ public interface KapuaTocd {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "description")
-    String getDescription();
+    public String getDescription() {
+        return description;
+    }
 
     /**
      * Sets the value of the description property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setDescription(String value);
+    public void setDescription(String value) {
+        this.description = value;
+    }
 
     /**
      * Gets the value of the id property.
@@ -148,29 +230,69 @@ public interface KapuaTocd {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "id", required = true)
-    String getId();
+    public String getId() {
+        return id;
+    }
 
     /**
      * Sets the value of the id property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setId(String value);
+    public void setId(String value) {
+        this.id = value;
+    }
 
     /**
      * Gets a map that contains attributes that aren't bound to any typed property on this class.
      * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
+     * the map is keyed by the name of the attribute and the value is the string value of the attribute.
      * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
+     * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
      *
      * @return always non-null
      */
     @XmlAnyAttribute
-    Map<QName, String> getOtherAttributes();
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
 
-    void setOtherAttributes(Map<QName, String> otherAttributes);
+    public void setOtherAttributes(Map<QName, String> otherAttributes) {
+        this.otherAttributes = otherAttributes;
+    }
+
+    /**
+     * Insert a generic value for the provided QName
+     *
+     * @param key
+     * @param value
+     */
+    public void putOtherAttribute(QName key, String value) {
+        getOtherAttributes().put(key,
+                value);
+    }
+
+    /**
+     * Add Tad to the internal list
+     *
+     * @param ad
+     */
+    public void addAD(KapuaTad ad) {
+        if (this.ad == null) {
+            this.ad = new ArrayList<>();
+        }
+
+        this.ad.add(ad);
+    }
+
+    /**
+     * Add a generic object to the internal list
+     *
+     * @param object
+     */
+    public void addAny(Object object) {
+        getAny().add(object);
+    }
 
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaToption.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaToption.java
index 1e1dfa46b1d..f5753a019da 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaToption.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaToption.java
@@ -12,6 +12,11 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAnyAttribute;
@@ -20,8 +25,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -50,16 +53,19 @@
 @XmlAccessorType(XmlAccessType.PROPERTY)
 @XmlType(name = "Toption", propOrder = {
         "any"
-}, factoryClass = MetatypeXmlRegistry.class, factoryMethod = "newKapuaToption")
-public interface KapuaToption {
+})
+public class KapuaToption {
+
+    protected List<Object> any;
+    protected String label;
+    protected String value;
+    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
      * Gets the value of the any property.
      * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
+     * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+     * not a <CODE>set</CODE> method for the any property.
      * <p>
      * For example, to add a new item, do as follows:
      *
@@ -68,7 +74,12 @@ public interface KapuaToption {
      * </pre>
      */
     @XmlAnyElement(lax = true)
-    List<Object> getAny();
+    public List<Object> getAny() {
+        if (any == null) {
+            any = new ArrayList<Object>();
+        }
+        return this.any;
+    }
 
     /**
      * Gets the value of the label property.
@@ -76,14 +87,19 @@ public interface KapuaToption {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "label", required = true)
-    String getLabel();
+    public String getLabel() {
+        return label;
+    }
 
     /**
      * Sets the value of the label property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setLabel(String value);
+    public void setLabel(String value) {
+        this.label = value;
+    }
 
     /**
      * Gets the value of the value property.
@@ -91,27 +107,32 @@ public interface KapuaToption {
      * @return possible object is {@link String }
      */
     @XmlAttribute(name = "value", required = true)
-    String getValue();
+    public String getValue() {
+        return value;
+    }
 
     /**
      * Sets the value of the value property.
      *
-     * @param value allowed object is {@link String }
+     * @param value
+     *         allowed object is {@link String }
      */
-    void setValue(String value);
+    public void setValue(String value) {
+        this.value = value;
+    }
 
     /**
      * Gets a map that contains attributes that aren't bound to any typed property on this class.
      * <p>
-     * the map is keyed by the name of the attribute and
-     * the value is the string value of the attribute.
+     * the map is keyed by the name of the attribute and the value is the string value of the attribute.
      * <p>
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
+     * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
      *
      * @return always non-null
      */
     @XmlAnyAttribute
-    Map<QName, String> getOtherAttributes();
+    public Map<QName, String> getOtherAttributes() {
+        return otherAttributes;
+    }
 
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTscalar.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTscalar.java
index a45976db268..8e6d1b5b09b 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTscalar.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTscalar.java
@@ -12,6 +12,13 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
 /**
  * <p>
  * Java class for Tscalar complex type.
@@ -37,12 +44,63 @@
  *
  * @since 1.0
  */
-public interface KapuaTscalar {
+@XmlEnum
+@XmlType(name = "Tscalar")
+@XmlRootElement(name = "OCD", namespace = "http://www.osgi.org/xmlns/metatype/v1.2.0")
+@XmlAccessorType(XmlAccessType.PROPERTY)
+public enum KapuaTscalar {
+    @XmlEnumValue("String")
+    STRING("String"),
+    @XmlEnumValue("Long")
+    LONG("Long"),
+    @XmlEnumValue("Double")
+    DOUBLE("Double"),
+    @XmlEnumValue("Float")
+    FLOAT("Float"),
+    @XmlEnumValue("Integer")
+    INTEGER("Integer"),
+    @XmlEnumValue("Byte")
+    BYTE("Byte"),
+    @XmlEnumValue("Char")
+    CHAR("Char"),
+    @XmlEnumValue("Boolean")
+    BOOLEAN("Boolean"),
+    @XmlEnumValue("Short")
+    SHORT("Short"),
+    @XmlEnumValue("Password")
+    PASSWORD("Password");
+    private final String value;
+
+    /**
+     * Constructor
+     *
+     * @param v
+     */
+    KapuaTscalar(String v) {
+        value = v;
+    }
 
     /**
      * Gets the value property.
      *
      * @return possible object is {@link String } with restricted values
      */
-    String value();
+    public String value() {
+        return value;
+    }
+
+    /**
+     * Convert a String value to a {@link KapuaTscalar}
+     *
+     * @param v
+     * @return
+     */
+    public static KapuaTscalar fromValue(String v) {
+        for (KapuaTscalar c : KapuaTscalar.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTscalarAdapter.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTscalarAdapter.java
index cdffdd98311..ab553b457f2 100644
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTscalarAdapter.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/KapuaTscalarAdapter.java
@@ -12,14 +12,10 @@
  *******************************************************************************/
 package org.eclipse.kapua.model.config.metatype;
 
-import org.eclipse.kapua.locator.KapuaLocator;
-
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 public class KapuaTscalarAdapter extends XmlAdapter<String, KapuaTscalar> {
 
-    private final KapuaMetatypeFactory kapuaMetatypeFactory = KapuaLocator.getInstance().getFactory(KapuaMetatypeFactory.class);
-
     @Override
     public String marshal(KapuaTscalar v) throws Exception {
         return v.value();
@@ -27,6 +23,6 @@ public String marshal(KapuaTscalar v) throws Exception {
 
     @Override
     public KapuaTscalar unmarshal(String v) throws Exception {
-        return kapuaMetatypeFactory.newKapuaTscalar(v);
+        return KapuaTscalar.fromValue(v);
     }
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/MetatypeXmlRegistry.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/MetatypeXmlRegistry.java
deleted file mode 100644
index e8d43cc9394..00000000000
--- a/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/MetatypeXmlRegistry.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.model.config.metatype;
-
-import org.eclipse.kapua.locator.KapuaLocator;
-
-/**
- * Xml factory class.<br>
- * This class provides, through locator and factory service, a factory for few objects types.
- *
- * @since 1.0
- */
-public class MetatypeXmlRegistry {
-
-    /**
-     * Locator instance
-     */
-    private final KapuaLocator locator = KapuaLocator.getInstance();
-
-    /**
-     * Meta type factory instance
-     */
-    private final KapuaMetatypeFactory factory = locator.getFactory(KapuaMetatypeFactory.class);
-
-    /**
-     * Returns a {@link KapuaTocd} instance
-     *
-     * @return
-     */
-    public KapuaTocd newKapuaTocd() {
-        return factory.newKapuaTocd();
-    }
-
-    /**
-     * Returns a {@link KapuaTad} instance
-     *
-     * @return
-     */
-    public KapuaTad newKapuaTad() {
-        return factory.newKapuaTad();
-    }
-
-    /**
-     * Returns a {@link KapuaTicon} instance
-     *
-     * @return
-     */
-    public KapuaTicon newKapuaTicon() {
-        return factory.newKapuaTicon();
-    }
-
-    /**
-     * Returns a {@link KapuaToption} instance
-     *
-     * @return
-     */
-    public KapuaToption newKapuaToption() {
-        return factory.newKapuaToption();
-    }
-
-    /**
-     * Returns a {@link KapuaTmetadata} instance
-     *
-     * @return
-     */
-    public KapuaTmetadata newKapuaTmetadata() {
-        return factory.newKapuaTmetadata();
-    }
-
-    /**
-     * Returns a {@link KapuaTdesignate} instance
-     *
-     * @return
-     */
-    public KapuaTdesignate newKapuaTdesignate() {
-        return factory.newKapuaTdesignate();
-    }
-
-    /**
-     * Returns a {@link KapuaTobject} instance
-     *
-     * @return
-     */
-    public KapuaTobject newKapuaTobject() {
-        return factory.newKapuaTobject();
-    }
-}
diff --git a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/Password.java b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/Password.java
similarity index 94%
rename from commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/Password.java
rename to service/api/src/main/java/org/eclipse/kapua/model/config/metatype/Password.java
index 565e39f11c5..ce11be1ce71 100644
--- a/commons/src/main/java/org/eclipse/kapua/commons/configuration/metatype/Password.java
+++ b/service/api/src/main/java/org/eclipse/kapua/model/config/metatype/Password.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
 
 /**
  * Contains password used by devices connecting to Kapua.
diff --git a/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceComponentConfiguration.java b/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceComponentConfiguration.java
index 517a2809a48..09757444ca0 100644
--- a/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceComponentConfiguration.java
+++ b/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceComponentConfiguration.java
@@ -12,6 +12,8 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.config;
 
+import java.util.Map;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -19,7 +21,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.Map;
 
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 
@@ -35,8 +36,28 @@
         "name",
         "definition",
         "properties"
-}, factoryClass = ServiceConfigurationXmlRegistry.class, factoryMethod = "newComponentConfiguration")
-public interface ServiceComponentConfiguration {
+})
+public class ServiceComponentConfiguration {
+
+    private String id;
+    private String name;
+    private KapuaTocd definition;
+    private Map<String, Object> properties;
+
+    /**
+     * Constructor
+     */
+    public ServiceComponentConfiguration() {
+    }
+
+    /**
+     * Constructor
+     *
+     * @param id
+     */
+    public ServiceComponentConfiguration(String id) {
+        this.id = id;
+    }
 
     /**
      * Get service configuration component identifier
@@ -44,14 +65,18 @@ public interface ServiceComponentConfiguration {
      * @return
      */
     @XmlElement(name = "id")
-    String getId();
+    public String getId() {
+        return id;
+    }
 
     /**
      * Set service configuration component identifier
      *
      * @param id
      */
-    void setId(String id);
+    public void setId(String id) {
+        this.id = id;
+    }
 
     /**
      * Get service configuration component name
@@ -59,14 +84,18 @@ public interface ServiceComponentConfiguration {
      * @return
      */
     @XmlAttribute(name = "name")
-    String getName();
+    public String getName() {
+        return name;
+    }
 
     /**
      * Set service configuration component name
      *
-     * @param unescapedComponentName
+     * @param name
      */
-    void setName(String unescapedComponentName);
+    public void setName(String name) {
+        this.name = name;
+    }
 
     /**
      * Get service configuration component definition
@@ -74,14 +103,18 @@ public interface ServiceComponentConfiguration {
      * @return
      */
     @XmlElement(name = "definition")
-    KapuaTocd getDefinition();
+    public KapuaTocd getDefinition() {
+        return definition;
+    }
 
     /**
      * Set service configuration component definition
      *
      * @param definition
      */
-    void setDefinition(KapuaTocd definition);
+    public void setDefinition(KapuaTocd definition) {
+        this.definition = definition;
+    }
 
     /**
      * Get service configuration component properties
@@ -90,12 +123,16 @@ public interface ServiceComponentConfiguration {
      */
     @XmlElement(name = "properties")
     @XmlJavaTypeAdapter(ServiceXmlConfigPropertiesAdapter.class)
-    Map<String, Object> getProperties();
+    public Map<String, Object> getProperties() {
+        return properties;
+    }
 
     /**
      * Set service configuration component properties
      *
      * @param properties
      */
-    void setProperties(Map<String, Object> properties);
+    public void setProperties(Map<String, Object> properties) {
+        this.properties = properties;
+    }
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfiguration.java b/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfiguration.java
index 36211ee2f6c..93875165cb1 100644
--- a/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfiguration.java
+++ b/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfiguration.java
@@ -12,12 +12,14 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-import java.util.List;
 
 import org.eclipse.kapua.KapuaSerializable;
 
@@ -28,8 +30,16 @@
  */
 @XmlRootElement(name = "serviceConfigurations")
 @XmlAccessorType(XmlAccessType.PROPERTY)
-@XmlType(factoryClass = ServiceConfigurationXmlRegistry.class, factoryMethod = "newConfiguration")
-public interface ServiceConfiguration extends KapuaSerializable {
+@XmlType
+public class ServiceConfiguration implements KapuaSerializable {
+
+    private static final long serialVersionUID = -2167999497954676423L;
+
+    private List<ServiceComponentConfiguration> configurations;
+
+    public ServiceConfiguration() {
+        configurations = new ArrayList<>();
+    }
 
     /**
      * Get the service component configuration list
@@ -37,5 +47,7 @@ public interface ServiceConfiguration extends KapuaSerializable {
      * @return
      */
     @XmlElement(name = "configuration")
-    List<ServiceComponentConfiguration> getComponentConfigurations();
+    public List<ServiceComponentConfiguration> getComponentConfigurations() {
+        return configurations;
+    }
 }
diff --git a/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfigurationFactory.java b/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfigurationFactory.java
deleted file mode 100644
index fd4e2ca9ef7..00000000000
--- a/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfigurationFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.service.config;
-
-import org.eclipse.kapua.model.KapuaObjectFactory;
-
-/**
- * Service configuration entity service factory definition.
- *
- * @since 1.0
- */
-public interface ServiceConfigurationFactory extends KapuaObjectFactory {
-
-    /**
-     * Creates a new {@link ServiceComponentConfiguration} using the given component configuration identifier
-     *
-     * @return
-     */
-    ServiceComponentConfiguration newComponentConfigurationInstance(String componentConfigurationId);
-
-    /**
-     * Creates a new {@link ServiceConfiguration}
-     *
-     * @return
-     */
-    ServiceConfiguration newConfigurationInstance();
-}
diff --git a/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfigurationXmlRegistry.java b/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfigurationXmlRegistry.java
deleted file mode 100644
index a9fa15fd39e..00000000000
--- a/service/api/src/main/java/org/eclipse/kapua/service/config/ServiceConfigurationXmlRegistry.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019, 2022 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Eurotech - initial API and implementation
- *******************************************************************************/
-package org.eclipse.kapua.service.config;
-
-import org.eclipse.kapua.locator.KapuaLocator;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-/**
- * {@link ServiceConfiguration} xml factory class
- *
- * @since 1.0
- */
-@XmlRegistry
-public class ServiceConfigurationXmlRegistry {
-
-    private final ServiceConfigurationFactory serviceConfigurationFactory = KapuaLocator.getInstance().getFactory(ServiceConfigurationFactory.class);
-
-    /**
-     * Creates a new service configuration
-     *
-     * @return
-     */
-    public ServiceConfiguration newConfiguration() {
-        return serviceConfigurationFactory.newConfigurationInstance();
-    }
-
-    /**
-     * Creates a new service component configuration
-     *
-     * @return
-     */
-    public ServiceComponentConfiguration newComponentConfiguration() {
-        return serviceConfigurationFactory.newComponentConfigurationInstance(null);
-    }
-}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/EmptyTocdTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/EmptyTocdTest.java
similarity index 85%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/EmptyTocdTest.java
rename to service/api/src/test/java/org/eclipse/kapua/model/config/metatype/EmptyTocdTest.java
index 17474cce689..ca901683cf5 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/EmptyTocdTest.java
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/EmptyTocdTest.java
@@ -10,7 +10,10 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
+
+import java.util.Arrays;
+import java.util.List;
 
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
@@ -18,10 +21,6 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.util.Arrays;
-import java.util.List;
-
-
 @Category(JUnitTests.class)
 public class EmptyTocdTest {
 
@@ -55,7 +54,7 @@ public void setNameToNullTest() {
 
     @Test
     public void setAndGetNameTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularName", "regular Name", "49", "regularName49", "REGULAR", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularName", "regular Name", "49", "regularName49", "REGULAR", "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             emptyTocd.setName(value);
             Assert.assertTrue(emptyTocd.getName().contains(value));
@@ -70,7 +69,7 @@ public void setAndGetIdToNullValueTest() {
 
     @Test
     public void setAndGetIdTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regular Id", "49", "regularId49", "ID", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regular Id", "49", "regularId49", "ID", "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             emptyTocd.setId(value);
             Assert.assertTrue(emptyTocd.getId().contains(value));
@@ -97,7 +96,7 @@ public void setDescriptionToNullTest() {
 
     @Test
     public void setAndGetDescriptionTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regular Description", "49", "regularDescription49", "DESCRIPTION", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regular Description", "49", "regularDescription49", "DESCRIPTION", "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             emptyTocd.setDescription(value);
             Assert.assertNull(emptyTocd.getDescription());
diff --git a/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTadTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTadTest.java
new file mode 100644
index 00000000000..2c608bfe3b2
--- /dev/null
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTadTest.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.model.config.metatype;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.eclipse.kapua.qa.markers.junit.JUnitTests;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(JUnitTests.class)
+public class KapuaTadTest {
+
+    @Before
+    public void createInstanceOfClasses() {
+
+        kapuaTad = new KapuaTad();
+        toption = new KapuaToption();
+        toption2 = new KapuaToption();
+    }
+
+    KapuaTad kapuaTad;
+    KapuaToption toption;
+    KapuaToption toption2;
+
+    @Test
+    public void getOptionToNullTest() {
+        kapuaTad.getOption();
+        Assert.assertTrue(kapuaTad.getOption().isEmpty());
+    }
+
+    @Test
+    public void setAndGetOptionRegularTest() {
+        List<KapuaToption> option = new ArrayList<>();
+        option.add(toption);
+        kapuaTad.setOption(option);
+        Assert.assertEquals("tadImpl.option", option, kapuaTad.getOption());
+    }
+
+    @Test
+    public void addAndGetOptionTest() {
+        List<KapuaToption> options = new ArrayList<>();
+        options.add(toption);
+        options.add(toption2);
+
+        kapuaTad.addOption(toption);
+        kapuaTad.addOption(toption2);
+
+        Assert.assertEquals("tadImpl.option", options, kapuaTad.getOption());
+    }
+
+    @Test
+    public void getAnyTest() {
+        Assert.assertTrue(kapuaTad.getAny().isEmpty());
+    }
+
+    @Test
+    public void setAndGetAnyTest() {
+        List<Object> options = new ArrayList<>();
+        options.add(toption);
+        options.add(toption2);
+        options.add(null);
+        kapuaTad.setAny(options);
+        Assert.assertEquals("tadImpl.option", options, kapuaTad.getAny());
+    }
+
+    @Test
+    public void setAndGetNameToNullTest() {
+        kapuaTad.setName(null);
+        Assert.assertNull(kapuaTad.getName());
+    }
+
+    @Test
+    public void setAndGetNameTest() {
+        String[] permittedValues = { "", "regularName", "49", "regular Name", "regular name with spaces", "!@#$%&*()_+/->,<", "NAME", "name123" };
+        for (String value : permittedValues) {
+            kapuaTad.setName(value);
+            Assert.assertTrue(kapuaTad.getName().contains(value));
+        }
+    }
+
+    @Test
+    public void setAndGetDescriptionToNullTest() {
+        kapuaTad.setDescription(null);
+        Assert.assertNull(kapuaTad.getDescription());
+    }
+
+    @Test
+    public void setAndGetDescriptionTest() {
+        String[] permittedValues = { "", "regularDescription", "49", "regular Description", "regular description with spaces", "!@#$%&*()_+/->,<", "DESCRIPTION", "description123" };
+        for (String value : permittedValues) {
+            kapuaTad.setDescription(value);
+            Assert.assertTrue(kapuaTad.getDescription().contains(value));
+        }
+    }
+
+    @Test
+    public void setAndGetIdToNullTest() {
+        kapuaTad.setId(null);
+        Assert.assertNull(kapuaTad.getId());
+    }
+
+    @Test
+    public void setAndGetIdTest() {
+        String[] permittedValues = { "", "regularId", "49", "regular Id", "regular id with spaces", "!@#$%&*()_+/->,<", "ID", "id123" };
+        for (String value : permittedValues) {
+            kapuaTad.setId(value);
+            Assert.assertTrue(kapuaTad.getId().contains(value));
+        }
+    }
+
+    @Test
+    public void setAndGetTypeStringTest() {
+        kapuaTad.setType(KapuaTscalar.STRING);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.STRING, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypeLongTest() {
+        kapuaTad.setType(KapuaTscalar.LONG);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.LONG, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypeDoubleTest() {
+        kapuaTad.setType(KapuaTscalar.DOUBLE);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.DOUBLE, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypeFloatTest() {
+        kapuaTad.setType(KapuaTscalar.FLOAT);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.FLOAT, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypeIntegerTest() {
+        kapuaTad.setType(KapuaTscalar.INTEGER);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.INTEGER, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypeByteTest() {
+        kapuaTad.setType(KapuaTscalar.BYTE);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.BYTE, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypeCharTest() {
+        kapuaTad.setType(KapuaTscalar.CHAR);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.CHAR, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypeBooleanTest() {
+        kapuaTad.setType(KapuaTscalar.BOOLEAN);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.BOOLEAN, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypeShortTest() {
+        kapuaTad.setType(KapuaTscalar.SHORT);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.SHORT, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetTypePasswordTest() {
+        kapuaTad.setType(KapuaTscalar.PASSWORD);
+        Assert.assertEquals("tadImpl.type", KapuaTscalar.PASSWORD, kapuaTad.getType());
+    }
+
+    @Test
+    public void setAndGetCardinalityToNullTest() {
+        kapuaTad.setCardinality(null);
+        Assert.assertEquals("tadImpl.cardinality", 0, (int) kapuaTad.getCardinality());
+    }
+
+    @Test
+    public void setAndGetCardinalityRegularTest() {
+        int[] permittedValues = { 1, 10, 100, 500, -2147483648, 2147483647, 0 };
+        for (int value : permittedValues) {
+            kapuaTad.setCardinality(value);
+            Assert.assertEquals("tadImpl.cardinality", Integer.valueOf(value), kapuaTad.getCardinality());
+        }
+    }
+
+    @Test
+    public void setAndGetMinToNullTest() {
+        kapuaTad.setMin(null);
+        Assert.assertNull(kapuaTad.getMin());
+    }
+
+    @Test
+    public void setAndGetMinTest() {
+        String[] permittedValues = { "", "regularMin", "49", "regular Min", "regular min with spaces", "!@#$%&*()_+/->,<", "MIN", "min123" };
+        for (String value : permittedValues) {
+            kapuaTad.setMin(value);
+            Assert.assertTrue(kapuaTad.getMin().contains(value));
+        }
+    }
+
+    @Test
+    public void setAndGetMaxToNullTest() {
+        kapuaTad.setMax(null);
+        Assert.assertNull(kapuaTad.getMax());
+    }
+
+    @Test
+    public void setAndGetMaxTest() {
+        String[] permittedValues = { "", "regularMax", "49", "regular Max", "regular max with spaces", "!@#$%&*()_+/->,<", "MAX", "max123" };
+        for (String value : permittedValues) {
+            kapuaTad.setMax(value);
+            Assert.assertTrue(kapuaTad.getMax().contains(value));
+        }
+    }
+
+    @Test
+    public void setAndGetDefaultToNullTest() {
+        kapuaTad.setDefault(null);
+        Assert.assertNull(kapuaTad.getDefault());
+    }
+
+    @Test
+    public void setAndGetDefaultTest() {
+        String[] permittedValues = { "", "regularDefault", "49", "regular Default", "regular default with spaces", "!@#$%&*()_+/->,<", "DEFAULT", "default123" };
+        for (String value : permittedValues) {
+            kapuaTad.setDefault(value);
+            Assert.assertTrue(kapuaTad.getDefault().contains(value));
+        }
+    }
+
+    @Test
+    public void setIsRequiredToNullTest() {
+        kapuaTad.setRequired(null);
+        Assert.assertTrue(kapuaTad.isRequired());
+    }
+
+    @Test
+    public void setAndIsRequiredTest() {
+        boolean[] permittedValues = { false, true };
+        for (boolean value : permittedValues) {
+            kapuaTad.setRequired(value);
+            Assert.assertEquals("tadImpl.value", value, kapuaTad.isRequired());
+        }
+    }
+
+    @Test
+    public void putAndGetOtherAttributeTest() {
+        Map<QName, String> expectedValues = new HashMap<>();
+
+        expectedValues.put(QName.valueOf("1"), "a");
+        expectedValues.put(QName.valueOf("2"), "b");
+        expectedValues.put(QName.valueOf("3"), "c");
+
+        kapuaTad.putOtherAttribute(QName.valueOf("1"), "a");
+        kapuaTad.putOtherAttribute(QName.valueOf("2"), "b");
+        kapuaTad.putOtherAttribute(QName.valueOf("3"), "c");
+
+        Assert.assertEquals("tadImpl.attributes", expectedValues, kapuaTad.getOtherAttributes());
+    }
+
+    @Test
+    public void getOtherAttributeTest() {
+        Assert.assertTrue(kapuaTad.getOtherAttributes().isEmpty());
+    }
+}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TattributeImplTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTattributeTest.java
similarity index 76%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TattributeImplTest.java
rename to service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTattributeTest.java
index 936a1119b0b..131abfa8c44 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TattributeImplTest.java
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTattributeTest.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
 
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
@@ -18,17 +18,16 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-
 @Category(JUnitTests.class)
-public class TattributeImplTest {
+public class KapuaTattributeTest {
 
     @Before
     public void createInstanceOfClass() {
 
-        tattributeImpl = new TattributeImpl();
+        tattributeImpl = new KapuaTattribute();
     }
 
-    TattributeImpl tattributeImpl;
+    KapuaTattribute tattributeImpl;
 
     @Test
     public void getValueTest() {
@@ -48,7 +47,7 @@ public void setAndGetAdrefToNullTest() {
 
     @Test
     public void setAndGetAdrefTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularAdref", "regular Adref", "49", "regularAdref49", "ADREF", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularAdref", "regular Adref", "49", "regularAdref49", "ADREF", "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             tattributeImpl.setAdref(value);
             Assert.assertTrue(tattributeImpl.getAdref().contains(value));
@@ -63,7 +62,8 @@ public void setAndGetContentToNullTest() {
 
     @Test
     public void setAndGetContentTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularContent", "regular Content", "49", "regularContent49", "CONTENT", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularContent", "regular Content", "49", "regularContent49", "CONTENT",
+                "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             tattributeImpl.setContent(value);
             Assert.assertTrue(tattributeImpl.getContent().contains(value));
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TdesignateImplTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTdesignateTest.java
similarity index 80%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TdesignateImplTest.java
rename to service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTdesignateTest.java
index b239249089c..0ee4d41d154 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TdesignateImplTest.java
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTdesignateTest.java
@@ -10,7 +10,9 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
+
+import java.util.ArrayList;
 
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
@@ -18,19 +20,16 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.util.ArrayList;
-
-
 @Category(JUnitTests.class)
-public class TdesignateImplTest {
+public class KapuaTdesignateTest {
 
     @Before
     public void createInstanceOfClass() {
 
-        tdesignate = new TdesignateImpl();
+        tdesignate = new KapuaTdesignate();
     }
 
-    TdesignateImpl tdesignate;
+    KapuaTdesignate tdesignate;
 
     @Test
     public void setAndGetObjectToNullTest() {
@@ -40,7 +39,7 @@ public void setAndGetObjectToNullTest() {
 
     @Test
     public void setAndGetObjectTest() {
-        TobjectImpl tobject = new TobjectImpl();
+        KapuaTobject tobject = new KapuaTobject();
         tdesignate.setObject(tobject);
         Assert.assertEquals("tdesignate.object", tobject, tdesignate.getObject());
     }
@@ -65,7 +64,7 @@ public void setAndGetAnyTest() {
         objectArrayList.add(11122.33);
         objectArrayList.add(true);
         objectArrayList.add(false);
-        objectArrayList.add(new ToptionImpl());
+        objectArrayList.add(new KapuaToption());
 
         tdesignate.setAny(objectArrayList);
         Assert.assertEquals("tdesignate.any", objectArrayList, tdesignate.getAny());
@@ -79,7 +78,7 @@ public void setAndGetPidToNullTest() {
 
     @Test
     public void setAndGetPidTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularPid", "regular Pid", "49", "regularPid49", "PID", "2 46 465494 13564612 0009 09004 9684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularPid", "regular Pid", "49", "regularPid49", "PID", "2 46 465494 13564612 0009 09004 9684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             tdesignate.setPid(value);
             Assert.assertTrue(tdesignate.getPid().contains(value));
@@ -94,7 +93,7 @@ public void setAndGetFactoryPidToNullTest() {
 
     @Test
     public void setAndGetFactoryPidTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularPid", "regular Pid", "49", "regularPid49", "PID", "2 46 465494 13564612 0009 09004 9684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularPid", "regular Pid", "49", "regularPid49", "PID", "2 46 465494 13564612 0009 09004 9684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             tdesignate.setFactoryPid(value);
             Assert.assertTrue(tdesignate.getFactoryPid().contains(value));
@@ -109,7 +108,8 @@ public void setAndGetBundleToNullTest() {
 
     @Test
     public void setAndGetBundleTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularBundle", "regular Bundle", "49", "regularBundle49", "BUNDLE", "2 46 465494 13564612 0009 09004 9684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularBundle", "regular Bundle", "49", "regularBundle49", "BUNDLE",
+                "2 46 465494 13564612 0009 09004 9684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             tdesignate.setBundle(value);
             Assert.assertTrue(tdesignate.getBundle().contains(value));
@@ -124,7 +124,7 @@ public void setAndGetOptionalToNullTest() {
 
     @Test
     public void setAndIsOptionalTest() {
-        boolean[] permittedValues = {false, true};
+        boolean[] permittedValues = { false, true };
         for (boolean value : permittedValues) {
             tdesignate.setOptional(value);
             Assert.assertEquals("tdesignate.isOptional", value, tdesignate.isOptional());
@@ -139,7 +139,7 @@ public void setAndGetMergeToNullTest() {
 
     @Test
     public void setAndIsMergeTest() {
-        boolean[] permittedValues = {false, true};
+        boolean[] permittedValues = { false, true };
         for (boolean value : permittedValues) {
             tdesignate.setMerge(value);
             Assert.assertEquals("tdesignate.isMerge", value, tdesignate.isMerge());
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TiconImplTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTiconTest.java
similarity index 85%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TiconImplTest.java
rename to service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTiconTest.java
index 1ebc734d38e..be81b085155 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TiconImplTest.java
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTiconTest.java
@@ -10,7 +10,9 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
+
+import java.math.BigInteger;
 
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
@@ -18,19 +20,17 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.math.BigInteger;
-
-
 @Category(JUnitTests.class)
-public class TiconImplTest {
+public class KapuaTiconTest {
 
     @Before
     public void createInstanceOfClass() {
 
-        ticonImpl = new TiconImpl();
+        ticonImpl = new KapuaTicon();
     }
 
-    TiconImpl ticonImpl;
+    KapuaTicon ticonImpl;
+
     @Test
     public void getAnyTest() {
         Assert.assertTrue(ticonImpl.getAny().isEmpty());
@@ -44,7 +44,7 @@ public void setAndGetResourcesToNullTest() {
 
     @Test
     public void setAndGetResourcesTest() {
-        String[] permittedValues = {"", "regularResources", "49", "regular Resources", "regular esources with spaces", "!@#$%&*()_+/->,<", "RESOURCES", "resources123"};
+        String[] permittedValues = { "", "regularResources", "49", "regular Resources", "regular esources with spaces", "!@#$%&*()_+/->,<", "RESOURCES", "resources123" };
         for (String value : permittedValues) {
             ticonImpl.setResource(value);
             Assert.assertTrue(ticonImpl.getResource().contains(value));
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TmetadataImplTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTmetadataTest.java
similarity index 82%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TmetadataImplTest.java
rename to service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTmetadataTest.java
index d2bafa6b3ba..1af97f2ad92 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TmetadataImplTest.java
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTmetadataTest.java
@@ -10,38 +10,36 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
 
-import org.eclipse.kapua.model.config.metatype.KapuaTdesignate;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
+import org.eclipse.kapua.qa.markers.junit.JUnitTests;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 @Category(JUnitTests.class)
-public class TmetadataImplTest {
+public class KapuaTmetadataTest {
 
     @Before
     public void createInstanceOfClasses() {
         emptyTocd = new EmptyTocd();
-        tocd = new TocdImpl();
-        tmetadata = new TmetadataImpl();
-        tdesignate = new TdesignateImpl();
+        tocd = new KapuaTocd();
+        tmetadata = new KapuaTmetadata();
+        tdesignate = new KapuaTdesignate();
     }
 
     EmptyTocd emptyTocd;
-    TocdImpl tocd;
-    TmetadataImpl tmetadata;
-    TdesignateImpl tdesignate;
+    KapuaTocd tocd;
+    KapuaTmetadata tmetadata;
+    KapuaTdesignate tdesignate;
 
     @Test
     public void getOCDTest() {
@@ -92,7 +90,8 @@ public void setAndGetLocalizationToNullTest() {
 
     @Test
     public void setAndGetLocalizationTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularLocalization", "regular Localization", "49", "regularLocalization49", "LOCALIZATION", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularLocalization", "regular Localization", "49", "regularLocalization49", "LOCALIZATION",
+                "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             tmetadata.setLocalization(value);
             Assert.assertTrue(tmetadata.getLocalization().contains(value));
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TobjectImplTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTobjectTest.java
similarity index 80%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TobjectImplTest.java
rename to service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTobjectTest.java
index 00464a9ac19..54ace97a6f5 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/TobjectImplTest.java
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTobjectTest.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
 
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
@@ -18,16 +18,15 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-
 @Category(JUnitTests.class)
-public class TobjectImplTest {
+public class KapuaTobjectTest {
 
     @Before
     public void createInstanceOfClasses() {
-        tobjectImpl = new TobjectImpl();
+        tobjectImpl = new KapuaTobject();
     }
 
-    TobjectImpl tobjectImpl;
+    KapuaTobject tobjectImpl;
 
     @Test
     public void getAttributeTest() {
@@ -47,7 +46,8 @@ public void setAndGetOcdrefToNullTest() {
 
     @Test
     public void setAndGetOcdrefTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularOcdref", "regular Ocdref", "49", "regularOcdref49", "OCDREF", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularOcdref", "regular Ocdref", "49", "regularOcdref49", "OCDREF",
+                "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             tobjectImpl.setOcdref(value);
             Assert.assertTrue(tobjectImpl.getOcdref().contains(value));
diff --git a/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTocdTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTocdTest.java
new file mode 100644
index 00000000000..5d65a8e45dc
--- /dev/null
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaTocdTest.java
@@ -0,0 +1,188 @@
+/*******************************************************************************
+ * Copyright (c) 2020, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.model.config.metatype;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.eclipse.kapua.qa.markers.junit.JUnitTests;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(JUnitTests.class)
+public class KapuaTocdTest {
+
+    @Before
+    public void createInstanceOfClasses() {
+
+        kapuaTocd = new KapuaTocd();
+        kapuaTad1 = new KapuaTad();
+        kapuaTad2 = new KapuaTad();
+        kapuaTad3 = new KapuaTad();
+        ticon = new KapuaTicon();
+        ticon2 = new KapuaTicon();
+    }
+
+    KapuaTocd kapuaTocd;
+    KapuaTad kapuaTad1;
+    KapuaTad kapuaTad2;
+    KapuaTad kapuaTad3;
+    KapuaTicon ticon;
+    KapuaTicon ticon2;
+
+    @Test
+    public void getADTest() {
+        Assert.assertTrue(kapuaTocd.getAD().isEmpty());
+    }
+
+    @Test
+    public void setAndGetADTest() {
+        List<KapuaTad> expectedValues = new ArrayList<>();
+        expectedValues.add(kapuaTad1);
+        kapuaTocd.setAD(expectedValues);
+        Assert.assertEquals("tocdImpl.ad", expectedValues, kapuaTocd.getAD());
+    }
+
+    @Test
+    public void addAndGetADTest() {
+        kapuaTocd.addAD(kapuaTad3);
+        kapuaTocd.addAD(kapuaTad2);
+        kapuaTocd.getAD();
+        Assert.assertTrue(kapuaTocd.getAD().contains(kapuaTad3) && kapuaTocd.getAD().contains(kapuaTad2));
+    }
+
+    @Test
+    public void getIconTest() {
+        Assert.assertTrue(kapuaTocd.getIcon().isEmpty());
+    }
+
+    @Test
+    public void setAndGetIconTest() {
+        List<KapuaTicon> listOfObj = new ArrayList<>();
+        listOfObj.add(ticon);
+        kapuaTocd.setIcon(listOfObj);
+        Assert.assertEquals("tocdImpl.icon", listOfObj, kapuaTocd.getIcon());
+    }
+
+    @Test
+    public void addAndGetIconTest() {
+        kapuaTocd.addIcon(ticon);
+        kapuaTocd.addIcon(ticon2);
+        kapuaTocd.getIcon();
+        Assert.assertTrue(kapuaTocd.getIcon().contains(ticon) && kapuaTocd.getIcon().contains(ticon2));
+    }
+
+    @Test
+    public void getAnyTest() {
+        Assert.assertTrue(kapuaTocd.getAny().isEmpty());
+    }
+
+    @Test
+    public void setAndGetAnyTest() {
+        List<Object> options = new ArrayList<>();
+        options.add(ticon);
+        options.add(ticon2);
+        kapuaTocd.setAny(options);
+        Assert.assertEquals("tocdImpl.any", options, kapuaTocd.getAny());
+    }
+
+    @Test
+    public void addAndGetAnyTest() {
+        kapuaTocd.addAny(ticon);
+        kapuaTocd.addAny(ticon2);
+        Assert.assertTrue(kapuaTocd.getAny().contains(ticon) && kapuaTocd.getAny().contains(ticon2));
+    }
+
+    @Test
+    public void setAndGetNameToNullTest() {
+        kapuaTocd.setName(null);
+        Assert.assertNull(kapuaTocd.getName());
+    }
+
+    @Test
+    public void setAndGetNameTest() {
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularName", "regular Name", "49", "regularName49", "REGULAR", "246465494135646120009090049684646496468456468496846464968496844" };
+        for (String value : permittedValues) {
+            kapuaTocd.setName(value);
+            Assert.assertTrue(kapuaTocd.getName().contains(value));
+        }
+    }
+
+    @Test
+    public void setAndGetDescriptionToNullTest() {
+        kapuaTocd.setDescription(null);
+        Assert.assertNull(kapuaTocd.getDescription());
+    }
+
+    @Test
+    public void setAndGetDescriptionTest() {
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regular Description", "49", "regularDescription49", "DESCRIPTION", "246465494135646120009090049684646496468456468496846464968496844" };
+        for (String value : permittedValues) {
+            kapuaTocd.setDescription(value);
+            Assert.assertTrue(kapuaTocd.getDescription().contains(value));
+        }
+    }
+
+    @Test
+    public void setAndGetIdToNullTest() {
+        kapuaTocd.setId(null);
+        Assert.assertNull(kapuaTocd.getId());
+    }
+
+    @Test
+    public void setAndGetIdTest() {
+        String[] permittedValues = { "", "regularId", "49", "regular Id", "regular id with spaces", "!@#$%&*()_+/->,<", "ID", "id123" };
+        for (String value : permittedValues) {
+            kapuaTocd.setId(value);
+            Assert.assertTrue(kapuaTocd.getId().contains(value));
+        }
+    }
+
+    @Test
+    public void putAndGetOtherAttributeTest() {
+        Map<QName, String> expectedValues = new HashMap<>();
+
+        expectedValues.put(QName.valueOf("1"), "a");
+        expectedValues.put(QName.valueOf("2"), "b");
+        expectedValues.put(QName.valueOf("3"), "c");
+
+        kapuaTocd.putOtherAttribute(QName.valueOf("1"), "a");
+        kapuaTocd.putOtherAttribute(QName.valueOf("2"), "b");
+        kapuaTocd.putOtherAttribute(QName.valueOf("3"), "c");
+
+        Assert.assertEquals("tocdImpl.otherAttributes", expectedValues, kapuaTocd.getOtherAttributes());
+    }
+
+    @Test
+    public void getOtherAttributeTest() {
+        Assert.assertTrue(kapuaTocd.getOtherAttributes().isEmpty());
+    }
+
+    @Test
+    public void testSetAndGetOtherAttribute() {
+        Map<QName, String> values = new HashMap<>();
+
+        values.put(QName.valueOf("1"), "a");
+        values.put(QName.valueOf("2"), "b");
+        values.put(QName.valueOf("3"), "c");
+
+        kapuaTocd.setOtherAttributes(values);
+        Assert.assertEquals("tocdImpl.otherAttributes", values, kapuaTocd.getOtherAttributes());
+    }
+}
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/ToptionImplTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaToptionTest.java
similarity index 76%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/ToptionImplTest.java
rename to service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaToptionTest.java
index a356e292cb8..fe008696b4a 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/ToptionImplTest.java
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/KapuaToptionTest.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
 
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
@@ -18,17 +18,16 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-
 @Category(JUnitTests.class)
-public class ToptionImplTest {
+public class KapuaToptionTest {
 
     @Before
     public void createInstanceOfClass() {
 
-        toption = new ToptionImpl();
+        toption = new KapuaToption();
     }
 
-    ToptionImpl toption;
+    KapuaToption toption;
 
     @Test
     public void getAnyWithNullTest() {
@@ -43,7 +42,7 @@ public void setAndGetLabelToNullTest() {
 
     @Test
     public void setAndGetLabelTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularLabel", "regular Label", "49", "regularLabel49", "LABEL", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularLabel", "regular Label", "49", "regularLabel49", "LABEL", "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             toption.setLabel(value);
             Assert.assertTrue(toption.getLabel().contains(value));
@@ -58,7 +57,7 @@ public void setAndGetValueToNullTest() {
 
     @Test
     public void setAndGetValueTest() {
-        String[] permittedValues = {"", "!@#$%^^&**(-()_)+/|", "regularValue", "regular Value", "49", "regularValue49", "VALUE", "246465494135646120009090049684646496468456468496846464968496844"};
+        String[] permittedValues = { "", "!@#$%^^&**(-()_)+/|", "regularValue", "regular Value", "49", "regularValue49", "VALUE", "246465494135646120009090049684646496468456468496846464968496844" };
         for (String value : permittedValues) {
             toption.setValue(value);
             Assert.assertTrue(toption.getValue().contains(value));
diff --git a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/PasswordTest.java b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/PasswordTest.java
similarity index 95%
rename from commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/PasswordTest.java
rename to service/api/src/test/java/org/eclipse/kapua/model/config/metatype/PasswordTest.java
index 332fbc2396d..ea2faddf4aa 100644
--- a/commons/src/test/java/org/eclipse/kapua/commons/configuration/metatype/PasswordTest.java
+++ b/service/api/src/test/java/org/eclipse/kapua/model/config/metatype/PasswordTest.java
@@ -10,14 +10,13 @@
  * Contributors:
  *     Eurotech - initial API and implementation
  *******************************************************************************/
-package org.eclipse.kapua.commons.configuration.metatype;
+package org.eclipse.kapua.model.config.metatype;
 
 import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-
 @Category(JUnitTests.class)
 public class PasswordTest {
 
diff --git a/service/authentication-app/src/main/java/org/eclipse/kapua/service/authentication/AuthenticationJAXBContextProvider.java b/service/authentication-app/src/main/java/org/eclipse/kapua/service/authentication/AuthenticationJAXBContextProvider.java
index 6924ef94b52..e70be5bd8cc 100644
--- a/service/authentication-app/src/main/java/org/eclipse/kapua/service/authentication/AuthenticationJAXBContextProvider.java
+++ b/service/authentication-app/src/main/java/org/eclipse/kapua/service/authentication/AuthenticationJAXBContextProvider.java
@@ -15,7 +15,6 @@
 import javax.xml.bind.JAXBContext;
 
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordCreator;
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordListResult;
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordQuery;
@@ -29,7 +28,7 @@
 import org.eclipse.kapua.model.config.metatype.KapuaTobject;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.MetatypeXmlRegistry;
+import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
 import org.eclipse.persistence.jaxb.JAXBContextFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,11 +51,10 @@ public JAXBContext getJAXBContext() throws KapuaException {
                     KapuaTocd.class,
                     KapuaTad.class,
                     KapuaTicon.class,
-                    TscalarImpl.class,
+                    KapuaTscalar.class,
                     KapuaToption.class,
                     KapuaTdesignate.class,
                     KapuaTobject.class,
-                    MetatypeXmlRegistry.class,
                     // Kapua Service Event
                     ServiceEvent.class,
                     EventStoreRecordCreator.class,
diff --git a/service/authentication-app/src/main/resources/locator.xml b/service/authentication-app/src/main/resources/locator.xml
index a1a7f702a61..fd9214cedad 100644
--- a/service/authentication-app/src/main/resources/locator.xml
+++ b/service/authentication-app/src/main/resources/locator.xml
@@ -17,6 +17,7 @@
     <packages>
         <package>org.eclipse.kapua.service.authentication</package>
         <package>org.eclipse.kapua.commons</package>
+        <package>org.eclipse.kapua.model</package>
         <package>org.eclipse.kapua.message</package>
         <package>org.eclipse.kapua.model.config</package>
         <package>org.eclipse.kapua.security</package>
diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/ConfigurationProviderImpl.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/ConfigurationProviderImpl.java
index f87dc7439fc..1a494bb9336 100644
--- a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/ConfigurationProviderImpl.java
+++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/ConfigurationProviderImpl.java
@@ -21,7 +21,6 @@
 import org.eclipse.kapua.service.datastore.internal.mediator.ConfigurationException;
 import org.eclipse.kapua.service.datastore.internal.mediator.MessageInfo;
 import org.eclipse.kapua.service.datastore.internal.mediator.MessageStoreConfiguration;
-import org.eclipse.kapua.storage.TxManager;
 
 /**
  * Datastore configuration provider implementation.
@@ -30,7 +29,6 @@
  */
 public class ConfigurationProviderImpl implements ConfigurationProvider {
 
-    private final TxManager txManager;
     private AccountService accountService;
     private ServiceConfigurationManager serviceConfigurationManager;
 
@@ -40,10 +38,8 @@ public class ConfigurationProviderImpl implements ConfigurationProvider {
      * @param serviceConfigurationManager
      * @param accountService
      */
-    public ConfigurationProviderImpl(TxManager txManager,
-                                     ServiceConfigurationManager serviceConfigurationManager,
-                                     AccountService accountService) {
-        this.txManager = txManager;
+    public ConfigurationProviderImpl(ServiceConfigurationManager serviceConfigurationManager,
+            AccountService accountService) {
         this.accountService = accountService;
         this.serviceConfigurationManager = serviceConfigurationManager;
     }
@@ -53,7 +49,7 @@ public MessageStoreConfiguration getConfiguration(KapuaId scopeId)
             throws ConfigurationException {
         MessageStoreConfiguration messageStoreConfiguration = null;
         try {
-            messageStoreConfiguration = new MessageStoreConfiguration(txManager.execute(tx -> serviceConfigurationManager.getConfigValues(tx, scopeId, true)));
+            messageStoreConfiguration = new MessageStoreConfiguration(serviceConfigurationManager.getConfigValues(scopeId, true));
         } catch (KapuaException e) {
             throw new ConfigurationException("Cannot load configuration parameters", e);
         }
diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/DatastoreModule.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/DatastoreModule.java
index 90a9b7a0300..b91414d9b25 100644
--- a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/DatastoreModule.java
+++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/DatastoreModule.java
@@ -12,25 +12,17 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.datastore.internal;
 
-import javax.inject.Named;
+import java.util.Map;
+
 import javax.inject.Singleton;
 
-import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
-import org.eclipse.kapua.commons.configuration.RootUserTester;
-import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerImpl;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
-import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
-import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
 import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
 import org.eclipse.kapua.commons.model.domains.Domains;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.domain.Domain;
 import org.eclipse.kapua.model.domain.DomainEntry;
-import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.account.AccountService;
 import org.eclipse.kapua.service.authorization.AuthorizationService;
 import org.eclipse.kapua.service.authorization.permission.PermissionFactory;
@@ -47,13 +39,11 @@
 import org.eclipse.kapua.service.datastore.internal.converter.QueryConverterImpl;
 import org.eclipse.kapua.service.datastore.internal.mediator.DatastoreUtils;
 import org.eclipse.kapua.service.datastore.internal.setting.DatastoreSettings;
-import org.eclipse.kapua.service.datastore.internal.setting.DatastoreSettingsKey;
 import org.eclipse.kapua.service.elasticsearch.client.ElasticsearchClientProvider;
 import org.eclipse.kapua.service.elasticsearch.client.configuration.ElasticsearchClientConfiguration;
 import org.eclipse.kapua.service.elasticsearch.client.rest.MetricsEsClient;
 import org.eclipse.kapua.service.elasticsearch.client.rest.RestElasticsearchClientProvider;
 import org.eclipse.kapua.service.storable.model.id.StorableIdFactory;
-import org.eclipse.kapua.storage.TxContext;
 
 import com.google.inject.Provides;
 import com.google.inject.multibindings.ProvidesIntoSet;
@@ -104,11 +94,13 @@ ElasticsearchClientProvider elasticsearchClientProvider(MetricsEsClient metricsE
     @Provides
     @Singleton
     ConfigurationProvider configurationProvider(
-            @Named("MessageStoreServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             KapuaJpaTxManagerFactory jpaTxManagerFactory,
             AccountService accountService
     ) {
-        final ConfigurationProviderImpl configurationProvider = new ConfigurationProviderImpl(jpaTxManagerFactory.create("kapua-datastore"), serviceConfigurationManager, accountService);
+        final ConfigurationProviderImpl configurationProvider = new ConfigurationProviderImpl(
+                serviceConfigurationManagersByServiceClass.get(MessageStoreService.class),
+                accountService);
         return configurationProvider;
     }
 
@@ -117,7 +109,7 @@ ConfigurationProvider configurationProvider(
     MessageStoreService messageStoreService(
             PermissionFactory permissionFactory,
             AuthorizationService authorizationService,
-            @Named("MessageStoreServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             KapuaJpaTxManagerFactory jpaTxManagerFactory,
             MessageStoreFacade messageStoreFacade,
             MetricsDatastore metricsDatastore,
@@ -126,36 +118,9 @@ MessageStoreService messageStoreService(
                 jpaTxManagerFactory.create("kapua-datastore"),
                 permissionFactory,
                 authorizationService,
-                serviceConfigurationManager,
+                serviceConfigurationManagersByServiceClass.get(MessageStoreService.class),
                 messageStoreFacade,
                 metricsDatastore,
                 datastoreSettings);
     }
-
-    @Provides
-    @Singleton
-    @Named("MessageStoreServiceConfigurationManager")
-    ServiceConfigurationManager messageStoreServiceConfigurationManager(
-            RootUserTester rootUserTester,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            DatastoreSettings datastoreSettings,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil
-    ) {
-        return new ServiceConfigurationManagerCachingWrapper(new ServiceConfigurationManagerImpl(
-                MessageStoreService.class.getName(),
-                new CachingServiceConfigRepository(
-                        new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                        entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                ),
-                rootUserTester,
-                xmlUtil
-        ) {
-
-            @Override
-            public boolean isServiceEnabled(TxContext txContext, KapuaId scopeId) {
-                return !datastoreSettings.getBoolean(DatastoreSettingsKey.DISABLE_DATASTORE, false);
-            }
-        });
-    }
 }
\ No newline at end of file
diff --git a/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/MessageStoreServiceConfigurationManagerModule.java b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/MessageStoreServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..2433594ddfa
--- /dev/null
+++ b/service/datastore/internal/src/main/java/org/eclipse/kapua/service/datastore/internal/MessageStoreServiceConfigurationManagerModule.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.datastore.internal;
+
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerImpl;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
+import org.eclipse.kapua.commons.model.domains.Domains;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.model.id.KapuaId;
+import org.eclipse.kapua.service.datastore.MessageStoreService;
+import org.eclipse.kapua.service.datastore.internal.setting.DatastoreSettings;
+import org.eclipse.kapua.service.datastore.internal.setting.DatastoreSettingsKey;
+import org.eclipse.kapua.storage.TxContext;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the MessageStoreService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class MessageStoreServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(MessageStoreService.class)
+    @Singleton
+    ServiceConfigurationManager messageStoreServiceConfigurationManager(
+            KapuaJpaTxManagerFactory jpaTxManagerFactory,
+            RootUserTester rootUserTester,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            DatastoreSettings datastoreSettings,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil
+    ) {
+        return new ServiceConfigurationManagerCachingWrapper(new ServiceConfigurationManagerImpl(
+                MessageStoreService.class.getName(),
+                Domains.DATASTORE,
+                jpaTxManagerFactory.create("kapua-datastore"),
+                new CachingServiceConfigRepository(
+                        new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                        entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                ),
+                rootUserTester,
+                new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)
+        ) {
+
+            @Override
+            public boolean isServiceEnabled(TxContext txContext, KapuaId scopeId) {
+                return !datastoreSettings.getBoolean(DatastoreSettingsKey.DISABLE_DATASTORE, false);
+            }
+        });
+    }
+}
diff --git a/service/datastore/test/src/test/java/org/eclipse/kapua/service/datastore/test/junit/DatastoreJAXBContextProvider.java b/service/datastore/test/src/test/java/org/eclipse/kapua/service/datastore/test/junit/DatastoreJAXBContextProvider.java
index 02fb4a444b8..6e5524a4dd3 100644
--- a/service/datastore/test/src/test/java/org/eclipse/kapua/service/datastore/test/junit/DatastoreJAXBContextProvider.java
+++ b/service/datastore/test/src/test/java/org/eclipse/kapua/service/datastore/test/junit/DatastoreJAXBContextProvider.java
@@ -12,8 +12,13 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.datastore.test.junit;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.TscalarImpl;
 import org.eclipse.kapua.commons.util.xml.JAXBContextProvider;
 import org.eclipse.kapua.model.config.metatype.KapuaTad;
 import org.eclipse.kapua.model.config.metatype.KapuaTdesignate;
@@ -22,17 +27,12 @@
 import org.eclipse.kapua.model.config.metatype.KapuaTobject;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
-import org.eclipse.kapua.model.config.metatype.MetatypeXmlRegistry;
+import org.eclipse.kapua.model.config.metatype.KapuaTscalar;
 import org.eclipse.persistence.jaxb.JAXBContextFactory;
 import org.eclipse.persistence.jaxb.MarshallerProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import java.util.HashMap;
-import java.util.Map;
-
 public class DatastoreJAXBContextProvider implements JAXBContextProvider {
 
     private static final Logger logger = LoggerFactory.getLogger(DatastoreJAXBContextProvider.class);
@@ -42,17 +42,16 @@ public class DatastoreJAXBContextProvider implements JAXBContextProvider {
     @Override
     public JAXBContext getJAXBContext() throws KapuaException {
         if (context == null) {
-            Class<?>[] classes = new Class<?>[]{
+            Class<?>[] classes = new Class<?>[] {
                     KapuaTmetadata.class,
                     KapuaTocd.class,
                     KapuaTad.class,
                     KapuaTicon.class,
-                    TscalarImpl.class,
+                    KapuaTscalar.class,
                     KapuaToption.class,
                     KapuaTmetadata.class,
                     KapuaTdesignate.class,
-                    KapuaTobject.class,
-                    MetatypeXmlRegistry.class
+                    KapuaTobject.class
             };
             try {
                 Map<String, Object> properties = new HashMap<>(1);
diff --git a/service/device/call/kura/src/main/java/org/eclipse/kapua/service/device/call/kura/model/configuration/KuraDeviceComponentConfiguration.java b/service/device/call/kura/src/main/java/org/eclipse/kapua/service/device/call/kura/model/configuration/KuraDeviceComponentConfiguration.java
index 614412ad297..ec4f21ce160 100644
--- a/service/device/call/kura/src/main/java/org/eclipse/kapua/service/device/call/kura/model/configuration/KuraDeviceComponentConfiguration.java
+++ b/service/device/call/kura/src/main/java/org/eclipse/kapua/service/device/call/kura/model/configuration/KuraDeviceComponentConfiguration.java
@@ -12,12 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.call.kura.model.configuration;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonRootName;
-import org.eclipse.kapua.commons.configuration.metatype.TocdImpl;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
-import org.eclipse.kapua.service.device.call.kura.model.configuration.xml.KuraXmlConfigPropertiesAdapter;
+import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -25,14 +20,18 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.Map;
+
+import org.eclipse.kapua.model.config.metatype.KapuaTocd;
+import org.eclipse.kapua.service.device.call.kura.model.configuration.xml.KuraXmlConfigPropertiesAdapter;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 /**
- * Describes the configuration of an OSGi Component.<br>
- * The Component configuration groups all the information related to the configuration of a Component.<br>
- * It provides access to parsed ObjectClassDefintion associated to this Component.<br>
- * The configuration does not reuse the OSGi ObjectClassDefinition as the latter does not provide access to certain aspects such as the required attribute, the min and max values.<br>
- * Instead it returns the raw ObjectClassDefintion as parsed from the MetaType Information XML resource associated to this Component.
+ * Describes the configuration of an OSGi Component.<br> The Component configuration groups all the information related to the configuration of a Component.<br> It provides access to parsed
+ * ObjectClassDefintion associated to this Component.<br> The configuration does not reuse the OSGi ObjectClassDefinition as the latter does not provide access to certain aspects such as the required
+ * attribute, the min and max values.<br> Instead it returns the raw ObjectClassDefintion as parsed from the MetaType Information XML resource associated to this Component.
  *
  * @since 1.0
  */
@@ -41,23 +40,19 @@
 public class KuraDeviceComponentConfiguration {
 
     /**
-     * The PID (service's persistent identity) of the OSGi Component
-     * associated to this configuration.<br>
-     * The service's persistent identity is defined as the name attribute of the
-     * Component Descriptor XML file; at runtime, the same value is also available
-     * in the component.name and in the service.pid attributes of the Component Configuration.
+     * The PID (service's persistent identity) of the OSGi Component associated to this configuration.<br> The service's persistent identity is defined as the name attribute of the Component
+     * Descriptor XML file; at runtime, the same value is also available in the component.name and in the service.pid attributes of the Component Configuration.
      */
     @JsonProperty("pid")
     @XmlAttribute(name = "pid")
     private String componentId;
 
     /**
-     * The raw ObjectClassDefinition as parsed from the MetaType
-     * Information XML resource associated to this Component.
+     * The raw ObjectClassDefinition as parsed from the MetaType Information XML resource associated to this Component.
      */
     @JsonIgnore
     @XmlElementRef(type = KapuaTocd.class)
-    private TocdImpl definition;
+    private KapuaTocd definition;
 
     /**
      * The Dictionary of properties currently used by this component.
@@ -72,12 +67,8 @@ public KuraDeviceComponentConfiguration() {
     }
 
     /**
-     * Get the component identifier.<br>
-     * The PID (service's persistent identity) of the OSGi Component
-     * associated to this configuration.<br>
-     * The service's persistent identity is defined as the name attribute of the
-     * Component Descriptor XML file; at runtime, the same value is also available
-     * in the component.name and in the service.pid attributes of the Component Configuration.
+     * Get the component identifier.<br> The PID (service's persistent identity) of the OSGi Component associated to this configuration.<br> The service's persistent identity is defined as the name
+     * attribute of the Component Descriptor XML file; at runtime, the same value is also available in the component.name and in the service.pid attributes of the Component Configuration.
      *
      * @return
      */
@@ -95,9 +86,7 @@ public void setComponentId(String componentId) {
     }
 
     /**
-     * Get the class definition.<br>
-     * The raw ObjectClassDefinition as parsed from the MetaType
-     * Information XML resource associated to this Component.
+     * Get the class definition.<br> The raw ObjectClassDefinition as parsed from the MetaType Information XML resource associated to this Component.
      *
      * @return
      */
@@ -111,12 +100,11 @@ public KapuaTocd getDefinition() {
      * @param definition
      */
     public void setDefinition(KapuaTocd definition) {
-        this.definition = (TocdImpl) definition;
+        this.definition = definition;
     }
 
     /**
-     * Get configuration properties.<br>
-     * The Dictionary of properties currently used by this component.
+     * Get configuration properties.<br> The Dictionary of properties currently used by this component.
      *
      * @return
      */
diff --git a/service/device/management/asset-store/dummy/src/main/java/org/eclipse/kapua/service/device/management/asset/store/dummy/DeviceAssetStoreServiceDummy.java b/service/device/management/asset-store/dummy/src/main/java/org/eclipse/kapua/service/device/management/asset/store/dummy/DeviceAssetStoreServiceDummy.java
index f044fdf7076..b8df0cf5965 100644
--- a/service/device/management/asset-store/dummy/src/main/java/org/eclipse/kapua/service/device/management/asset/store/dummy/DeviceAssetStoreServiceDummy.java
+++ b/service/device/management/asset-store/dummy/src/main/java/org/eclipse/kapua/service/device/management/asset/store/dummy/DeviceAssetStoreServiceDummy.java
@@ -12,18 +12,19 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.management.asset.store.dummy;
 
-import org.eclipse.kapua.commons.configuration.metatype.EmptyTocd;
+import java.util.Map;
+
+import javax.inject.Singleton;
+
 import org.eclipse.kapua.commons.service.internal.KapuaServiceDisabledException;
 import org.eclipse.kapua.message.device.data.KapuaDataMessage;
+import org.eclipse.kapua.model.config.metatype.EmptyTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.device.management.asset.DeviceAssets;
 import org.eclipse.kapua.service.device.management.asset.store.DeviceAssetStoreService;
 import org.eclipse.kapua.service.device.management.asset.store.settings.DeviceAssetStoreSettings;
 
-import javax.inject.Singleton;
-import java.util.Map;
-
 /**
  * {@link DeviceAssetStoreService} implementation.
  *
diff --git a/service/device/management/configuration-store/dummy/src/main/java/org/eclipse/kapua/service/device/management/configuration/store/dummy/DeviceConfigurationStoreServiceDummy.java b/service/device/management/configuration-store/dummy/src/main/java/org/eclipse/kapua/service/device/management/configuration/store/dummy/DeviceConfigurationStoreServiceDummy.java
index 77c8b489bd6..4c57f7d5b33 100644
--- a/service/device/management/configuration-store/dummy/src/main/java/org/eclipse/kapua/service/device/management/configuration/store/dummy/DeviceConfigurationStoreServiceDummy.java
+++ b/service/device/management/configuration-store/dummy/src/main/java/org/eclipse/kapua/service/device/management/configuration/store/dummy/DeviceConfigurationStoreServiceDummy.java
@@ -12,8 +12,12 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.management.configuration.store.dummy;
 
-import org.eclipse.kapua.commons.configuration.metatype.EmptyTocd;
+import java.util.Map;
+
+import javax.inject.Singleton;
+
 import org.eclipse.kapua.commons.service.internal.KapuaServiceDisabledException;
+import org.eclipse.kapua.model.config.metatype.EmptyTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.device.management.configuration.DeviceComponentConfiguration;
@@ -21,9 +25,6 @@
 import org.eclipse.kapua.service.device.management.configuration.store.DeviceConfigurationStoreService;
 import org.eclipse.kapua.service.device.management.configuration.store.settings.DeviceConfigurationStoreSettings;
 
-import javax.inject.Singleton;
-import java.util.Map;
-
 /**
  * {@link DeviceConfigurationStoreService} dummy implementation.
  *
diff --git a/service/device/management/configuration/api/src/main/java/org/eclipse/kapua/service/device/management/configuration/DeviceXmlConfigPropertiesAdapter.java b/service/device/management/configuration/api/src/main/java/org/eclipse/kapua/service/device/management/configuration/DeviceXmlConfigPropertiesAdapter.java
index e73c118a9db..111fc9a1707 100644
--- a/service/device/management/configuration/api/src/main/java/org/eclipse/kapua/service/device/management/configuration/DeviceXmlConfigPropertiesAdapter.java
+++ b/service/device/management/configuration/api/src/main/java/org/eclipse/kapua/service/device/management/configuration/DeviceXmlConfigPropertiesAdapter.java
@@ -12,6 +12,11 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.management.configuration;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
 import org.eclipse.kapua.commons.configuration.metatype.PasswordPropertyAdapter;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.locator.KapuaLocator;
@@ -28,10 +33,6 @@
 import org.eclipse.kapua.model.xml.adapters.XmlPropertyAdapter;
 import org.eclipse.kapua.service.device.management.configuration.DeviceXmlConfigPropertyAdapted.ConfigPropertyType;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Xml configuration properties adapter. It marshal and unmarshal configuration properties in a proper way.
  *
@@ -39,7 +40,9 @@
  */
 public class DeviceXmlConfigPropertiesAdapter extends XmlAdapter<DeviceXmlConfigPropertiesAdapted, Map<String, Object>> {
 
-    private XmlPropertiesAdapter<ConfigPropertyType, DeviceXmlConfigPropertyAdapted> adapter = new XmlPropertiesAdapter<>(DeviceXmlConfigPropertyAdapted.class, () -> new DeviceXmlConfigPropertyAdapted(), new HashMap<ConfigPropertyType, XmlPropertyAdapter>() {
+    private XmlPropertiesAdapter<ConfigPropertyType, DeviceXmlConfigPropertyAdapted> adapter = new XmlPropertiesAdapter<>(DeviceXmlConfigPropertyAdapted.class,
+            () -> new DeviceXmlConfigPropertyAdapted(), new HashMap<ConfigPropertyType, XmlPropertyAdapter>() {
+
         {
             put(ConfigPropertyType.stringType, new StringPropertyAdapter());
             put(ConfigPropertyType.longType, new LongPropertyAdapter());
diff --git a/service/device/management/configuration/internal/src/main/java/org/eclipse/kapua/service/device/management/configuration/internal/DeviceComponentConfigurationImpl.java b/service/device/management/configuration/internal/src/main/java/org/eclipse/kapua/service/device/management/configuration/internal/DeviceComponentConfigurationImpl.java
index 2d366ea137f..9bb37435150 100644
--- a/service/device/management/configuration/internal/src/main/java/org/eclipse/kapua/service/device/management/configuration/internal/DeviceComponentConfigurationImpl.java
+++ b/service/device/management/configuration/internal/src/main/java/org/eclipse/kapua/service/device/management/configuration/internal/DeviceComponentConfigurationImpl.java
@@ -12,12 +12,11 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.management.configuration.internal;
 
-import org.eclipse.kapua.commons.configuration.metatype.TocdImpl;
+import java.util.Map;
+
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.service.device.management.configuration.DeviceComponentConfiguration;
 
-import java.util.Map;
-
 /**
  * Device component configuration entity implementation.
  *
@@ -27,7 +26,7 @@ public class DeviceComponentConfigurationImpl implements DeviceComponentConfigur
 
     private String id;
     private String name;
-    private TocdImpl definition;
+    private KapuaTocd definition;
     private Map<String, Object> properties;
 
     /**
@@ -41,7 +40,8 @@ public DeviceComponentConfigurationImpl() {
     /**
      * Constructor.
      *
-     * @param id The {@link DeviceComponentConfiguration#getId()}
+     * @param id
+     *         The {@link DeviceComponentConfiguration#getId()}
      * @since 1.0.0
      */
     public DeviceComponentConfigurationImpl(String id) {
@@ -70,7 +70,7 @@ public void setName(String name) {
 
     @Override
     public void setDefinition(KapuaTocd definition) {
-        this.definition = (TocdImpl) definition;
+        this.definition = definition;
     }
 
     @Override
diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceConnectionServiceConfigurationManagerModule.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceConnectionServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..6ba9b379af9
--- /dev/null
+++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceConnectionServiceConfigurationManagerModule.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.device.registry;
+
+import java.util.Map;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.service.device.authentication.api.DeviceConnectionCredentialAdapter;
+import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionService;
+import org.eclipse.kapua.service.device.registry.connection.internal.DeviceConnectionServiceConfigurationManager;
+import org.eclipse.kapua.storage.TxManager;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the DeviceRegistryService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class DeviceConnectionServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(DeviceConnectionService.class)
+    @Singleton
+    ServiceConfigurationManager deviceConnectionServiceConfigurationManager(
+            RootUserTester rootUserTester,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            @Named("DeviceRegistryTransactionManager") TxManager txManager,
+            Map<String, DeviceConnectionCredentialAdapter> availableDeviceConnectionAdapters,
+            EntityCacheFactory entityCacheFactory,
+            KapuaDeviceRegistrySettings kapuaDeviceRegistrySettings,
+            XmlUtil xmlUtil) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new DeviceConnectionServiceConfigurationManager(
+                        txManager,
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        rootUserTester,
+                        availableDeviceConnectionAdapters,
+                        kapuaDeviceRegistrySettings,
+                        new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil))
+        );
+    }
+}
diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceRegistryModule.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceRegistryModule.java
index bd018a85761..789328be072 100644
--- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceRegistryModule.java
+++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceRegistryModule.java
@@ -17,18 +17,10 @@
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
-import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
-import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
-import org.eclipse.kapua.commons.configuration.RootUserTester;
-import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
-import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
 import org.eclipse.kapua.commons.core.ServiceModule;
 import org.eclipse.kapua.commons.event.ServiceEventHouseKeeperFactoryImpl;
-import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
 import org.eclipse.kapua.commons.jpa.EventStorer;
 import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
 import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
@@ -36,10 +28,8 @@
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreFactory;
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordRepository;
 import org.eclipse.kapua.commons.service.event.store.internal.EventStoreServiceImpl;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.event.ServiceEventBus;
 import org.eclipse.kapua.event.ServiceEventBusException;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.domain.Domain;
 import org.eclipse.kapua.model.domain.DomainEntry;
@@ -56,7 +46,6 @@
 import org.eclipse.kapua.service.device.registry.connection.internal.CachingDeviceConnectionRepository;
 import org.eclipse.kapua.service.device.registry.connection.internal.DeviceConnectionFactoryImpl;
 import org.eclipse.kapua.service.device.registry.connection.internal.DeviceConnectionImplJpaRepository;
-import org.eclipse.kapua.service.device.registry.connection.internal.DeviceConnectionServiceConfigurationManager;
 import org.eclipse.kapua.service.device.registry.connection.internal.DeviceConnectionServiceImpl;
 import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOptionFactory;
 import org.eclipse.kapua.service.device.registry.connection.option.DeviceConnectionOptionRepository;
@@ -104,6 +93,7 @@ protected void configureModule() {
         bind(DeviceEventFactory.class).to(DeviceEventFactoryImpl.class).in(Singleton.class);
         bind(DeviceLifeCycleService.class).to(DeviceLifeCycleServiceImpl.class).in(Singleton.class);
         bind(KapuaDeviceRegistrySettings.class).in(Singleton.class);
+        //This needs to be auto-created by guice, otherwise the RaiseServiceEventInterceptor will not work (sic!)
         bind(DeviceConnectionService.class).to(DeviceConnectionServiceImpl.class).in(Singleton.class);
     }
 
@@ -185,20 +175,20 @@ DeviceValidation deviceValidation(KapuaDeviceRegistrySettings deviceRegistrySett
     @Provides
     @Singleton
     DeviceRegistryService deviceRegistryService(
-            @Named("DeviceRegistryServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             AuthorizationService authorizationService,
             PermissionFactory permissionFactory,
             DeviceRepository deviceRepository,
             DeviceFactory deviceFactory,
             GroupQueryHelper groupQueryHelper,
             EventStorer eventStorer,
-            KapuaJpaTxManagerFactory jpaTxManagerFactory,
+            @Named("DeviceRegistryTransactionManager") TxManager deviceRegistryTxManager,
             DeviceValidation deviceValidation) {
         return new DeviceRegistryServiceImpl(
-                serviceConfigurationManager,
+                serviceConfigurationManagersByServiceClass.get(DeviceRegistryService.class),
                 authorizationService,
                 permissionFactory,
-                jpaTxManagerFactory.create("kapua-device"),
+                deviceRegistryTxManager,
                 deviceRepository,
                 deviceFactory,
                 groupQueryHelper,
@@ -223,59 +213,6 @@ protected TxManager deviceRegistryTxManager(KapuaJpaTxManagerFactory jpaTxManage
         return jpaTxManagerFactory.create("kapua-device");
     }
 
-    @Provides
-    @Singleton
-    @Named("DeviceRegistryServiceConfigurationManager")
-    protected ServiceConfigurationManager deviceRegistryServiceConfigurationManager(
-            DeviceFactory factory,
-            RootUserTester rootUserTester,
-            AccountRelativeFinder accountRelativeFinder,
-            DeviceRepository deviceRepository,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil
-    ) {
-        return new ServiceConfigurationManagerCachingWrapper(
-                new ResourceLimitedServiceConfigurationManagerImpl(
-                        DeviceRegistryService.class.getName(),
-                        new CachingServiceConfigRepository(
-                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                        ),
-                        rootUserTester,
-                        accountRelativeFinder,
-                        new UsedEntitiesCounterImpl(
-                                factory,
-                                deviceRepository),
-                        xmlUtil
-                ));
-    }
-
-    @Provides
-    @Singleton
-    @Named("DeviceConnectionServiceConfigurationManager")
-    ServiceConfigurationManager deviceConnectionServiceConfigurationManager(
-            RootUserTester rootUserTester,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            Map<String, DeviceConnectionCredentialAdapter> availableDeviceConnectionAdapters,
-            KapuaMetatypeFactory kapuaMetatypeFactory,
-            EntityCacheFactory entityCacheFactory,
-            KapuaDeviceRegistrySettings kapuaDeviceRegistrySettings,
-            XmlUtil xmlUtil) {
-        return new ServiceConfigurationManagerCachingWrapper(
-                new DeviceConnectionServiceConfigurationManager(
-                        new CachingServiceConfigRepository(
-                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                        ),
-                        rootUserTester,
-                        availableDeviceConnectionAdapters,
-                        kapuaMetatypeFactory,
-                        kapuaDeviceRegistrySettings,
-                        xmlUtil)
-        );
-    }
-
     @Provides
     @Singleton
     DeviceRegistryCache deviceRegistryCache(DeviceRegistryCacheFactory deviceRegistryCacheFactory) {
diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceRegistryServiceConfigurationManagerModule.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceRegistryServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..df5b64b39bc
--- /dev/null
+++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/DeviceRegistryServiceConfigurationManagerModule.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.device.registry;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.model.domains.Domains;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.storage.TxManager;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the DeviceConnectionService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class DeviceRegistryServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(DeviceRegistryService.class)
+    @Singleton
+    protected ServiceConfigurationManager deviceRegistryServiceConfigurationManager(
+            @Named("DeviceRegistryTransactionManager") TxManager txManager,
+            DeviceFactory factory,
+            RootUserTester rootUserTester,
+            AccountRelativeFinder accountRelativeFinder,
+            DeviceRepository deviceRepository,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil
+    ) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new ResourceLimitedServiceConfigurationManagerImpl(
+                        DeviceRegistryService.class.getName(),
+                        Domains.DEVICE,
+                        txManager,
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        rootUserTester,
+                        accountRelativeFinder,
+                        new UsedEntitiesCounterImpl(
+                                factory,
+                                deviceRepository),
+                        new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)
+                ));
+    }
+}
diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionServiceConfigurationManager.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionServiceConfigurationManager.java
index ff70679452d..41ab782f825 100644
--- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionServiceConfigurationManager.java
+++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionServiceConfigurationManager.java
@@ -22,8 +22,8 @@
 import org.eclipse.kapua.commons.configuration.ServiceConfigRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerImpl;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.model.domains.Domains;
 import org.eclipse.kapua.model.config.metatype.KapuaTad;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaToption;
@@ -34,6 +34,7 @@
 import org.eclipse.kapua.service.device.registry.connection.DeviceConnection;
 import org.eclipse.kapua.service.device.registry.connection.DeviceConnectionService;
 import org.eclipse.kapua.storage.TxContext;
+import org.eclipse.kapua.storage.TxManager;
 
 /**
  * {@link DeviceConnection} {@link ServiceConfigurationManager} implementation.
@@ -45,7 +46,6 @@ public class DeviceConnectionServiceConfigurationManager extends ServiceConfigur
     private final Map<String, DeviceConnectionCredentialAdapter> availableDeviceConnectionAdapters;
 
     private final KapuaDeviceRegistrySettings deviceRegistrySettings;
-    private final KapuaMetatypeFactory kapuaMetatypeFactory;
 
     /**
      * Constructor.
@@ -56,21 +56,18 @@ public class DeviceConnectionServiceConfigurationManager extends ServiceConfigur
      *         The {@link RootUserTester} instance.
      * @param availableDeviceConnectionAdapters
      *         The {@link Map} of available {@link DeviceConnectionCredentialAdapter}.
-     * @param kapuaMetatypeFactory
-     *         The {@link KapuaMetatypeFactory} instance.
      * @since 2.0.0
      */
     public DeviceConnectionServiceConfigurationManager(
+            TxManager txManager,
             ServiceConfigRepository serviceConfigRepository,
             RootUserTester rootUserTester,
             Map<String, DeviceConnectionCredentialAdapter> availableDeviceConnectionAdapters,
-            KapuaMetatypeFactory kapuaMetatypeFactory,
             KapuaDeviceRegistrySettings kapuaDeviceRegistrySettings,
-            XmlUtil xmlUtil) {
-        super(DeviceConnectionService.class.getName(), serviceConfigRepository, rootUserTester, xmlUtil);
+            ServiceConfigurationMetadataProvider serviceConfigurationMetadataProvider) {
+        super(DeviceConnectionService.class.getName(), Domains.DEVICE_CONNECTION, txManager, serviceConfigRepository, rootUserTester, serviceConfigurationMetadataProvider);
 
         this.availableDeviceConnectionAdapters = availableDeviceConnectionAdapters;
-        this.kapuaMetatypeFactory = kapuaMetatypeFactory;
         this.deviceRegistrySettings = kapuaDeviceRegistrySettings;
     }
 
@@ -93,12 +90,12 @@ public DeviceConnectionServiceConfigurationManager(
      * @since 2.0.0
      */
     @Override
-    public KapuaTocd getConfigMetadata(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
+    protected Optional<KapuaTocd> doGetConfigMetadata(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
 
-        KapuaTocd deviceConnectionServiceConfigDefinition = super.getConfigMetadata(txContext, scopeId, excludeDisabled);
+        Optional<KapuaTocd> deviceConnectionServiceConfigDefinition = super.doGetConfigMetadata(txContext, scopeId, excludeDisabled);
 
         // Find the 'deviceConnectionAuthenticationType' KapuaTad
-        Optional<KapuaTad> authenticationTypeConfigDefinition = findAuthenticationTypeTad(deviceConnectionServiceConfigDefinition);
+        Optional<KapuaTad> authenticationTypeConfigDefinition = deviceConnectionServiceConfigDefinition.flatMap(this::findAuthenticationTypeTad);
 
         // Add the KapuaToption to the KapuaTad
         authenticationTypeConfigDefinition.ifPresent(tad -> {
@@ -107,7 +104,7 @@ public KapuaTocd getConfigMetadata(TxContext txContext, KapuaId scopeId, boolean
                             .keySet()
                             .stream()
                             .map(authType -> {
-                                KapuaToption authTypeToption = kapuaMetatypeFactory.newKapuaToption();
+                                KapuaToption authTypeToption = new KapuaToption();
                                 authTypeToption.setLabel(authType);
                                 authTypeToption.setValue(authType);
                                 return authTypeToption;
diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionServiceImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionServiceImpl.java
index a1c5744bae6..b48ee3a9ce0 100644
--- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionServiceImpl.java
+++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/connection/internal/DeviceConnectionServiceImpl.java
@@ -12,6 +12,13 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.registry.connection.internal;
 
+import java.util.Map;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import org.apache.commons.lang.NotImplementedException;
 import org.eclipse.kapua.KapuaDuplicateNameException;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
@@ -43,12 +50,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * {@link DeviceConnectionService} implementation.
  *
@@ -67,12 +68,11 @@ public class DeviceConnectionServiceImpl extends KapuaConfigurableServiceBase im
     /**
      * Constructor.
      *
-     * @param serviceConfigurationManager The {@link ServiceConfigurationManager} instance.
      * @since 2.0.0
      */
     @Inject
     public DeviceConnectionServiceImpl(
-            @Named("DeviceConnectionServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             AuthorizationService authorizationService,
             PermissionFactory permissionFactory,
             DeviceConnectionFactory entityFactory,
@@ -80,7 +80,7 @@ public DeviceConnectionServiceImpl(
             DeviceConnectionRepository repository,
             Map<String, DeviceConnectionCredentialAdapter> availableDeviceConnectionAdapters,
             EventStorer eventStorer) {
-        super(txManager, serviceConfigurationManager, Domains.DEVICE_CONNECTION, authorizationService, permissionFactory);
+        super(txManager, serviceConfigurationManagersByServiceClass.get(DeviceConnectionService.class), Domains.DEVICE_CONNECTION, authorizationService, permissionFactory);
         this.entityFactory = entityFactory;
         this.repository = repository;
         this.availableDeviceConnectionAdapters = availableDeviceConnectionAdapters;
diff --git a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceRegistryServiceImpl.java b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceRegistryServiceImpl.java
index 1020ecaed77..2bd64f03026 100644
--- a/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceRegistryServiceImpl.java
+++ b/service/device/registry/internal/src/main/java/org/eclipse/kapua/service/device/registry/internal/DeviceRegistryServiceImpl.java
@@ -37,16 +37,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 /**
  * {@link DeviceRegistryService} implementation.
  *
  * @since 1.0.0
  */
-@Singleton
 public class DeviceRegistryServiceImpl
         extends KapuaConfigurableServiceBase
         implements DeviceRegistryService {
@@ -58,12 +53,11 @@ public class DeviceRegistryServiceImpl
     private final EventStorer eventStorer;
     private final DeviceValidation deviceValidation;
 
-    @Inject
     public DeviceRegistryServiceImpl(
-            @Named("DeviceRegistryServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            ServiceConfigurationManager serviceConfigurationManager,
             AuthorizationService authorizationService,
             PermissionFactory permissionFactory,
-            @Named("DeviceRegistryTransactionManager") TxManager txManager,
+            TxManager txManager,
             DeviceRepository deviceRepository,
             DeviceFactory entityFactory,
             GroupQueryHelper groupQueryHelper,
diff --git a/service/device/registry/test/src/test/java/org/eclipse/kapua/service/device/registry/test/DeviceRegistryLocatorConfiguration.java b/service/device/registry/test/src/test/java/org/eclipse/kapua/service/device/registry/test/DeviceRegistryLocatorConfiguration.java
index 8064339b11b..b22f83a39f9 100644
--- a/service/device/registry/test/src/test/java/org/eclipse/kapua/service/device/registry/test/DeviceRegistryLocatorConfiguration.java
+++ b/service/device/registry/test/src/test/java/org/eclipse/kapua/service/device/registry/test/DeviceRegistryLocatorConfiguration.java
@@ -12,18 +12,13 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.device.registry.test;
 
-import com.codahale.metrics.MetricRegistry;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
-import com.google.inject.name.Names;
-import io.cucumber.java.Before;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -41,7 +36,6 @@
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.message.KapuaMessageFactory;
 import org.eclipse.kapua.message.internal.KapuaMessageFactoryImpl;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.service.account.AccountFactory;
 import org.eclipse.kapua.service.account.AccountService;
@@ -87,8 +81,15 @@
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.codahale.metrics.MetricRegistry;
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.MapBinder;
+import com.google.inject.name.Names;
+
+import io.cucumber.java.Before;
 
 @Singleton
 public class DeviceRegistryLocatorConfiguration {
@@ -133,8 +134,6 @@ protected void configure() {
                 bind(AccountService.class).toInstance(Mockito.mock(AccountService.class));
 
                 bind(RootUserTester.class).toInstance(Mockito.mock(RootUserTester.class));
-                // Set KapuaMetatypeFactory for Metatype configuration
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
 
                 // Inject actual Device registry service related services
                 //TODO: FIXME: PRIORITY: build test instance
@@ -146,15 +145,21 @@ protected void configure() {
 
                 final Map<String, DeviceConnectionCredentialAdapter> availableDeviceConnectionAdapters = new HashMap<>();
                 availableDeviceConnectionAdapters.put("USER_PASS", new UserPassDeviceConnectionCredentialAdapter(credentialsFactory));
-                bind(ServiceConfigurationManager.class)
-                        .annotatedWith(Names.named("DeviceConnectionServiceConfigurationManager"))
+
+                final MapBinder<Class, ServiceConfigurationManager> serviceConfigurationManagerMapBinder = MapBinder.newMapBinder(binder(), Class.class, ServiceConfigurationManager.class);
+
+                serviceConfigurationManagerMapBinder.addBinding(DeviceConnectionService.class)
                         .toInstance(Mockito.mock(ServiceConfigurationManager.class));
+
                 bind(DeviceFactory.class).toInstance(new DeviceFactoryImpl());
                 final KapuaJpaRepositoryConfiguration jpaRepoConfig = new KapuaJpaRepositoryConfiguration();
                 final TxManager txManager = new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-device");
                 final EventStorer eventStorer = new EventStorerImpl(new EventStoreRecordImplJpaRepository(jpaRepoConfig));
+                final Map<Class<?>, ServiceConfigurationManager> classServiceConfigurationManagerMap = new HashMap<>();
+                classServiceConfigurationManagerMap.put(DeviceConnectionService.class, Mockito.mock(ServiceConfigurationManager.class));
+
                 final DeviceConnectionService deviceConnectionService = new DeviceConnectionServiceImpl(
-                        Mockito.mock(ServiceConfigurationManager.class),
+                        classServiceConfigurationManagerMap,
                         mockedAuthorization,
                         permissionFactory,
                         new DeviceConnectionFactoryImpl(),
@@ -180,7 +185,8 @@ protected void configure() {
                 bind(DeviceEventFactory.class).toInstance(new DeviceEventFactoryImpl());
                 bind(KapuaMessageFactory.class).toInstance(new KapuaMessageFactoryImpl());
 
-                final DeviceValidation deviceValidation = new DeviceValidationImpl(new KapuaDeviceRegistrySettings().getInt(KapuaDeviceRegistrySettingKeys.DEVICE_LIFECYCLE_BIRTH_VAR_FIELDS_LENGTH_MAX),
+                final DeviceValidation deviceValidation = new DeviceValidationImpl(
+                        new KapuaDeviceRegistrySettings().getInt(KapuaDeviceRegistrySettingKeys.DEVICE_LIFECYCLE_BIRTH_VAR_FIELDS_LENGTH_MAX),
                         new KapuaDeviceRegistrySettings().getInt(KapuaDeviceRegistrySettingKeys.DEVICE_LIFECYCLE_BIRTH_EXTENDED_PROPERTIES_LENGTH_MAX),
                         mockedAuthorization,
                         permissionFactory,
diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobModule.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobModule.java
index a61a8418276..2108b2af4df 100644
--- a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobModule.java
+++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobModule.java
@@ -12,23 +12,16 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.job.internal;
 
+import java.util.Map;
+
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
-import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
-import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
-import org.eclipse.kapua.commons.configuration.RootUserTester;
-import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
-import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
-import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
 import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
 import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
 import org.eclipse.kapua.commons.model.domains.Domains;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.job.engine.JobEngineService;
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.domain.Domain;
@@ -68,7 +61,7 @@ TxManager jobTxManager(
     @Provides
     @Singleton
     JobService jobService(
-            @Named("JobServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             JobEngineService jobEngineService,
             PermissionFactory permissionFactory,
             AuthorizationService authorizationService,
@@ -77,7 +70,7 @@ JobService jobService(
             TriggerService triggerService) {
 
         return new JobServiceImpl(
-                serviceConfigurationManager,
+                serviceConfigurationManagersByServiceClass.get(JobService.class),
                 jobEngineService,
                 permissionFactory,
                 authorizationService,
@@ -87,35 +80,6 @@ JobService jobService(
         );
     }
 
-    @Provides
-    @Singleton
-    @Named("JobServiceConfigurationManager")
-    public ServiceConfigurationManager jobServiceConfigurationManager(
-            JobFactory factory,
-            RootUserTester rootUserTester,
-            AccountRelativeFinder accountRelativeFinder,
-            JobRepository jobRepository,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil
-    ) {
-        return new ServiceConfigurationManagerCachingWrapper(
-                new ResourceLimitedServiceConfigurationManagerImpl(
-                        JobService.class.getName(),
-                        new CachingServiceConfigRepository(
-                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                        ),
-                        rootUserTester,
-                        accountRelativeFinder,
-                        new UsedEntitiesCounterImpl(
-                                factory,
-                                jobRepository
-                        ),
-                        xmlUtil));
-
-    }
-
     @Provides
     @Singleton
     JobRepository jobRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) {
diff --git a/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobServiceConfigurationManagerModule.java b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..9c81df96897
--- /dev/null
+++ b/service/job/internal/src/main/java/org/eclipse/kapua/service/job/internal/JobServiceConfigurationManagerModule.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.job.internal;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.model.domains.Domains;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.service.job.JobFactory;
+import org.eclipse.kapua.service.job.JobRepository;
+import org.eclipse.kapua.service.job.JobService;
+import org.eclipse.kapua.storage.TxManager;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the JobService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class JobServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(JobService.class)
+    @Singleton
+    public ServiceConfigurationManager jobServiceConfigurationManager(
+            @Named("jobTxManager") TxManager txManager,
+
+            JobFactory factory,
+            RootUserTester rootUserTester,
+            AccountRelativeFinder accountRelativeFinder,
+            JobRepository jobRepository,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil
+    ) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new ResourceLimitedServiceConfigurationManagerImpl(
+                        JobService.class.getName(),
+                        Domains.JOB,
+                        txManager,
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        rootUserTester,
+                        accountRelativeFinder,
+                        new UsedEntitiesCounterImpl(
+                                factory,
+                                jobRepository
+                        ),
+                        new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)));
+
+    }
+}
diff --git a/service/job/test/src/test/java/org/eclipse/kapua/service/job/test/JobLocatorConfiguration.java b/service/job/test/src/test/java/org/eclipse/kapua/service/job/test/JobLocatorConfiguration.java
index f3498d75669..665fc6d35d7 100644
--- a/service/job/test/src/test/java/org/eclipse/kapua/service/job/test/JobLocatorConfiguration.java
+++ b/service/job/test/src/test/java/org/eclipse/kapua/service/job/test/JobLocatorConfiguration.java
@@ -15,7 +15,6 @@
 import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -30,7 +29,6 @@
 import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.job.engine.JobEngineService;
 import org.eclipse.kapua.locator.KapuaLocator;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.query.QueryFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.qa.common.TestJAXBContextProvider;
@@ -121,7 +119,6 @@ protected void configure() {
                 bind(MetricsService.class).to(MetricsServiceImpl.class).in(Singleton.class);
 
                 // Commons
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
                 bind(QueryFactory.class).toInstance(new QueryFactoryImpl());
 
                 // Account
diff --git a/service/scheduler/test/src/test/java/org/eclipse/kapua/service/scheduler/test/SchedulerLocatorConfiguration.java b/service/scheduler/test/src/test/java/org/eclipse/kapua/service/scheduler/test/SchedulerLocatorConfiguration.java
index 02e6c8c4fb0..f569a08610c 100644
--- a/service/scheduler/test/src/test/java/org/eclipse/kapua/service/scheduler/test/SchedulerLocatorConfiguration.java
+++ b/service/scheduler/test/src/test/java/org/eclipse/kapua/service/scheduler/test/SchedulerLocatorConfiguration.java
@@ -16,7 +16,6 @@
 import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -32,7 +31,6 @@
 import org.eclipse.kapua.job.engine.client.JobEngineServiceClient;
 import org.eclipse.kapua.job.engine.client.settings.JobEngineClientSetting;
 import org.eclipse.kapua.locator.KapuaLocator;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.query.QueryFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.qa.common.TestJAXBContextProvider;
@@ -111,8 +109,6 @@ protected void configure() {
                 // Inject mocked Permission Factory
                 final PermissionFactory permissionFactory = Mockito.mock(PermissionFactory.class);
                 bind(PermissionFactory.class).toInstance(permissionFactory);
-                // Set KapuaMetatypeFactory for Metatype configuration
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
 
                 // binding Account related services
                 bind(AccountRelativeFinder.class).toInstance(Mockito.mock(AccountRelativeFinder.class));
diff --git a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateServiceImpl.java b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateServiceImpl.java
index d898bc207bd..abcc2da0c2a 100644
--- a/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateServiceImpl.java
+++ b/service/security/certificate/internal/src/main/java/org/eclipse/kapua/service/certificate/internal/CertificateServiceImpl.java
@@ -12,14 +12,20 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.certificate.internal;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.Sets;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.EmptyTocd;
 import org.eclipse.kapua.commons.model.domains.Domains;
 import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
 import org.eclipse.kapua.commons.util.ArgumentValidator;
 import org.eclipse.kapua.commons.util.KapuaFileUtils;
+import org.eclipse.kapua.model.config.metatype.EmptyTocd;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.id.KapuaId;
@@ -43,12 +49,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import com.google.common.base.Strings;
+import com.google.common.collect.Sets;
 
 @Singleton
 public class CertificateServiceImpl implements CertificateService {
@@ -65,7 +67,7 @@ public class CertificateServiceImpl implements CertificateService {
 
     @Inject
     public CertificateServiceImpl(AuthorizationService authorizationService, PermissionFactory permissionFactory, CertificateFactory certificateFactory,
-                                  KapuaCertificateSetting kapuaCertificateSetting) throws KapuaException {
+            KapuaCertificateSetting kapuaCertificateSetting) throws KapuaException {
         this.authorizationService = authorizationService;
         this.permissionFactory = permissionFactory;
         this.certificateFactory = certificateFactory;
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/AccountPasswordLengthProvider.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/AccountPasswordLengthProvider.java
new file mode 100644
index 00000000000..f0051d44f52
--- /dev/null
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/AccountPasswordLengthProvider.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.authentication.credential.shiro;
+
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.model.id.KapuaId;
+import org.eclipse.kapua.storage.TxContext;
+
+public interface AccountPasswordLengthProvider {
+
+    int getMinimumPasswordLength(TxContext txContext, KapuaId scopeId) throws KapuaException;
+
+    int getMaximumPasswordLength(TxContext txContext, KapuaId scopeId) throws KapuaException;
+}
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/AccountPasswordLengthProviderImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/AccountPasswordLengthProviderImpl.java
new file mode 100644
index 00000000000..ac58efd31db
--- /dev/null
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/AccountPasswordLengthProviderImpl.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.authentication.credential.shiro;
+
+import java.util.Map;
+
+import org.eclipse.kapua.KapuaException;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.util.ArgumentValidator;
+import org.eclipse.kapua.model.id.KapuaId;
+import org.eclipse.kapua.service.authentication.shiro.SystemPasswordLengthProvider;
+import org.eclipse.kapua.storage.TxContext;
+
+public class AccountPasswordLengthProviderImpl implements AccountPasswordLengthProvider {
+
+    private final SystemPasswordLengthProvider systemPasswordLengthProvider;
+    private final ServiceConfigurationManager credentialServiceConfigurationManager;
+    public static final String PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY = "password.minLength";
+
+    public AccountPasswordLengthProviderImpl(SystemPasswordLengthProvider systemPasswordLengthProvider, ServiceConfigurationManager credentialServiceConfigurationManager) {
+        this.systemPasswordLengthProvider = systemPasswordLengthProvider;
+        this.credentialServiceConfigurationManager = credentialServiceConfigurationManager;
+    }
+
+    @Override
+    public int getMinimumPasswordLength(TxContext txContext, KapuaId scopeId) throws KapuaException {
+        // Argument Validation
+        ArgumentValidator.notNull(scopeId, "scopeId");
+
+        // Check access
+        // None
+
+        // Get system minimum password length
+        int minPasswordLength = systemPasswordLengthProvider.getSystemMinimumPasswordLength();
+
+        if (!KapuaId.ANY.equals(scopeId)) {
+            Object minPasswordLengthAccountConfigValue = getConfigValues(txContext, scopeId).get(PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY);
+            if (minPasswordLengthAccountConfigValue != null) {
+                minPasswordLength = Integer.parseInt(minPasswordLengthAccountConfigValue.toString());
+            }
+        }
+        return minPasswordLength;
+    }
+
+    @Override
+    public int getMaximumPasswordLength(TxContext txContext, KapuaId scopeId) throws KapuaException {
+        return systemPasswordLengthProvider.getSystemMaximumPasswordLength();
+    }
+
+    private Map<String, Object> getConfigValues(TxContext tx, KapuaId scopeId) throws KapuaException {
+        return credentialServiceConfigurationManager.getConfigValues(tx, scopeId, true);
+    }
+}
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialServiceImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialServiceImpl.java
index 3907e7faa3e..27f1258810a 100644
--- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialServiceImpl.java
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/CredentialServiceImpl.java
@@ -14,7 +14,12 @@
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
 import javax.inject.Singleton;
 
 import org.eclipse.kapua.KapuaEntityNotFoundException;
@@ -22,6 +27,7 @@
 import org.eclipse.kapua.KapuaIllegalArgumentException;
 import org.eclipse.kapua.KapuaRuntimeException;
 import org.eclipse.kapua.commons.configuration.KapuaConfigurableServiceBase;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
 import org.eclipse.kapua.commons.model.domains.Domains;
 import org.eclipse.kapua.commons.util.ArgumentValidator;
 import org.eclipse.kapua.event.ServiceEvent;
@@ -33,14 +39,13 @@
 import org.eclipse.kapua.model.query.predicate.AttributePredicate;
 import org.eclipse.kapua.service.authentication.credential.Credential;
 import org.eclipse.kapua.service.authentication.credential.CredentialAttributes;
-import org.eclipse.kapua.service.authentication.credential.handler.CredentialTypeHandler;
 import org.eclipse.kapua.service.authentication.credential.CredentialCreator;
 import org.eclipse.kapua.service.authentication.credential.CredentialFactory;
 import org.eclipse.kapua.service.authentication.credential.CredentialListResult;
 import org.eclipse.kapua.service.authentication.credential.CredentialQuery;
 import org.eclipse.kapua.service.authentication.credential.CredentialRepository;
 import org.eclipse.kapua.service.authentication.credential.CredentialService;
-import org.eclipse.kapua.service.authentication.shiro.CredentialServiceConfigurationManager;
+import org.eclipse.kapua.service.authentication.credential.handler.CredentialTypeHandler;
 import org.eclipse.kapua.service.authentication.shiro.setting.KapuaAuthenticationSetting;
 import org.eclipse.kapua.service.authentication.shiro.setting.KapuaAuthenticationSettingKeys;
 import org.eclipse.kapua.service.authentication.user.PasswordResetRequest;
@@ -50,11 +55,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 /**
  * {@link CredentialService} implementation.
  *
@@ -69,13 +69,14 @@ public class CredentialServiceImpl extends KapuaConfigurableServiceBase implemen
     private final CredentialRepository credentialRepository;
     private final CredentialFactory credentialFactory;
     private final KapuaAuthenticationSetting kapuaAuthenticationSetting;
+    private final AccountPasswordLengthProvider accountPasswordLengthProvider;
     private final PasswordValidator passwordValidator;
     private final PasswordResetter passwordResetter;
 
     private final Map<String, CredentialTypeHandler> availableCredentialAuthenticationType;
 
     public CredentialServiceImpl(
-            CredentialServiceConfigurationManager serviceConfigurationManager,
+            ServiceConfigurationManager serviceConfigurationManager,
             AuthorizationService authorizationService,
             PermissionFactory permissionFactory,
             TxManager txManager,
@@ -83,14 +84,15 @@ public CredentialServiceImpl(
             CredentialFactory credentialFactory,
             PasswordValidator passwordValidator,
             KapuaAuthenticationSetting kapuaAuthenticationSetting,
-            PasswordResetter passwordResetter,
-            Set<CredentialTypeHandler> availableCredentialAuthenticationType
-    ) {
+            Set<CredentialTypeHandler> availableCredentialAuthenticationType,
+            AccountPasswordLengthProvider accountPasswordLengthProvider,
+            PasswordResetter passwordResetter) {
         super(txManager, serviceConfigurationManager, Domains.CREDENTIAL, authorizationService, permissionFactory);
 
         this.credentialRepository = credentialRepository;
         this.credentialFactory = credentialFactory;
         this.kapuaAuthenticationSetting = kapuaAuthenticationSetting;
+        this.accountPasswordLengthProvider = accountPasswordLengthProvider;
         this.passwordResetter = passwordResetter;
         try {
             random = SecureRandom.getInstance("SHA1PRNG");
@@ -138,12 +140,12 @@ public Credential create(CredentialCreator credentialCreator)
 
             // Convert creator to entity
             Credential newCredential = new CredentialImpl(
-                credentialCreator.getScopeId(),
-                credentialCreator.getUserId(),
-                credentialCreator.getCredentialType(),
-                encryptedKey,
-                credentialCreator.getCredentialStatus(),
-                credentialCreator.getExpirationDate()
+                    credentialCreator.getScopeId(),
+                    credentialCreator.getUserId(),
+                    credentialCreator.getCredentialType(),
+                    encryptedKey,
+                    credentialCreator.getCredentialStatus(),
+                    credentialCreator.getExpirationDate()
             );
 
             // Do create
@@ -275,10 +277,10 @@ public CredentialListResult findByUserId(KapuaId scopeId, KapuaId userId, String
         CredentialQuery credentialQuery = new CredentialQueryImpl(scopeId);
 
         credentialQuery.setPredicate(
-            credentialQuery.andPredicate(
-                credentialQuery.attributePredicate(CredentialAttributes.USER_ID, userId),
-                credentialQuery.attributePredicate(CredentialAttributes.CREDENTIAL_TYPE, credentialType)
-            )
+                credentialQuery.andPredicate(
+                        credentialQuery.attributePredicate(CredentialAttributes.USER_ID, userId),
+                        credentialQuery.attributePredicate(CredentialAttributes.CREDENTIAL_TYPE, credentialType)
+                )
         );
 
         CredentialListResult credentials = txManager.execute(tx -> credentialRepository.query(tx, credentialQuery));
@@ -286,8 +288,6 @@ public CredentialListResult findByUserId(KapuaId scopeId, KapuaId userId, String
         return credentials;
     }
 
-
-
     @Override
     public Credential findByApiKey(String apiKey) throws KapuaException {
         int preLength = kapuaAuthenticationSetting.getInt(KapuaAuthenticationSettingKeys.AUTHENTICATION_CREDENTIAL_APIKEY_PRE_LENGTH);
@@ -304,10 +304,10 @@ public Credential findByApiKey(String apiKey) throws KapuaException {
             KapuaQuery query = new CredentialQueryImpl();
 
             query.setPredicate(
-                query.andPredicate(
-                    query.attributePredicate(CredentialAttributes.CREDENTIAL_TYPE, "API_KEY"),
-                    query.attributePredicate(CredentialAttributes.CREDENTIAL_KEY, apiKeyPreValue, AttributePredicate.Operator.STARTS_WITH)
-                )
+                    query.andPredicate(
+                            query.attributePredicate(CredentialAttributes.CREDENTIAL_TYPE, "API_KEY"),
+                            query.attributePredicate(CredentialAttributes.CREDENTIAL_KEY, apiKeyPreValue, AttributePredicate.Operator.STARTS_WITH)
+                    )
             );
 
             // Query
@@ -347,7 +347,7 @@ public void unlock(KapuaId scopeId, KapuaId credentialId) throws KapuaException
 
     @Override
     public int getMinimumPasswordLength(KapuaId scopeId) throws KapuaException {
-        return txManager.execute(tx -> passwordValidator.getMinimumPasswordLength(tx, scopeId));
+        return txManager.execute(tx -> accountPasswordLengthProvider.getMinimumPasswordLength(tx, scopeId));
     }
 
     //@ListenServiceEvent(fromAddress="account")
@@ -426,7 +426,6 @@ public Credential adminResetUserPassword(KapuaId scopeId, KapuaId userId, Passwo
         return txManager.execute(tx -> passwordResetter.resetPassword(tx, scopeId, userId, false, passwordResetRequest));
     }
 
-
     @Override
     public Set<String> getAvailableCredentialTypes() {
         return availableCredentialAuthenticationType.keySet();
@@ -434,8 +433,8 @@ public Set<String> getAvailableCredentialTypes() {
 
     private boolean tryEditAdminFields(Credential updated, Credential current) {
         return updated.getLoginFailures() != current.getLoginFailures() ||
-                   updated.getFirstLoginFailure() != current.getFirstLoginFailure() ||
-                   updated.getLoginFailuresReset() != current.getLoginFailuresReset() ||
-                   updated.getLockoutReset() != current.getLockoutReset();
+                updated.getFirstLoginFailure() != current.getFirstLoginFailure() ||
+                updated.getLoginFailuresReset() != current.getLoginFailuresReset() ||
+                updated.getLockoutReset() != current.getLockoutReset();
     }
 }
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/PasswordValidator.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/PasswordValidator.java
index b022a578ece..75ae48ee4d3 100644
--- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/PasswordValidator.java
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/PasswordValidator.java
@@ -20,13 +20,9 @@
  * @since 2.0.0
  */
 public interface PasswordValidator {
-    /**
-     * @since 2.0.0
-     */
-    void validatePassword(TxContext txContext, KapuaId scopeId, String plainPassword) throws KapuaException;
 
     /**
      * @since 2.0.0
      */
-    int getMinimumPasswordLength(TxContext txContext, KapuaId scopeId) throws KapuaException;
+    void validatePassword(TxContext txContext, KapuaId scopeId, String plainPassword) throws KapuaException;
 }
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/PasswordValidatorImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/PasswordValidatorImpl.java
index 1bbb0e58672..80e956dc10e 100644
--- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/PasswordValidatorImpl.java
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/credential/shiro/PasswordValidatorImpl.java
@@ -17,12 +17,8 @@
 import org.eclipse.kapua.commons.util.CommonsValidationRegex;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.authentication.exception.PasswordLengthException;
-import org.eclipse.kapua.service.authentication.shiro.CredentialServiceConfigurationManager;
-import org.eclipse.kapua.service.authentication.shiro.CredentialServiceConfigurationManagerImpl;
 import org.eclipse.kapua.storage.TxContext;
 
-import java.util.Map;
-
 /**
  * The {@link PasswordValidator} implementation.
  *
@@ -30,10 +26,10 @@
  */
 public class PasswordValidatorImpl implements PasswordValidator {
 
-    private final CredentialServiceConfigurationManager credentialServiceConfigurationManager;
+    private final AccountPasswordLengthProvider accountPasswordLengthProvider;
 
-    public PasswordValidatorImpl(CredentialServiceConfigurationManager credentialServiceConfigurationManager) {
-        this.credentialServiceConfigurationManager = credentialServiceConfigurationManager;
+    public PasswordValidatorImpl(AccountPasswordLengthProvider accountPasswordLengthProvider) {
+        this.accountPasswordLengthProvider = accountPasswordLengthProvider;
     }
 
     @Override
@@ -43,35 +39,13 @@ public void validatePassword(TxContext txContext, KapuaId scopeId, String plainP
         ArgumentValidator.notEmptyOrNull(plainPassword, "plainPassword");
 
         // Validate Password length
-        int minPasswordLength = getMinimumPasswordLength(txContext, scopeId);
-        if (plainPassword.length() < minPasswordLength || plainPassword.length() > CredentialServiceConfigurationManagerImpl.SYSTEM_MAXIMUM_PASSWORD_LENGTH) {
-            throw new PasswordLengthException(minPasswordLength, CredentialServiceConfigurationManagerImpl.SYSTEM_MAXIMUM_PASSWORD_LENGTH);
+        int minPasswordLength = accountPasswordLengthProvider.getMinimumPasswordLength(txContext, scopeId);
+        int maxPasswordLenght = accountPasswordLengthProvider.getMaximumPasswordLength(txContext, scopeId);
+        if (plainPassword.length() < minPasswordLength || plainPassword.length() > maxPasswordLenght) {
+            throw new PasswordLengthException(minPasswordLength, maxPasswordLenght);
         }
         // Validate Password regex
         ArgumentValidator.match(plainPassword, CommonsValidationRegex.PASSWORD_REGEXP, "plainPassword");
     }
 
-    @Override
-    public int getMinimumPasswordLength(TxContext txContext, KapuaId scopeId) throws KapuaException {
-        // Argument Validation
-        ArgumentValidator.notNull(scopeId, "scopeId");
-
-        // Check access
-        // None
-
-        // Get system minimum password length
-        int minPasswordLength = credentialServiceConfigurationManager.getSystemMinimumPasswordLength();
-
-        if (!KapuaId.ANY.equals(scopeId)) {
-            Object minPasswordLengthAccountConfigValue = getConfigValues(txContext, scopeId).get(CredentialServiceConfigurationManagerImpl.PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY);
-            if (minPasswordLengthAccountConfigValue != null) {
-                minPasswordLength = Integer.parseInt(minPasswordLengthAccountConfigValue.toString());
-            }
-        }
-        return minPasswordLength;
-    }
-
-    private Map<String, Object> getConfigValues(TxContext tx, KapuaId scopeId) throws KapuaException {
-        return credentialServiceConfigurationManager.getConfigValues(tx, scopeId, true);
-    }
 }
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/AuthenticationModule.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/AuthenticationModule.java
index d3202f52d44..e01bc9e1b2c 100644
--- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/AuthenticationModule.java
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/AuthenticationModule.java
@@ -15,22 +15,16 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.KapuaRuntimeException;
-import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
-import org.eclipse.kapua.commons.configuration.RootUserTester;
-import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
 import org.eclipse.kapua.commons.core.ServiceModule;
 import org.eclipse.kapua.commons.event.ServiceEventHouseKeeperFactoryImpl;
-import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
 import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
 import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
 import org.eclipse.kapua.commons.model.domains.Domains;
@@ -38,22 +32,22 @@
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordRepository;
 import org.eclipse.kapua.commons.service.event.store.internal.EventStoreServiceImpl;
 import org.eclipse.kapua.commons.util.qr.QRCodeBuilder;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.event.ServiceEventBus;
 import org.eclipse.kapua.event.ServiceEventBusException;
-import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.domain.Domain;
 import org.eclipse.kapua.model.domain.DomainEntry;
-import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.account.AccountService;
 import org.eclipse.kapua.service.authentication.AuthenticationService;
 import org.eclipse.kapua.service.authentication.CredentialsFactory;
-import org.eclipse.kapua.service.authentication.credential.handler.CredentialTypeHandler;
 import org.eclipse.kapua.service.authentication.credential.CredentialFactory;
 import org.eclipse.kapua.service.authentication.credential.CredentialRepository;
 import org.eclipse.kapua.service.authentication.credential.CredentialService;
 import org.eclipse.kapua.service.authentication.credential.cache.CacheMetric;
+import org.eclipse.kapua.service.authentication.credential.handler.CredentialTypeHandler;
+import org.eclipse.kapua.service.authentication.credential.handler.shiro.ApiKeyCredentialTypeHandler;
+import org.eclipse.kapua.service.authentication.credential.handler.shiro.JwtCredentialTypeHandler;
+import org.eclipse.kapua.service.authentication.credential.handler.shiro.PasswordCredentialTypeHandler;
 import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionFactory;
 import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionRepository;
 import org.eclipse.kapua.service.authentication.credential.mfa.MfaOptionService;
@@ -66,12 +60,11 @@
 import org.eclipse.kapua.service.authentication.credential.mfa.shiro.ScratchCodeFactoryImpl;
 import org.eclipse.kapua.service.authentication.credential.mfa.shiro.ScratchCodeImplJpaRepository;
 import org.eclipse.kapua.service.authentication.credential.mfa.shiro.ScratchCodeServiceImpl;
-import org.eclipse.kapua.service.authentication.credential.handler.shiro.ApiKeyCredentialTypeHandler;
+import org.eclipse.kapua.service.authentication.credential.shiro.AccountPasswordLengthProvider;
+import org.eclipse.kapua.service.authentication.credential.shiro.AccountPasswordLengthProviderImpl;
 import org.eclipse.kapua.service.authentication.credential.shiro.CredentialFactoryImpl;
 import org.eclipse.kapua.service.authentication.credential.shiro.CredentialImplJpaRepository;
 import org.eclipse.kapua.service.authentication.credential.shiro.CredentialServiceImpl;
-import org.eclipse.kapua.service.authentication.credential.handler.shiro.JwtCredentialTypeHandler;
-import org.eclipse.kapua.service.authentication.credential.handler.shiro.PasswordCredentialTypeHandler;
 import org.eclipse.kapua.service.authentication.credential.shiro.PasswordResetter;
 import org.eclipse.kapua.service.authentication.credential.shiro.PasswordValidator;
 import org.eclipse.kapua.service.authentication.credential.shiro.PasswordValidatorImpl;
@@ -98,7 +91,6 @@
 import org.eclipse.kapua.service.authorization.AuthorizationService;
 import org.eclipse.kapua.service.authorization.permission.PermissionFactory;
 import org.eclipse.kapua.service.user.UserService;
-import org.eclipse.kapua.storage.TxContext;
 
 import com.google.inject.Provides;
 import com.google.inject.multibindings.ProvidesIntoSet;
@@ -118,6 +110,7 @@ protected void configureModule() {
         bind(MfaAuthenticator.class).to(MfaAuthenticatorImpl.class).in(Singleton.class);
         bind(KapuaCryptoSetting.class).in(Singleton.class);
         bind(CacheMetric.class).in(Singleton.class);
+        bind(SystemPasswordLengthProvider.class).to(SystemPasswordLengthProviderImpl.class).in(Singleton.class);
     }
 
     @Provides
@@ -195,8 +188,16 @@ public CredentialsConverter accessTokenCredentialsHandler() {
 
     @Provides
     @Singleton
-    PasswordValidator passwordValidator(CredentialServiceConfigurationManager credentialServiceConfigurationManager) {
-        return new PasswordValidatorImpl(credentialServiceConfigurationManager);
+    PasswordValidator passwordValidator(
+            AccountPasswordLengthProvider accountPasswordLengthProvider) {
+        return new PasswordValidatorImpl(accountPasswordLengthProvider);
+    }
+
+    @Provides
+    @Singleton
+    AccountPasswordLengthProvider accountPasswordLengthProvider(SystemPasswordLengthProvider systemPasswordLengthProvider,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass) {
+        return new AccountPasswordLengthProviderImpl(systemPasswordLengthProvider, serviceConfigurationManagersByServiceClass.get(CredentialService.class));
     }
 
     @Provides
@@ -282,17 +283,18 @@ public ScratchCodeRepository scratchCodeRepository(KapuaJpaRepositoryConfigurati
     @Provides
     @Singleton
     public CredentialService credentialService(
-            CredentialServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             AuthorizationService authorizationService,
             PermissionFactory permissionFactory,
             CredentialRepository credentialRepository,
             CredentialFactory credentialFactory,
             KapuaJpaTxManagerFactory jpaTxManagerFactory,
+            AccountPasswordLengthProvider accountPasswordLengthProvider,
             PasswordValidator passwordValidator,
             KapuaAuthenticationSetting kapuaAuthenticationSetting,
             PasswordResetter passwordResetter,
             Set<CredentialTypeHandler> availableCredentialAuthenticationTypes) {
-        return new CredentialServiceImpl(serviceConfigurationManager,
+        return new CredentialServiceImpl(serviceConfigurationManagersByServiceClass.get(CredentialService.class),
                 authorizationService,
                 permissionFactory,
                 jpaTxManagerFactory.create("kapua-authentication"),
@@ -300,8 +302,9 @@ public CredentialService credentialService(
                 credentialFactory,
                 passwordValidator,
                 kapuaAuthenticationSetting,
-                passwordResetter,
-                availableCredentialAuthenticationTypes);
+                availableCredentialAuthenticationTypes,
+                accountPasswordLengthProvider,
+                passwordResetter);
     }
 
     @Provides
@@ -310,53 +313,6 @@ CredentialRepository credentialRepository(KapuaJpaRepositoryConfiguration jpaRep
         return new CredentialImplJpaRepository(jpaRepoConfig);
     }
 
-    @Provides
-    @Singleton
-    public CredentialServiceConfigurationManager credentialServiceConfigurationManager(
-            RootUserTester rootUserTester,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            KapuaAuthenticationSetting kapuaAuthenticationSetting,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil) {
-        final CredentialServiceConfigurationManagerImpl credentialServiceConfigurationManager = new CredentialServiceConfigurationManagerImpl(
-                new CachingServiceConfigRepository(
-                        new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                        entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                ),
-                rootUserTester,
-                kapuaAuthenticationSetting,
-                xmlUtil);
-
-        final ServiceConfigurationManagerCachingWrapper cached = new ServiceConfigurationManagerCachingWrapper(credentialServiceConfigurationManager);
-        return new CredentialServiceConfigurationManager() {
-
-            @Override
-            public int getSystemMinimumPasswordLength() {
-                return credentialServiceConfigurationManager.getSystemMinimumPasswordLength();
-            }
-
-            @Override
-            public void checkAllowedEntities(TxContext txContext, KapuaId scopeId, String entityType) throws KapuaException {
-                cached.checkAllowedEntities(txContext, scopeId, entityType);
-            }
-
-            @Override
-            public void setConfigValues(TxContext txContext, KapuaId scopeId, Optional<KapuaId> parentId, Map<String, Object> values) throws KapuaException {
-                cached.setConfigValues(txContext, scopeId, parentId, values);
-            }
-
-            @Override
-            public Map<String, Object> getConfigValues(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
-                return cached.getConfigValues(txContext, scopeId, excludeDisabled);
-            }
-
-            @Override
-            public KapuaTocd getConfigMetadata(TxContext txContext, KapuaId scopeId, boolean excludeDisabled) throws KapuaException {
-                return cached.getConfigMetadata(txContext, scopeId, excludeDisabled);
-            }
-        };
-    }
-
     //
     // Credential type handlers
     //
@@ -375,7 +331,6 @@ public CredentialTypeHandler passwordCredentialTypeHandler(
                 passwordValidator);
     }
 
-
     @ProvidesIntoSet
     public CredentialTypeHandler apiKeyCredentialTypeHandler(
             AuthenticationUtils authenticationUtils,
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManagerImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManagerImpl.java
index 8840fb16928..dd2316ce1f3 100644
--- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManagerImpl.java
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManagerImpl.java
@@ -13,77 +13,57 @@
 package org.eclipse.kapua.service.authentication.shiro;
 
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Optional;
 
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.KapuaIllegalArgumentException;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.ServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerImpl;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.model.domains.Domains;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.service.authentication.credential.CredentialService;
+import org.eclipse.kapua.service.authentication.credential.shiro.AccountPasswordLengthProviderImpl;
 import org.eclipse.kapua.service.authentication.shiro.setting.KapuaAuthenticationSetting;
-import org.eclipse.kapua.service.authentication.shiro.setting.KapuaAuthenticationSettingKeys;
 import org.eclipse.kapua.storage.TxContext;
+import org.eclipse.kapua.storage.TxManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CredentialServiceConfigurationManagerImpl extends ServiceConfigurationManagerImpl implements CredentialServiceConfigurationManager {
+public class CredentialServiceConfigurationManagerImpl extends ServiceConfigurationManagerImpl implements ServiceConfigurationManager {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CredentialServiceConfigurationManagerImpl.class);
-    private final int systemMinimumPasswordLength;
-    public static final int SYSTEM_MAXIMUM_PASSWORD_LENGTH = 255;
-    public static final String PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY = "password.minLength";
-    private final KapuaAuthenticationSetting kapuaAuthenticationSetting;
+    private final SystemPasswordLengthProvider systemPasswordLengthProvider;
 
     public CredentialServiceConfigurationManagerImpl(
+            TxManager txManager,
             ServiceConfigRepository serviceConfigRepository,
+            SystemPasswordLengthProvider systemPasswordLengthProvider,
             RootUserTester rootUserTester,
             KapuaAuthenticationSetting kapuaAuthenticationSetting,
-            XmlUtil xmlUtil) {
+            ServiceConfigurationMetadataProvider serviceConfigurationMetadataProvider) {
         super(CredentialService.class.getName(),
+                Domains.CREDENTIAL,
+                txManager,
                 serviceConfigRepository,
                 rootUserTester,
-                xmlUtil);
-        this.kapuaAuthenticationSetting = kapuaAuthenticationSetting;
-        systemMinimumPasswordLength = fixMinimumPasswordLength();
+                serviceConfigurationMetadataProvider);
+        this.systemPasswordLengthProvider = systemPasswordLengthProvider;
     }
 
     @Override
     protected boolean validateNewConfigValuesCoherence(TxContext txContext, KapuaTocd ocd, Map<String, Object> updatedProps, KapuaId scopeId, Optional<KapuaId> parentId) throws KapuaException {
-        if (updatedProps.get(PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY) != null) {
+        if (updatedProps.get(AccountPasswordLengthProviderImpl.PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY) != null) {
             // If we're going to set a new limit, check that it's not less than system limit
-            int newPasswordLimit = Integer.parseInt(updatedProps.get(PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY).toString());
-            if (newPasswordLimit < systemMinimumPasswordLength || newPasswordLimit > SYSTEM_MAXIMUM_PASSWORD_LENGTH) {
-                throw new KapuaIllegalArgumentException(PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY, String.valueOf(newPasswordLimit));
+            int newPasswordLimit = Integer.parseInt(updatedProps.get(AccountPasswordLengthProviderImpl.PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY).toString());
+            if (newPasswordLimit < systemPasswordLengthProvider.getSystemMinimumPasswordLength() || newPasswordLimit > systemPasswordLengthProvider.getSystemMaximumPasswordLength()) {
+                throw new KapuaIllegalArgumentException(AccountPasswordLengthProviderImpl.PASSWORD_MIN_LENGTH_ACCOUNT_CONFIG_KEY, String.valueOf(newPasswordLimit));
             }
         }
         return true;
     }
 
-    private int fixMinimumPasswordLength() {
-        final int systemMinimumPasswordLength;
-        //TODO: Why is this logic in a constructor?
-        int minPasswordLengthConfigValue;
-        try {
-            minPasswordLengthConfigValue = kapuaAuthenticationSetting.getInt(KapuaAuthenticationSettingKeys.AUTHENTICATION_CREDENTIAL_USERPASS_PASSWORD_MINLENGTH);
-        } catch (NoSuchElementException ex) {
-            LOGGER.warn("Minimum password length not set, 12 characters minimum will be enforced");
-            minPasswordLengthConfigValue = 12;
-        }
-        if (minPasswordLengthConfigValue < 12) {
-            LOGGER.warn("Minimum password length too short, 12 characters minimum will be enforced");
-            minPasswordLengthConfigValue = 12;
-        }
-        systemMinimumPasswordLength = minPasswordLengthConfigValue;
-        return systemMinimumPasswordLength;
-    }
-
-    @Override
-    public int getSystemMinimumPasswordLength() {
-        return systemMinimumPasswordLength;
-    }
 }
\ No newline at end of file
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManagerModule.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..54b0577f5f6
--- /dev/null
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManagerModule.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.authentication.shiro;
+
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.service.authentication.credential.CredentialService;
+import org.eclipse.kapua.service.authentication.shiro.setting.KapuaAuthenticationSetting;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the CredentialService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class CredentialServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(CredentialService.class)
+    @Singleton
+    public ServiceConfigurationManager credentialServiceConfigurationManager(
+            KapuaJpaTxManagerFactory jpaTxManagerFactory,
+            RootUserTester rootUserTester,
+            SystemPasswordLengthProvider systemPasswordLengthProvider,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            KapuaAuthenticationSetting kapuaAuthenticationSetting,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new CredentialServiceConfigurationManagerImpl(
+                        jpaTxManagerFactory.create("kapua-authentication"),
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        systemPasswordLengthProvider,
+                        rootUserTester,
+                        kapuaAuthenticationSetting,
+                        new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)));
+    }
+}
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManager.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/SystemPasswordLengthProvider.java
similarity index 66%
rename from service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManager.java
rename to service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/SystemPasswordLengthProvider.java
index 6fa65c5ab15..dc46edf513c 100644
--- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/CredentialServiceConfigurationManager.java
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/SystemPasswordLengthProvider.java
@@ -12,12 +12,9 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authentication.shiro;
 
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+public interface SystemPasswordLengthProvider {
 
-public interface CredentialServiceConfigurationManager extends ServiceConfigurationManager {
-
-    /**
-     * The minimum password length specified for the whole system. If not defined, assume 12; if defined and less than 12, assume 12.
-     */
     int getSystemMinimumPasswordLength();
+
+    int getSystemMaximumPasswordLength();
 }
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/SystemPasswordLengthProviderImpl.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/SystemPasswordLengthProviderImpl.java
new file mode 100644
index 00000000000..373fbc5c305
--- /dev/null
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authentication/shiro/SystemPasswordLengthProviderImpl.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.authentication.shiro;
+
+import java.util.NoSuchElementException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.service.authentication.shiro.setting.KapuaAuthenticationSetting;
+import org.eclipse.kapua.service.authentication.shiro.setting.KapuaAuthenticationSettingKeys;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Singleton
+public class SystemPasswordLengthProviderImpl implements SystemPasswordLengthProvider {
+
+    private final KapuaAuthenticationSetting kapuaAuthenticationSetting;
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static final int SYSTEM_MAXIMUM_PASSWORD_LENGTH = 255;
+
+    @Inject
+    public SystemPasswordLengthProviderImpl(KapuaAuthenticationSetting kapuaAuthenticationSetting) {
+        this.kapuaAuthenticationSetting = kapuaAuthenticationSetting;
+    }
+
+    @Override
+    /**
+     * The minimum password length specified for the whole system. If not defined, assume 12; if defined and less than 12, assume 12.
+     */
+    public int getSystemMinimumPasswordLength() {
+        int minPasswordLengthConfigValue;
+        try {
+            minPasswordLengthConfigValue = kapuaAuthenticationSetting.getInt(KapuaAuthenticationSettingKeys.AUTHENTICATION_CREDENTIAL_USERPASS_PASSWORD_MINLENGTH);
+        } catch (NoSuchElementException ex) {
+            logger.warn("Minimum password length not set, 12 characters minimum will be enforced");
+            minPasswordLengthConfigValue = 12;
+        }
+        if (minPasswordLengthConfigValue < 12) {
+            logger.warn("Minimum password length too short, 12 characters minimum will be enforced");
+            minPasswordLengthConfigValue = 12;
+        }
+        return minPasswordLengthConfigValue;
+    }
+
+    @Override
+    public int getSystemMaximumPasswordLength() {
+        return SYSTEM_MAXIMUM_PASSWORD_LENGTH;
+    }
+}
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/AuthorizationModule.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/AuthorizationModule.java
index ab46f2fd679..97baf44fba9 100644
--- a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/AuthorizationModule.java
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/AuthorizationModule.java
@@ -12,17 +12,12 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authorization.shiro;
 
+import java.util.Map;
+
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
-import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
-import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
-import org.eclipse.kapua.commons.configuration.RootUserTester;
-import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
-import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
 import org.eclipse.kapua.commons.core.ServiceModule;
 import org.eclipse.kapua.commons.event.ServiceEventHouseKeeperFactoryImpl;
@@ -36,7 +31,6 @@
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordRepository;
 import org.eclipse.kapua.commons.service.event.store.internal.EventStoreServiceImpl;
 import org.eclipse.kapua.commons.service.internal.cache.KapuaCacheManager;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.event.ServiceEventBus;
 import org.eclipse.kapua.event.ServiceEventBusException;
 import org.eclipse.kapua.model.domain.Actions;
@@ -239,7 +233,7 @@ RoleService roleService(PermissionFactory permissionFactory,
             AccessInfoFactory accessInfoFactory,
             AccessRoleService accessRoleService,
             AccessInfoService accessInfoService,
-            @Named("RoleServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             RoleRepository roleRepository,
             RolePermissionRepository rolePermissionRepository,
             KapuaJpaTxManagerFactory jpaTxManagerFactory,
@@ -253,7 +247,7 @@ RoleService roleService(PermissionFactory permissionFactory,
                 accessInfoFactory,
                 accessRoleService,
                 accessInfoService,
-                serviceConfigurationManager,
+                serviceConfigurationManagersByServiceClass.get(RoleService.class),
                 jpaTxManagerFactory.create("kapua-authorization"),
                 roleRepository,
                 rolePermissionRepository,
@@ -261,34 +255,6 @@ RoleService roleService(PermissionFactory permissionFactory,
         );
     }
 
-    @Provides
-    @Singleton
-    @Named("RoleServiceConfigurationManager")
-    public ServiceConfigurationManager roleServiceConfigurationManager(
-            RoleFactory roleFactory,
-            RootUserTester rootUserTester,
-            AccountRelativeFinder accountRelativeFinder,
-            RoleRepository roleRepository,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil
-    ) {
-        return new ServiceConfigurationManagerCachingWrapper(
-                new ResourceLimitedServiceConfigurationManagerImpl(
-                        RoleService.class.getName(),
-                        new CachingServiceConfigRepository(
-                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                        ),
-                        rootUserTester,
-                        accountRelativeFinder,
-                        new UsedEntitiesCounterImpl(
-                                roleFactory,
-                                roleRepository
-                        ),
-                        xmlUtil));
-    }
-
     @Provides
     @Singleton
     RoleRepository roleRepository(NamedCacheFactory namedCacheFactory, KapuaJpaRepositoryConfiguration jpaRepoConfig) {
@@ -308,41 +274,14 @@ RolePermissionRepository rolePermissionRepository(KapuaJpaRepositoryConfiguratio
     @Singleton
     GroupService groupService(PermissionFactory permissionFactory,
             AuthorizationService authorizationService,
-            @Named("GroupServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             GroupRepository groupRepository,
             KapuaJpaTxManagerFactory jpaTxManagerFactory) {
-        return new GroupServiceImpl(permissionFactory, authorizationService, serviceConfigurationManager,
+        return new GroupServiceImpl(permissionFactory, authorizationService, serviceConfigurationManagersByServiceClass.get(GroupService.class),
                 jpaTxManagerFactory.create("kapua-authorization"),
                 groupRepository);
     }
 
-    @Provides
-    @Singleton
-    @Named("GroupServiceConfigurationManager")
-    public ServiceConfigurationManager groupServiceConfigurationManager(
-            GroupFactory factory,
-            RootUserTester rootUserTester,
-            AccountRelativeFinder accountRelativeFinder,
-            GroupRepository groupRepository,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil
-    ) {
-        return new ServiceConfigurationManagerCachingWrapper(
-                new ResourceLimitedServiceConfigurationManagerImpl(
-                        GroupService.class.getName(),
-                        new CachingServiceConfigRepository(
-                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                        ),
-                        rootUserTester,
-                        accountRelativeFinder,
-                        new UsedEntitiesCounterImpl(
-                                factory,
-                                groupRepository
-                        ), xmlUtil));
-    }
-
     @Provides
     @Singleton
     GroupRepository groupRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) {
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/GroupServiceConfigurationManagerModule.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/GroupServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..1c928b8fdf0
--- /dev/null
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/GroupServiceConfigurationManagerModule.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.authorization.shiro;
+
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
+import org.eclipse.kapua.commons.model.domains.Domains;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.service.authorization.group.GroupFactory;
+import org.eclipse.kapua.service.authorization.group.GroupRepository;
+import org.eclipse.kapua.service.authorization.group.GroupService;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the GroupService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class GroupServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(GroupService.class)
+    @Singleton
+    public ServiceConfigurationManager groupServiceConfigurationManager(
+            KapuaJpaTxManagerFactory jpaTxManagerFactory,
+            GroupFactory factory,
+            RootUserTester rootUserTester,
+            AccountRelativeFinder accountRelativeFinder,
+            GroupRepository groupRepository,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil
+    ) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new ResourceLimitedServiceConfigurationManagerImpl(
+                        GroupService.class.getName(),
+                        Domains.GROUP,
+                        jpaTxManagerFactory.create("kapua-authorization"),
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        rootUserTester,
+                        accountRelativeFinder,
+                        new UsedEntitiesCounterImpl(
+                                factory,
+                                groupRepository
+                        ), new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)));
+    }
+}
diff --git a/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/RoleServiceConfigurationManagerModule.java b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/RoleServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..271085d9978
--- /dev/null
+++ b/service/security/shiro/src/main/java/org/eclipse/kapua/service/authorization/shiro/RoleServiceConfigurationManagerModule.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.authorization.shiro;
+
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
+import org.eclipse.kapua.commons.model.domains.Domains;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.service.authorization.role.RoleFactory;
+import org.eclipse.kapua.service.authorization.role.RoleRepository;
+import org.eclipse.kapua.service.authorization.role.RoleService;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the RoleService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class RoleServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(RoleService.class)
+    @Singleton
+    public ServiceConfigurationManager roleServiceConfigurationManager(
+            KapuaJpaTxManagerFactory jpaTxManagerFactory,
+            RoleFactory roleFactory,
+            RootUserTester rootUserTester,
+            AccountRelativeFinder accountRelativeFinder,
+            RoleRepository roleRepository,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil
+    ) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new ResourceLimitedServiceConfigurationManagerImpl(
+                        RoleService.class.getName(),
+                        Domains.ROLE,
+                        jpaTxManagerFactory.create("kapua-authorization"),
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        rootUserTester,
+                        accountRelativeFinder,
+                        new UsedEntitiesCounterImpl(
+                                roleFactory,
+                                roleRepository
+                        ),
+                        new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)));
+    }
+}
diff --git a/service/security/test/src/test/java/org/eclipse/kapua/service/security/test/SecurityLocatorConfiguration.java b/service/security/test/src/test/java/org/eclipse/kapua/service/security/test/SecurityLocatorConfiguration.java
index 720f8c78b5e..786b191dc6e 100644
--- a/service/security/test/src/test/java/org/eclipse/kapua/service/security/test/SecurityLocatorConfiguration.java
+++ b/service/security/test/src/test/java/org/eclipse/kapua/service/security/test/SecurityLocatorConfiguration.java
@@ -19,10 +19,10 @@
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.KapuaRuntimeException;
 import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -38,25 +38,26 @@
 import org.eclipse.kapua.commons.setting.system.SystemSetting;
 import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.locator.KapuaLocator;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.query.QueryFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.qa.common.TestJAXBContextProvider;
-import org.eclipse.kapua.service.authentication.credential.handler.CredentialTypeHandler;
 import org.eclipse.kapua.service.authentication.credential.CredentialFactory;
 import org.eclipse.kapua.service.authentication.credential.CredentialService;
+import org.eclipse.kapua.service.authentication.credential.handler.CredentialTypeHandler;
 import org.eclipse.kapua.service.authentication.credential.handler.shiro.ApiKeyCredentialTypeHandler;
+import org.eclipse.kapua.service.authentication.credential.handler.shiro.JwtCredentialTypeHandler;
+import org.eclipse.kapua.service.authentication.credential.handler.shiro.PasswordCredentialTypeHandler;
+import org.eclipse.kapua.service.authentication.credential.shiro.AccountPasswordLengthProviderImpl;
 import org.eclipse.kapua.service.authentication.credential.shiro.CredentialFactoryImpl;
 import org.eclipse.kapua.service.authentication.credential.shiro.CredentialImplJpaRepository;
 import org.eclipse.kapua.service.authentication.credential.shiro.CredentialServiceImpl;
-import org.eclipse.kapua.service.authentication.credential.handler.shiro.JwtCredentialTypeHandler;
-import org.eclipse.kapua.service.authentication.credential.handler.shiro.PasswordCredentialTypeHandler;
 import org.eclipse.kapua.service.authentication.credential.shiro.PasswordResetterImpl;
 import org.eclipse.kapua.service.authentication.credential.shiro.PasswordValidator;
 import org.eclipse.kapua.service.authentication.credential.shiro.PasswordValidatorImpl;
 import org.eclipse.kapua.service.authentication.exception.KapuaAuthenticationErrorCodes;
 import org.eclipse.kapua.service.authentication.mfa.MfaAuthenticator;
 import org.eclipse.kapua.service.authentication.shiro.CredentialServiceConfigurationManagerImpl;
+import org.eclipse.kapua.service.authentication.shiro.SystemPasswordLengthProviderImpl;
 import org.eclipse.kapua.service.authentication.shiro.mfa.MfaAuthenticatorImpl;
 import org.eclipse.kapua.service.authentication.shiro.setting.KapuaAuthenticationSetting;
 import org.eclipse.kapua.service.authentication.shiro.setting.KapuaCryptoSetting;
@@ -88,6 +89,7 @@
 import org.eclipse.kapua.service.user.internal.UserFactoryImpl;
 import org.eclipse.kapua.service.user.internal.UserImplJpaRepository;
 import org.eclipse.kapua.service.user.internal.UserServiceImpl;
+import org.eclipse.kapua.storage.TxManager;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
@@ -142,11 +144,10 @@ protected void configure() {
                 // Inject mocked Permission Factory
                 PermissionFactory mockPermissionFactory = Mockito.mock(PermissionFactory.class);
                 bind(PermissionFactory.class).toInstance(mockPermissionFactory);
-                // Set KapuaMetatypeFactory for Metatype configuration
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
 
                 // Inject actual Role service related services
                 final KapuaJpaRepositoryConfiguration jpaRepoConfig = new KapuaJpaRepositoryConfiguration();
+                final TxManager txManager = new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-authorization");
                 bind(RoleService.class).toInstance(new RoleServiceImpl(
                         mockPermissionFactory,
                         mockedAuthorization,
@@ -156,7 +157,7 @@ protected void configure() {
                         mockedAccessRole,
                         mockedAccessInfo,
                         Mockito.mock(ServiceConfigurationManager.class),
-                        new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-authorization"),
+                        txManager,
                         new RoleImplJpaRepository(jpaRepoConfig),
                         new RolePermissionImplJpaRepository(jpaRepoConfig),
                         Mockito.mock(PermissionValidator.class)
@@ -168,54 +169,60 @@ protected void configure() {
                         mockPermissionFactory,
                         mockedAuthorization,
                         Mockito.mock(ServiceConfigurationManager.class),
-                        new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-authorization"),
+                        txManager,
                         new GroupImplJpaRepository(jpaRepoConfig)
                 ));
                 bind(GroupFactory.class).toInstance(new GroupFactoryImpl());
                 final CredentialFactoryImpl credentialFactory = new CredentialFactoryImpl();
                 bind(CredentialFactory.class).toInstance(credentialFactory);
+                final SystemPasswordLengthProviderImpl systemMinimumPasswordLengthProvider = new SystemPasswordLengthProviderImpl(new KapuaAuthenticationSetting());
                 final CredentialServiceConfigurationManagerImpl credentialServiceConfigurationManager = new CredentialServiceConfigurationManagerImpl(
+                        txManager,
                         new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                        systemMinimumPasswordLengthProvider,
                         Mockito.mock(RootUserTester.class),
                         new KapuaAuthenticationSetting(),
-                        new XmlUtil(new TestJAXBContextProvider()));
+                        new ResourceBasedServiceConfigurationMetadataProvider(new XmlUtil(new TestJAXBContextProvider())));
                 final CredentialImplJpaRepository credentialRepository = new CredentialImplJpaRepository(jpaRepoConfig);
                 final AuthenticationUtils authenticationUtils = authenticationUtils(new KapuaCryptoSetting());
-                final PasswordValidator passwordValidator = new PasswordValidatorImpl(credentialServiceConfigurationManager);
+                final AccountPasswordLengthProviderImpl accountPasswordLengthProvider = new AccountPasswordLengthProviderImpl(systemMinimumPasswordLengthProvider,
+                        credentialServiceConfigurationManager);
+                final PasswordValidator passwordValidator = new PasswordValidatorImpl(accountPasswordLengthProvider);
 
                 bind(CredentialService.class).toInstance(new CredentialServiceImpl(
                         credentialServiceConfigurationManager,
                         mockedAuthorization,
                         mockPermissionFactory,
-                        new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-authorization"),
+                        txManager,
                         credentialRepository,
                         credentialFactory,
-                        new PasswordValidatorImpl(credentialServiceConfigurationManager), new KapuaAuthenticationSetting(),
-                        new PasswordResetterImpl(
-                                credentialRepository,
-                                new PasswordCredentialTypeHandler(
-                                        new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-authorization"),
-                                        credentialRepository,
-                                        authenticationUtils,
-                                        passwordValidator
-                                ),
-                                new PasswordValidatorImpl(credentialServiceConfigurationManager)),
+                        passwordValidator, new KapuaAuthenticationSetting(),
                         new HashSet<CredentialTypeHandler>() {{
                             add(
-                                new PasswordCredentialTypeHandler(
-                                    new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-authorization"),
-                                    credentialRepository,
-                                    authenticationUtils,
-                                    passwordValidator)
+                                    new PasswordCredentialTypeHandler(
+                                            txManager,
+                                            credentialRepository,
+                                            authenticationUtils,
+                                            passwordValidator)
                             );
                             add(
-                                new ApiKeyCredentialTypeHandler(
-                                    new KapuaAuthenticationSetting(),
-                                    authenticationUtils)
+                                    new ApiKeyCredentialTypeHandler(
+                                            new KapuaAuthenticationSetting(),
+                                            authenticationUtils)
                             );
                             add(new JwtCredentialTypeHandler(authenticationUtils));
-                        }}
+                        }},
+                        accountPasswordLengthProvider,
+                        new PasswordResetterImpl(
+                                credentialRepository,
+                                new PasswordCredentialTypeHandler(
+                                        txManager,
+                                        credentialRepository,
+                                        authenticationUtils,
+                                        passwordValidator
+                                ), passwordValidator)
                 ));
+
                 final UserFactoryImpl userFactory = new UserFactoryImpl();
                 bind(UserFactory.class).toInstance(userFactory);
                 final RootUserTester rootUserTester = Mockito.mock(RootUserTester.class);
diff --git a/service/system/test/src/test/java/org/eclipse/kapua/service/systeminfo/test/SystemInfoLocatorConfiguration.java b/service/system/test/src/test/java/org/eclipse/kapua/service/systeminfo/test/SystemInfoLocatorConfiguration.java
index 6d472a6a28c..4c6eeb797a6 100644
--- a/service/system/test/src/test/java/org/eclipse/kapua/service/systeminfo/test/SystemInfoLocatorConfiguration.java
+++ b/service/system/test/src/test/java/org/eclipse/kapua/service/systeminfo/test/SystemInfoLocatorConfiguration.java
@@ -12,15 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.systeminfo.test;
 
-import com.codahale.metrics.MetricRegistry;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
-import com.google.inject.name.Names;
-import io.cucumber.java.Before;
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -31,7 +23,6 @@
 import org.eclipse.kapua.commons.service.internal.cache.CacheManagerProvider;
 import org.eclipse.kapua.commons.setting.system.SystemSetting;
 import org.eclipse.kapua.locator.KapuaLocator;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.query.QueryFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.service.account.AccountFactory;
@@ -51,13 +42,20 @@
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
+import com.codahale.metrics.MetricRegistry;
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import com.google.inject.name.Names;
+
+import io.cucumber.java.Before;
+
 @Singleton
 public class SystemInfoLocatorConfiguration {
 
     /**
-     * Setup DI with Google Guice DI.
-     * Create mocked and non mocked service under test and bind them with Guice.
-     * It is based on custom MockedLocator locator that is meant for service unit tests.
+     * Setup DI with Google Guice DI. Create mocked and non mocked service under test and bind them with Guice. It is based on custom MockedLocator locator that is meant for service unit tests.
      */
     @Before(value = "@setup", order = 1)
     public void setupDI() {
@@ -92,8 +90,6 @@ protected void configure() {
                 bind(AuthorizationService.class).toInstance(mockedAuthorization);
                 // Inject mocked Permission Factory
                 bind(PermissionFactory.class).toInstance(Mockito.mock(PermissionFactory.class));
-                // Set KapuaMetatypeFactory for Metatype configuration
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
 
                 // binding Account related services
                 bind(AccountService.class).toInstance(Mockito.mock(AccountService.class));
diff --git a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagModule.java b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagModule.java
index 55abc51bb9b..8db25b3cb76 100644
--- a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagModule.java
+++ b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagModule.java
@@ -12,23 +12,15 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.tag.internal;
 
-import javax.inject.Named;
+import java.util.Map;
+
 import javax.inject.Singleton;
 
-import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
-import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
-import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
-import org.eclipse.kapua.commons.configuration.RootUserTester;
-import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
-import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
-import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
 import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
 import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
 import org.eclipse.kapua.commons.model.domains.Domains;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.domain.Domain;
 import org.eclipse.kapua.model.domain.DomainEntry;
@@ -53,11 +45,11 @@ protected void configureModule() {
     TagService tagService(
             PermissionFactory permissionFactory,
             AuthorizationService authorizationService,
-            @Named("TagServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             TagRepository tagRepository,
             TagFactory tagFactory,
             KapuaJpaTxManagerFactory jpaTxManagerFactory) {
-        return new TagServiceImpl(permissionFactory, authorizationService, serviceConfigurationManager,
+        return new TagServiceImpl(permissionFactory, authorizationService, serviceConfigurationManagersByServiceClass.get(TagService.class),
                 jpaTxManagerFactory.create("kapua-tag"),
                 tagRepository,
                 tagFactory);
@@ -68,33 +60,6 @@ public Domain tagDomain() {
         return new DomainEntry(Domains.TAG, TagService.class.getName(), false, Actions.read, Actions.delete, Actions.write);
     }
 
-    @Provides
-    @Singleton
-    @Named("TagServiceConfigurationManager")
-    ServiceConfigurationManager tagServiceConfigurationManager(
-            TagFactory factory,
-            RootUserTester rootUserTester,
-            AccountRelativeFinder accountRelativeFinder,
-            TagRepository tagRepository,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil
-    ) {
-        return new ServiceConfigurationManagerCachingWrapper(
-                new ResourceLimitedServiceConfigurationManagerImpl(
-                        TagService.class.getName(),
-                        new CachingServiceConfigRepository(
-                                new ServiceConfigImplJpaRepository(new KapuaJpaRepositoryConfiguration()),
-                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                        ),
-                        rootUserTester,
-                        accountRelativeFinder,
-                        new UsedEntitiesCounterImpl(
-                                factory,
-                                tagRepository
-                        ),
-                        xmlUtil));
-    }
-
     @Provides
     @Singleton
     TagRepository tagRepository(KapuaJpaRepositoryConfiguration jpaRepoConfig) {
diff --git a/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagServiceConfigurationManagerModule.java b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..fb36f11d584
--- /dev/null
+++ b/service/tag/internal/src/main/java/org/eclipse/kapua/service/tag/internal/TagServiceConfigurationManagerModule.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.tag.internal;
+
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
+import org.eclipse.kapua.commons.model.domains.Domains;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.service.tag.TagFactory;
+import org.eclipse.kapua.service.tag.TagRepository;
+import org.eclipse.kapua.service.tag.TagService;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the TagService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class TagServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(TagService.class)
+    @Singleton
+    ServiceConfigurationManager tagServiceConfigurationManager(
+            KapuaJpaTxManagerFactory jpaTxManagerFactory,
+            TagFactory factory,
+            RootUserTester rootUserTester,
+            AccountRelativeFinder accountRelativeFinder,
+            TagRepository tagRepository,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil
+    ) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new ResourceLimitedServiceConfigurationManagerImpl(
+                        TagService.class.getName(),
+                        Domains.TAG,
+                        jpaTxManagerFactory.create("kapua-tag"),
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(new KapuaJpaRepositoryConfiguration()),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        rootUserTester,
+                        accountRelativeFinder,
+                        new UsedEntitiesCounterImpl(
+                                factory,
+                                tagRepository
+                        ),
+                        new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)));
+    }
+}
diff --git a/service/tag/test/src/test/java/org/eclipse/kapua/service/tag/test/TagLocatorConfiguration.java b/service/tag/test/src/test/java/org/eclipse/kapua/service/tag/test/TagLocatorConfiguration.java
index f867da80f3f..4c939064cbf 100644
--- a/service/tag/test/src/test/java/org/eclipse/kapua/service/tag/test/TagLocatorConfiguration.java
+++ b/service/tag/test/src/test/java/org/eclipse/kapua/service/tag/test/TagLocatorConfiguration.java
@@ -12,18 +12,14 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.tag.test;
 
-import com.codahale.metrics.MetricRegistry;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
-import com.google.inject.name.Names;
-import io.cucumber.java.Before;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -41,7 +37,6 @@
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.message.KapuaMessageFactory;
 import org.eclipse.kapua.message.internal.KapuaMessageFactoryImpl;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.query.QueryFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.service.account.AccountFactory;
@@ -87,15 +82,21 @@
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
-import java.util.Collections;
+import com.codahale.metrics.MetricRegistry;
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import com.google.inject.multibindings.MapBinder;
+import com.google.inject.name.Names;
+
+import io.cucumber.java.Before;
 
 @Singleton
 public class TagLocatorConfiguration {
 
     /**
-     * Setup DI with Google Guice DI.
-     * Create mocked and non mocked service under test and bind them with Guice.
-     * It is based on custom MockedLocator locator that is meant for service unit tests.
+     * Setup DI with Google Guice DI. Create mocked and non mocked service under test and bind them with Guice. It is based on custom MockedLocator locator that is meant for service unit tests.
      */
     @Before(value = "@setup", order = 1)
     public void setupDI() {
@@ -133,26 +134,26 @@ protected void configure() {
                 }
                 bind(QueryFactory.class).toInstance(new QueryFactoryImpl());
 
-                // Set KapuaMetatypeFactory for Metatype configuration
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
-
                 // binding Account related services
                 bind(AccountRelativeFinder.class).toInstance(Mockito.mock(AccountRelativeFinder.class));
                 bind(AccountService.class).toInstance(Mockito.mock(AccountService.class));
                 bind(AccountFactory.class).toInstance(Mockito.spy(new AccountFactoryImpl()));
                 bind(RootUserTester.class).toInstance(Mockito.mock(RootUserTester.class));
 
-                bind(ServiceConfigurationManager.class)
-                        .annotatedWith(Names.named("DeviceConnectionServiceConfigurationManager"))
+                final MapBinder<Class, ServiceConfigurationManager> serviceConfigurationManagerMapBinder = MapBinder.newMapBinder(binder(), Class.class, ServiceConfigurationManager.class);
+
+                serviceConfigurationManagerMapBinder.addBinding(DeviceConnectionService.class)
                         .toInstance(Mockito.mock(ServiceConfigurationManager.class));
 
                 // Inject actual Device service related services
                 final KapuaJpaRepositoryConfiguration jpaRepoConfig = new KapuaJpaRepositoryConfiguration();
                 final EventStorer eventStorer = new EventStorerImpl(new EventStoreRecordImplJpaRepository(jpaRepoConfig));
                 bind(TagRepository.class).toInstance(new TagImplJpaRepository(jpaRepoConfig));
+                final Map<Class<?>, ServiceConfigurationManager> classServiceConfigurationManagerMap = new HashMap<>();
+                classServiceConfigurationManagerMap.put(DeviceConnectionService.class, Mockito.mock(ServiceConfigurationManager.class));
 
                 final DeviceConnectionServiceImpl deviceConnectionService = new DeviceConnectionServiceImpl(
-                        Mockito.mock(ServiceConfigurationManager.class),
+                        classServiceConfigurationManagerMap,
                         mockedAuthorization,
                         permissionFactory,
                         new DeviceConnectionFactoryImpl(),
@@ -170,7 +171,8 @@ protected void configure() {
                         new DeviceEventImplJpaRepository(jpaRepoConfig)
                 );
 
-                final DeviceValidation deviceValidation = new DeviceValidationImpl(new KapuaDeviceRegistrySettings().getInt(KapuaDeviceRegistrySettingKeys.DEVICE_LIFECYCLE_BIRTH_VAR_FIELDS_LENGTH_MAX),
+                final DeviceValidation deviceValidation = new DeviceValidationImpl(
+                        new KapuaDeviceRegistrySettings().getInt(KapuaDeviceRegistrySettingKeys.DEVICE_LIFECYCLE_BIRTH_VAR_FIELDS_LENGTH_MAX),
                         new KapuaDeviceRegistrySettings().getInt(KapuaDeviceRegistrySettingKeys.DEVICE_LIFECYCLE_BIRTH_EXTENDED_PROPERTIES_LENGTH_MAX),
                         mockedAuthorization,
                         permissionFactory,
@@ -200,16 +202,7 @@ protected void configure() {
                                 deviceValidation)
                 );
                 bind(DeviceFactory.class).toInstance(new DeviceFactoryImpl());
-
-                bind(DeviceConnectionService.class).toInstance(new DeviceConnectionServiceImpl(
-                        Mockito.mock(ServiceConfigurationManager.class),
-                        mockedAuthorization,
-                        permissionFactory,
-                        new DeviceConnectionFactoryImpl(),
-                        new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-device"),
-                        new DeviceConnectionImplJpaRepository(jpaRepoConfig),
-                        Collections.emptyMap(),
-                        eventStorer));
+                bind(DeviceConnectionService.class).toInstance(deviceConnectionService);
                 bind(DeviceConnectionFactory.class).to(DeviceConnectionFactoryImpl.class);
 
                 bind(DeviceRepository.class).toInstance(new DeviceImplJpaRepository(jpaRepoConfig));
diff --git a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserModule.java b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserModule.java
index dff254c3bf4..2a66764a54e 100644
--- a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserModule.java
+++ b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserModule.java
@@ -12,22 +12,17 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.user.internal;
 
+import java.util.Map;
+
 import javax.inject.Named;
 import javax.inject.Singleton;
 
-import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
-import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
-import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.RootUserTesterImpl;
-import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
-import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
-import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
 import org.eclipse.kapua.commons.core.AbstractKapuaModule;
 import org.eclipse.kapua.commons.core.ServiceModule;
 import org.eclipse.kapua.commons.event.ServiceEventHouseKeeperFactoryImpl;
-import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
 import org.eclipse.kapua.commons.jpa.EventStorer;
 import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
 import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
@@ -36,7 +31,6 @@
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreFactory;
 import org.eclipse.kapua.commons.service.event.store.api.EventStoreRecordRepository;
 import org.eclipse.kapua.commons.service.event.store.internal.EventStoreServiceImpl;
-import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.event.ServiceEventBus;
 import org.eclipse.kapua.event.ServiceEventBusException;
 import org.eclipse.kapua.model.domain.Actions;
@@ -76,7 +70,7 @@ public Domain userDomain() {
     @Provides
     @Singleton
     public UserService userService(
-            @Named("UserServiceConfigurationManager") ServiceConfigurationManager serviceConfigurationManager,
+            Map<Class<?>, ServiceConfigurationManager> serviceConfigurationManagersByServiceClass,
             AuthorizationService authorizationService,
             PermissionFactory permissionFactory,
             UserRepository userRepository,
@@ -84,7 +78,7 @@ public UserService userService(
             EventStorer eventStorer,
             KapuaJpaTxManagerFactory jpaTxManagerFactory) {
         return new UserServiceImpl(
-                serviceConfigurationManager,
+                serviceConfigurationManagersByServiceClass.get(UserService.class),
                 authorizationService,
                 permissionFactory,
                 jpaTxManagerFactory.create("kapua-user"),
@@ -121,33 +115,6 @@ public ServiceModule userServiceModule(UserService userService,
                 eventModuleName);
     }
 
-    @Provides
-    @Singleton
-    @Named("UserServiceConfigurationManager")
-    ServiceConfigurationManager userServiceConfigurationManager(
-            UserFactory userFactory,
-            RootUserTester rootUserTester,
-            AccountRelativeFinder accountRelativeFinder,
-            UserRepository userRepository,
-            KapuaJpaRepositoryConfiguration jpaRepoConfig,
-            EntityCacheFactory entityCacheFactory,
-            XmlUtil xmlUtil
-    ) {
-        return new ServiceConfigurationManagerCachingWrapper(
-                new ResourceLimitedServiceConfigurationManagerImpl(UserService.class.getName(),
-                        new CachingServiceConfigRepository(
-                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
-                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
-                        ),
-                        rootUserTester,
-                        accountRelativeFinder,
-                        new UsedEntitiesCounterImpl(
-                                userFactory,
-                                userRepository
-                        ),
-                        xmlUtil));
-    }
-
     @Provides
     @Singleton
     UserRepository userRepository(NamedCacheFactory namedCacheFactory, KapuaJpaRepositoryConfiguration jpaRepoConfig) {
diff --git a/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceConfigurationManagerModule.java b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceConfigurationManagerModule.java
new file mode 100644
index 00000000000..b64ed24b26b
--- /dev/null
+++ b/service/user/internal/src/main/java/org/eclipse/kapua/service/user/internal/UserServiceConfigurationManagerModule.java
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2021, 2022 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.kapua.service.user.internal;
+
+import javax.inject.Singleton;
+
+import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.CachingServiceConfigRepository;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
+import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
+import org.eclipse.kapua.commons.configuration.RootUserTester;
+import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManager;
+import org.eclipse.kapua.commons.configuration.ServiceConfigurationManagerCachingWrapper;
+import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
+import org.eclipse.kapua.commons.core.AbstractKapuaModule;
+import org.eclipse.kapua.commons.jpa.EntityCacheFactory;
+import org.eclipse.kapua.commons.jpa.KapuaJpaRepositoryConfiguration;
+import org.eclipse.kapua.commons.jpa.KapuaJpaTxManagerFactory;
+import org.eclipse.kapua.commons.model.domains.Domains;
+import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.service.user.UserFactory;
+import org.eclipse.kapua.service.user.UserRepository;
+import org.eclipse.kapua.service.user.UserService;
+
+import com.google.inject.Module;
+import com.google.inject.multibindings.ClassMapKey;
+import com.google.inject.multibindings.ProvidesIntoMap;
+
+/**
+ * This module provides the ServiceConfigurationManager for the UserService.
+ * <br><br>
+ * Unfortunately Guice does not support overriding for Map binder entries, therefore if you need to change the behaviour of this ServiceConfigurationManager, just skip this module and define the new
+ * instance in a separate one
+ */
+public class UserServiceConfigurationManagerModule extends AbstractKapuaModule implements Module {
+
+    @Override
+    protected void configureModule() {
+    }
+
+    @ProvidesIntoMap
+    @ClassMapKey(UserService.class)
+    @Singleton
+    ServiceConfigurationManager userServiceConfigurationManager(
+            KapuaJpaTxManagerFactory jpaTxManagerFactory,
+            UserFactory userFactory,
+            RootUserTester rootUserTester,
+            AccountRelativeFinder accountRelativeFinder,
+            UserRepository userRepository,
+            KapuaJpaRepositoryConfiguration jpaRepoConfig,
+            EntityCacheFactory entityCacheFactory,
+            XmlUtil xmlUtil
+    ) {
+        return new ServiceConfigurationManagerCachingWrapper(
+                new ResourceLimitedServiceConfigurationManagerImpl(UserService.class.getName(),
+                        Domains.USER,
+                        jpaTxManagerFactory.create("kapua-user"),
+                        new CachingServiceConfigRepository(
+                                new ServiceConfigImplJpaRepository(jpaRepoConfig),
+                                entityCacheFactory.createCache("AbstractKapuaConfigurableServiceCacheId")
+                        ),
+                        rootUserTester,
+                        accountRelativeFinder,
+                        new UsedEntitiesCounterImpl(
+                                userFactory,
+                                userRepository
+                        ),
+                        new ResourceBasedServiceConfigurationMetadataProvider(xmlUtil)));
+    }
+}
diff --git a/service/user/test/src/test/java/org/eclipse/kapua/service/user/test/UserLocatorConfiguration.java b/service/user/test/src/test/java/org/eclipse/kapua/service/user/test/UserLocatorConfiguration.java
index 39e9e78e324..2e5aa40ea45 100644
--- a/service/user/test/src/test/java/org/eclipse/kapua/service/user/test/UserLocatorConfiguration.java
+++ b/service/user/test/src/test/java/org/eclipse/kapua/service/user/test/UserLocatorConfiguration.java
@@ -14,11 +14,11 @@
 
 import org.eclipse.kapua.KapuaException;
 import org.eclipse.kapua.commons.configuration.AccountRelativeFinder;
+import org.eclipse.kapua.commons.configuration.ResourceBasedServiceConfigurationMetadataProvider;
 import org.eclipse.kapua.commons.configuration.ResourceLimitedServiceConfigurationManagerImpl;
 import org.eclipse.kapua.commons.configuration.RootUserTester;
 import org.eclipse.kapua.commons.configuration.ServiceConfigImplJpaRepository;
 import org.eclipse.kapua.commons.configuration.UsedEntitiesCounterImpl;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -28,13 +28,13 @@
 import org.eclipse.kapua.commons.metric.CommonsMetric;
 import org.eclipse.kapua.commons.metric.MetricsService;
 import org.eclipse.kapua.commons.metric.MetricsServiceImpl;
+import org.eclipse.kapua.commons.model.domains.Domains;
 import org.eclipse.kapua.commons.model.query.QueryFactoryImpl;
 import org.eclipse.kapua.commons.service.event.store.internal.EventStoreRecordImplJpaRepository;
 import org.eclipse.kapua.commons.service.internal.cache.CacheManagerProvider;
 import org.eclipse.kapua.commons.setting.system.SystemSetting;
 import org.eclipse.kapua.commons.util.xml.XmlUtil;
 import org.eclipse.kapua.locator.KapuaLocator;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.query.QueryFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.qa.common.TestJAXBContextProvider;
@@ -52,6 +52,7 @@
 import org.eclipse.kapua.service.user.internal.UserFactoryImpl;
 import org.eclipse.kapua.service.user.internal.UserImplJpaRepository;
 import org.eclipse.kapua.service.user.internal.UserServiceImpl;
+import org.eclipse.kapua.storage.TxManager;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
@@ -107,8 +108,6 @@ protected void configure() {
                 // Inject mocked Permission Factory
                 PermissionFactory mockPermissionFactory = Mockito.mock(PermissionFactory.class);
                 bind(PermissionFactory.class).toInstance(mockPermissionFactory);
-                // Set KapuaMetatypeFactory for Metatype configuration
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
 
                 // binding Account related services
                 final AccountRelativeFinder accountRelativeFinder = Mockito.mock(AccountRelativeFinder.class);
@@ -121,21 +120,25 @@ protected void configure() {
                 bind(RootUserTester.class).toInstance(mockRootUserTester);
                 final UserRepository userRepository = Mockito.mock(UserRepository.class);
                 final KapuaJpaRepositoryConfiguration jpaRepoConfig = new KapuaJpaRepositoryConfiguration();
-                final ResourceLimitedServiceConfigurationManagerImpl userConfigurationManager = new ResourceLimitedServiceConfigurationManagerImpl(UserService.class.getName(),
+                final TxManager txManager = new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-user");
+                final ResourceLimitedServiceConfigurationManagerImpl userConfigurationManager = new ResourceLimitedServiceConfigurationManagerImpl(
+                        UserService.class.getName(),
+                        Domains.USER,
+                        txManager,
                         new ServiceConfigImplJpaRepository(jpaRepoConfig),
                         Mockito.mock(RootUserTester.class),
                         accountRelativeFinder,
                         new UsedEntitiesCounterImpl(
                                 userFactory,
                                 userRepository),
-                        new XmlUtil(new TestJAXBContextProvider())
+                        new ResourceBasedServiceConfigurationMetadataProvider(new XmlUtil(new TestJAXBContextProvider()))
                 );
                 bind(UserService.class).toInstance(
                         new UserServiceImpl(
                                 userConfigurationManager,
                                 mockedAuthorization,
                                 mockPermissionFactory,
-                                new KapuaJpaTxManagerFactory(maxInsertAttempts).create("kapua-user"),
+                                txManager,
                                 new UserImplJpaRepository(jpaRepoConfig),
                                 userFactory,
                                 new EventStorerImpl(new EventStoreRecordImplJpaRepository(jpaRepoConfig)))
diff --git a/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kapua/kura/TranslatorAppConfigurationKapuaKura.java b/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kapua/kura/TranslatorAppConfigurationKapuaKura.java
index 00e30e04639..461152995ba 100644
--- a/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kapua/kura/TranslatorAppConfigurationKapuaKura.java
+++ b/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kapua/kura/TranslatorAppConfigurationKapuaKura.java
@@ -20,14 +20,12 @@
 
 import javax.inject.Inject;
 
-import org.eclipse.kapua.commons.configuration.metatype.Password;
-import org.eclipse.kapua.commons.configuration.metatype.TadImpl;
-import org.eclipse.kapua.commons.configuration.metatype.TiconImpl;
-import org.eclipse.kapua.commons.configuration.metatype.TocdImpl;
-import org.eclipse.kapua.commons.configuration.metatype.ToptionImpl;
 import org.eclipse.kapua.commons.util.xml.XmlUtil;
+import org.eclipse.kapua.model.config.metatype.KapuaTad;
 import org.eclipse.kapua.model.config.metatype.KapuaTicon;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
+import org.eclipse.kapua.model.config.metatype.KapuaToption;
+import org.eclipse.kapua.model.config.metatype.Password;
 import org.eclipse.kapua.service.device.call.kura.model.configuration.ConfigurationMetrics;
 import org.eclipse.kapua.service.device.call.kura.model.configuration.KuraDeviceComponentConfiguration;
 import org.eclipse.kapua.service.device.call.kura.model.configuration.KuraDeviceConfiguration;
@@ -136,14 +134,14 @@ protected KuraDeviceConfiguration translate(DeviceConfiguration kapuaDeviceConfi
     }
 
     protected KapuaTocd translate(KapuaTocd kapuaDefinition) {
-        TocdImpl definition = new TocdImpl();
+        KapuaTocd definition = new KapuaTocd();
 
         definition.setId(kapuaDefinition.getId());
         definition.setName(kapuaDefinition.getName());
         definition.setDescription(kapuaDefinition.getDescription());
 
         kapuaDefinition.getAD().forEach(kapuaAd -> {
-            TadImpl ad = new TadImpl();
+            KapuaTad ad = new KapuaTad();
             ad.setCardinality(kapuaAd.getCardinality());
             ad.setDefault(ad.getDefault());
             ad.setDescription(kapuaAd.getDescription());
@@ -155,7 +153,7 @@ protected KapuaTocd translate(KapuaTocd kapuaDefinition) {
             ad.setRequired(kapuaAd.isRequired());
 
             kapuaAd.getOption().forEach(kuraToption -> {
-                ToptionImpl kapuaToption = new ToptionImpl();
+                KapuaToption kapuaToption = new KapuaToption();
                 kapuaToption.setLabel(kuraToption.getLabel());
                 kapuaToption.setValue(kuraToption.getValue());
                 ad.addOption(kapuaToption);
@@ -167,7 +165,7 @@ protected KapuaTocd translate(KapuaTocd kapuaDefinition) {
         });
 
         kapuaDefinition.getIcon().forEach(kapuaIcon -> {
-            KapuaTicon icon = new TiconImpl();
+            KapuaTicon icon = new KapuaTicon();
             icon.setResource(kapuaIcon.getResource());
             icon.setSize(kapuaIcon.getSize());
 
diff --git a/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kura/kapua/TranslatorAppConfigurationKuraKapua.java b/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kura/kapua/TranslatorAppConfigurationKuraKapua.java
index aa0759627ef..6dcdc885cfd 100644
--- a/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kura/kapua/TranslatorAppConfigurationKuraKapua.java
+++ b/translator/kapua/kura/src/main/java/org/eclipse/kapua/translator/kura/kapua/TranslatorAppConfigurationKuraKapua.java
@@ -13,13 +13,16 @@
  *******************************************************************************/
 package org.eclipse.kapua.translator.kura.kapua;
 
-import org.eclipse.kapua.commons.configuration.metatype.Password;
-import org.eclipse.kapua.commons.configuration.metatype.TadImpl;
-import org.eclipse.kapua.commons.configuration.metatype.TiconImpl;
-import org.eclipse.kapua.commons.configuration.metatype.TocdImpl;
-import org.eclipse.kapua.commons.configuration.metatype.ToptionImpl;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import org.eclipse.kapua.model.config.metatype.KapuaTad;
 import org.eclipse.kapua.model.config.metatype.KapuaTicon;
 import org.eclipse.kapua.model.config.metatype.KapuaTocd;
+import org.eclipse.kapua.model.config.metatype.KapuaToption;
+import org.eclipse.kapua.model.config.metatype.Password;
 import org.eclipse.kapua.service.device.call.kura.model.configuration.ConfigurationMetrics;
 import org.eclipse.kapua.service.device.call.kura.model.configuration.KuraDeviceComponentConfiguration;
 import org.eclipse.kapua.service.device.call.kura.model.configuration.KuraDeviceConfiguration;
@@ -37,10 +40,6 @@
 import org.eclipse.kapua.translator.exception.InvalidChannelException;
 import org.eclipse.kapua.translator.exception.InvalidPayloadException;
 
-import javax.inject.Inject;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * {@link org.eclipse.kapua.translator.Translator} implementation from {@link KuraResponseMessage} to {@link ConfigurationResponseMessage}
  *
@@ -104,14 +103,14 @@ private DeviceConfiguration translate(KuraDeviceConfiguration kuraDeviceConfigur
     }
 
     private KapuaTocd translate(KapuaTocd kuraDefinition) {
-        TocdImpl definition = new TocdImpl();
+        KapuaTocd definition = new KapuaTocd();
 
         definition.setId(kuraDefinition.getId());
         definition.setName(kuraDefinition.getName());
         definition.setDescription(kuraDefinition.getDescription());
 
         kuraDefinition.getAD().forEach(kuraAd -> {
-            TadImpl ad = new TadImpl();
+            KapuaTad ad = new KapuaTad();
             ad.setCardinality(kuraAd.getCardinality());
             ad.setDefault(ad.getDefault());
             ad.setDescription(kuraAd.getDescription());
@@ -123,7 +122,7 @@ private KapuaTocd translate(KapuaTocd kuraDefinition) {
             ad.setRequired(kuraAd.isRequired());
 
             kuraAd.getOption().forEach(kuraToption -> {
-                ToptionImpl kapuaToption = new ToptionImpl();
+                KapuaToption kapuaToption = new KapuaToption();
                 kapuaToption.setLabel(kuraToption.getLabel());
                 kapuaToption.setValue(kuraToption.getValue());
                 ad.addOption(kapuaToption);
@@ -134,7 +133,7 @@ private KapuaTocd translate(KapuaTocd kuraDefinition) {
         });
 
         kuraDefinition.getIcon().forEach(kuraIcon -> {
-            KapuaTicon icon = new TiconImpl();
+            KapuaTicon icon = new KapuaTicon();
             icon.setResource(kuraIcon.getResource());
             icon.setSize(kuraIcon.getSize());
             definition.addIcon(icon);
diff --git a/translator/test/src/test/java/org/eclipse/kapua/translator/test/TranslatorLocatorConfiguration.java b/translator/test/src/test/java/org/eclipse/kapua/translator/test/TranslatorLocatorConfiguration.java
index 5b70d86b0d8..8b84694b410 100644
--- a/translator/test/src/test/java/org/eclipse/kapua/translator/test/TranslatorLocatorConfiguration.java
+++ b/translator/test/src/test/java/org/eclipse/kapua/translator/test/TranslatorLocatorConfiguration.java
@@ -13,7 +13,6 @@
 package org.eclipse.kapua.translator.test;
 
 import org.eclipse.kapua.KapuaException;
-import org.eclipse.kapua.commons.configuration.metatype.KapuaMetatypeFactoryImpl;
 import org.eclipse.kapua.commons.crypto.CryptoUtil;
 import org.eclipse.kapua.commons.crypto.CryptoUtilImpl;
 import org.eclipse.kapua.commons.crypto.setting.CryptoSettings;
@@ -28,7 +27,6 @@
 import org.eclipse.kapua.message.KapuaMessageFactory;
 import org.eclipse.kapua.message.device.data.KapuaDataMessageFactory;
 import org.eclipse.kapua.message.internal.KapuaMessageFactoryImpl;
-import org.eclipse.kapua.model.config.metatype.KapuaMetatypeFactory;
 import org.eclipse.kapua.model.id.KapuaIdFactory;
 import org.eclipse.kapua.qa.common.MockedLocator;
 import org.eclipse.kapua.qa.common.TestJAXBContextProvider;
@@ -116,8 +114,6 @@ protected void configure() {
                 bind(DeviceConfigurationFactory.class).toInstance(Mockito.mock(DeviceConfigurationFactory.class));
                 bind(DeviceInventoryManagementFactory.class).toInstance(Mockito.mock(DeviceInventoryManagementFactory.class));
                 bind(DeviceKeystoreManagementFactory.class).toInstance(Mockito.mock(DeviceKeystoreManagementFactory.class));
-                // Set KapuaMetatypeFactory for Metatype configuration
-                bind(KapuaMetatypeFactory.class).toInstance(new KapuaMetatypeFactoryImpl());
             }
         };