diff --git a/mycore-base/src/main/java/org/mycore/backend/jpa/MCRJPAConfigurationCheck.java b/mycore-base/src/main/java/org/mycore/backend/jpa/MCRJPAConfigurationCheck.java
index 312d8f61cd..003c04b427 100644
--- a/mycore-base/src/main/java/org/mycore/backend/jpa/MCRJPAConfigurationCheck.java
+++ b/mycore-base/src/main/java/org/mycore/backend/jpa/MCRJPAConfigurationCheck.java
@@ -34,7 +34,7 @@
 import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
 import org.hibernate.jpa.boot.spi.PersistenceXmlParser;
 import org.mycore.common.config.MCRConfiguration2;
-import org.mycore.common.config.MCRInstanceName;
+import org.mycore.common.config.instantiator.MCRInstanceName;
 import org.mycore.common.events.MCRStartupHandler.AutoExecutable;
 import org.mycore.resource.MCRResourceResolver;
 import org.mycore.resource.provider.MCRResourceProvider;
diff --git a/mycore-base/src/main/java/org/mycore/common/MCRBasicObjectExpander.java b/mycore-base/src/main/java/org/mycore/common/MCRBasicObjectExpander.java
index 4b2935c1f5..23f2dc6a4b 100644
--- a/mycore-base/src/main/java/org/mycore/common/MCRBasicObjectExpander.java
+++ b/mycore-base/src/main/java/org/mycore/common/MCRBasicObjectExpander.java
@@ -124,8 +124,8 @@ private void expandClassifications(MCRObject mcrObject) {
 
     public static final class Factory implements Supplier<MCRBasicObjectExpander> {
 
-        @MCRInstance(name = CLASSIFICATION_MAPPER_KEY, valueClass = MCRClassificationMapper.class, required = false,
-                sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstance(name = CLASSIFICATION_MAPPER_KEY, valueClass = MCRClassificationMapper.class, required = false)
         public MCRClassificationMapper classificationMapper;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/common/MCRClassTools.java b/mycore-base/src/main/java/org/mycore/common/MCRClassTools.java
index 616005f304..29cd62f9ec 100644
--- a/mycore-base/src/main/java/org/mycore/common/MCRClassTools.java
+++ b/mycore-base/src/main/java/org/mycore/common/MCRClassTools.java
@@ -51,20 +51,18 @@ public static Object loadClassFromURL(File file, String className)
 
     /**
      * Loads a class via default ClassLoader or <code>Thread.currentThread().getContextClassLoader()</code>.
-     * @param classname Name of class
+     * @param className Name of class
      * @param <T> Type of Class
      * @return the initialized class
      * @throws ClassNotFoundException if both ClassLoader cannot load the Class
      */
-    public static <T> Class<? extends T> forName(String classname) throws ClassNotFoundException {
-        @SuppressWarnings("unchecked")
-        Class<? extends T> forName;
+    @SuppressWarnings("unchecked")
+    public static <T> Class<? extends T> forName(String className) throws ClassNotFoundException {
         try {
-            forName = (Class<? extends T>) Class.forName(classname);
+            return (Class<? extends T>) Class.forName(className);
         } catch (ClassNotFoundException cnfe) {
-            forName = (Class<? extends T>) Class.forName(classname, true, extendedClassLoader);
+            return (Class<? extends T>) Class.forName(className, true, extendedClassLoader);
         }
-        return forName;
     }
 
     /**
diff --git a/mycore-base/src/main/java/org/mycore/common/MCRJSONManager.java b/mycore-base/src/main/java/org/mycore/common/MCRJSONManager.java
index 8511084fe7..d2a28ba4af 100644
--- a/mycore-base/src/main/java/org/mycore/common/MCRJSONManager.java
+++ b/mycore-base/src/main/java/org/mycore/common/MCRJSONManager.java
@@ -107,8 +107,8 @@ public GsonBuilder createGsonBuilder() {
 
     public static class Factory implements Supplier<MCRJSONManager> {
 
-        @MCRInstanceMap(name = TYPE_ADAPTERS_KEY, valueClass = MCRJSONTypeAdapter.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = TYPE_ADAPTERS_KEY, valueClass = MCRJSONTypeAdapter.class, required = false)
         public Map<String, MCRJSONTypeAdapter<?>> typeAdapters;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/common/MCRUserInformationResolver.java b/mycore-base/src/main/java/org/mycore/common/MCRUserInformationResolver.java
index fb29d9e2ee..28eaf0ab50 100644
--- a/mycore-base/src/main/java/org/mycore/common/MCRUserInformationResolver.java
+++ b/mycore-base/src/main/java/org/mycore/common/MCRUserInformationResolver.java
@@ -142,7 +142,8 @@ public static String getSpecification(String schema, String userId) {
 
     public static class Factory implements Supplier<MCRUserInformationResolver> {
 
-        @MCRInstanceMap(name = PROVIDERS_KEY, valueClass = MCRUserInformationProvider.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = PROVIDERS_KEY, valueClass = MCRUserInformationProvider.class)
         public Map<String, MCRUserInformationProvider> providers;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurableInstanceHelper.java b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurableInstanceHelper.java
deleted file mode 100644
index bba78b98f0..0000000000
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurableInstanceHelper.java
+++ /dev/null
@@ -1,1845 +0,0 @@
-/*
- * This file is part of ***  M y C o R e  ***
- * See https://www.mycore.de/ for details.
- *
- * MyCoRe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * MyCoRe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.mycore.common.config;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Supplier;
-import java.util.function.ToIntFunction;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.mycore.common.MCRClassTools;
-import org.mycore.common.config.annotation.MCRConfigurationProxy;
-import org.mycore.common.config.annotation.MCRFactory;
-import org.mycore.common.config.annotation.MCRInstance;
-import org.mycore.common.config.annotation.MCRInstanceList;
-import org.mycore.common.config.annotation.MCRInstanceMap;
-import org.mycore.common.config.annotation.MCRPostConstruction;
-import org.mycore.common.config.annotation.MCRProperty;
-import org.mycore.common.config.annotation.MCRPropertyList;
-import org.mycore.common.config.annotation.MCRPropertyMap;
-import org.mycore.common.config.annotation.MCRRawProperties;
-import org.mycore.common.config.annotation.MCRSentinel;
-
-import jakarta.inject.Singleton;
-
-/**
- * Creates Objects which are configured with properties.
- *
- * @author Sebastian Hofmann
- */
-@SuppressWarnings({ "PMD.AvoidDuplicateLiterals", "PMD.SingleMethodSingleton",
-    "PMD.MCR.Singleton.MethodModifiers", "PMD.MCR.Singleton.MethodReturnType",
-    "PMD.MCR.Singleton.ClassModifiers", "PMD.MCR.Singleton.PrivateConstructor",
-    "PMD.MCR.Singleton.NonPrivateConstructors",
-})
-class MCRConfigurableInstanceHelper {
-
-    private static final Logger LOGGER = LogManager.getLogger();
-
-    public static final Set<Option> NO_OPTIONS = Collections.emptySet();
-
-    public static final Set<Option> ADD_IMPLICIT_CLASS_PROPERTIES =
-        Collections.singleton(Option.ADD_IMPLICIT_CLASS_PROPERTIES);
-
-    private static final ConcurrentMap<Class<?>, ClassInfo<?>> INFOS = new ConcurrentHashMap<>();
-
-    private static final ConcurrentMap<String, MCRInstanceConfiguration> CONFIG_CACHE = new ConcurrentHashMap<>();
-
-    static {
-        MCRConfiguration2.addPropertyChangeEventLister(
-            key -> true,
-            (name, oldVal, newVal) -> CONFIG_CACHE.clear());
-    }
-
-    /**
-     * Checks if a class is annotated with {@link Singleton}.
-     *
-     * @param property the configuration property which contains the class
-     * @return true if the class in the property is annotated with {@link Singleton}
-     */
-    public static boolean isSingleton(String property) {
-        return MCRConfiguration2.getString(property).stream()
-            .anyMatch(propertyVal -> isSingleton(getClass(property, propertyVal)));
-    }
-
-    /**
-     * Checks if a class is annotated with {@link Singleton}.
-     *
-     * @param targetClass the class
-     * @return true if the class in the property is annotated with {@link Singleton}
-     */
-    public static boolean isSingleton(Class<?> targetClass) {
-        return targetClass.getDeclaredAnnotation(Singleton.class) != null;
-    }
-
-    /**
-     * Shorthand for {@link #getInstance(Class, String, Set)} that uses no options.
-     */
-    public static <S> Optional<S> getInstance(Class<S> superClass, String name) throws MCRConfigurationException {
-        return getInstance(superClass, name, NO_OPTIONS);
-    }
-
-    /**
-     * Creates a configured instance of a class.
-     *
-     * @param superClass the intended super class of the instantiated class
-     * @param name       the property which contains the class name
-     * @param options    the options to be used
-     * @return the configured instance of T
-     * @throws MCRConfigurationException if the property is not right configured.
-     */
-    public static <S> Optional<S> getInstance(Class<S> superClass, String name, Set<Option> options)
-        throws MCRConfigurationException {
-        MCRInstanceConfiguration configuration = CONFIG_CACHE.computeIfAbsent(name, MCRInstanceConfiguration::ofName);
-        String className = configuration.className();
-        if (isAbsent(className) && !options.contains(Option.ADD_IMPLICIT_CLASS_PROPERTIES)) {
-            return Optional.empty();
-        }
-        return Optional.of(getInstance(superClass, configuration, name, options));
-    }
-
-    private static boolean isAbsent(String className) {
-        return className == null || className.isBlank();
-    }
-
-    /**
-     * Shorthand for {@link #getInstance(Class, MCRInstanceConfiguration, Set)} that uses no options.
-     */
-    public static <S> S getInstance(Class<S> superClass, MCRInstanceConfiguration configuration)
-        throws MCRConfigurationException {
-        return getInstance(superClass, configuration, NO_OPTIONS);
-    }
-
-    /**
-     * Creates a configured instance of a class.
-     *
-     * @param superClass    the intended super class of the instantiated class
-     * @param configuration the configuration to be used
-     * @param options       the options to be used
-     * @return the configured instance of T
-     * @throws MCRConfigurationException if the property is not right configured.
-     */
-    public static <S> S getInstance(Class<S> superClass, MCRInstanceConfiguration configuration,
-        Set<Option> options) throws MCRConfigurationException {
-        return getInstance(superClass, configuration, null, options);
-    }
-
-    private static <S> S getInstance(Class<S> superClass, MCRInstanceConfiguration configuration, String name,
-        Set<Option> options) throws MCRConfigurationException {
-        String className = configuration.className();
-        if (className == null) {
-            boolean classIsImplicit = Modifier.isFinal(superClass.getModifiers());
-            boolean useImplicitClass = options.contains(Option.ADD_IMPLICIT_CLASS_PROPERTIES);
-            if (classIsImplicit && useImplicitClass) {
-                configuration = configuration.withClass(superClass);
-                if (LOGGER.isInfoEnabled()) {
-                    LOGGER.info("[IMPLICIT] Adding implicit class property {}={}",
-                        configuration.name().actual(), configuration.className());
-                }
-            } else {
-                throw new MCRConfigurationException("Missing property: " + configuration.name().actual()
-                    + " (and instance is not required or expected class " + superClass.getName() + " is not final, " +
-                    "therefore, the class name cannot be determined implicitly)");
-            }
-        } else if (className.isBlank()) {
-            throw new MCRConfigurationException("Empty property: " + configuration.name().actual()
-                + " (and instance is not required or expected class " + superClass.getName() + " is not final, " +
-                "therefore, the class name cannot be determined implicitly)");
-
-        }
-        Class<S> targetClass = getClass(configuration.name().actual(), configuration.className());
-        Object instance = createInstanceDirectOrViaProxy(targetClass, configuration);
-        if (superClass.isAssignableFrom(instance.getClass())) {
-            return superClass.cast(instance);
-        } else {
-            throw new MCRConfigurationException("Instance of class " + instance.getClass().getName()
-                + " is incompatible with intended super class " + superClass.getName()
-                + (name != null ? " in configured class " + name : ""));
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <T> Class<T> getClass(String property, String className) {
-        try {
-            return (Class<T>) MCRClassTools.forName(className);
-        } catch (ClassNotFoundException e) {
-            throw new MCRConfigurationException("Missing class (" + className + ") configured in property: "
-                + property, e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <T> T createInstanceDirectOrViaProxy(Class<T> targetClass, MCRInstanceConfiguration configuration) {
-        MCRConfigurationProxy productAnnotation = targetClass.getDeclaredAnnotation(MCRConfigurationProxy.class);
-        if (productAnnotation != null) {
-            Class<Supplier<T>> proxyClass = (Class<Supplier<T>>) productAnnotation.proxyClass();
-            return getInfo(proxyClass).createInstance(configuration).get();
-        } else {
-            return getInfo(targetClass).createInstance(configuration);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <T> ClassInfo<T> getInfo(Class<T> targetClass) {
-        return (ClassInfo<T>) INFOS.computeIfAbsent(targetClass, ClassInfo::new);
-    }
-
-    private static String methodNames(List<Method> methods) {
-        return methods.stream()
-            .map(Method::getName)
-            .collect(Collectors.joining(", "));
-    }
-
-    private static String targetTypeName(Target<?> target) {
-        return target.type().name().toLowerCase(Locale.ROOT);
-    }
-
-    private static String annotationClassNames(List<Source<?, ?>> sources) {
-        return sources.stream()
-            .map(MCRConfigurableInstanceHelper::annotationClassName)
-            .collect(Collectors.joining(", "));
-    }
-
-    private static String annotationClassName(Source<?, ?> source) {
-        return source.annotationClass().getName();
-    }
-
-    private static String property(MCRInstanceConfiguration configuration, String annotationName) {
-        if (Objects.equals("", annotationName)) {
-            return configuration.name().canonical();
-        } else {
-            return configuration.name().canonical() + "." + annotationName;
-        }
-    }
-
-    private static MCRConfigurationException incompatibilityException(String property, Target<?> target,
-        Class<?> annotationValueClass, Object instance) {
-        return new MCRConfigurationException("Instance of class " + instance.getClass().getName()
-            + "', configured in " + property + ", is incompatible with annotation value class "
-            + annotationValueClass.getName() + " for target " + targetTypeName(target)
-            + " '" + target.name() + "' in configured class " + target.declaringClass().getName());
-    }
-
-    private static MCRConfigurationException missingException(String property, Target<?> target,
-        String description) {
-        return new MCRConfigurationException(
-            capitalize(description) + ", configured in " + property + " (and its sub-properties)," +
-                " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
-                + target.declaringClass().getName()
-                + " is missing");
-    }
-
-    private static MCRConfigurationException emptyException(String property, Target<?> target, String description) {
-        return new MCRConfigurationException(
-            capitalize(description) + ", configured in " + property + " (and its sub-properties)," +
-                " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
-                + target.declaringClass().getName()
-                + " is empty");
-    }
-
-    private static MCRConfigurationException emptyRawException(String property, Target<?> target, String description) {
-        return new MCRConfigurationException(
-            capitalize(description) + ", configured in " + property + "," +
-                " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
-                + target.declaringClass().getName()
-                + " is empty");
-    }
-
-    private static MCRConfigurationException nonIntegerKeyException(String property, Target<?> target,
-        String key, String description, NumberFormatException exception) {
-        return new MCRConfigurationException(
-            capitalize(description) + ", configured in " + property + " (and its sub-properties)," +
-                " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
-                + target.declaringClass().getName() + " has element with non-integer key " + key,
-            exception);
-    }
-
-    private static String capitalize(String description) {
-        return description.substring(0, 1).toUpperCase(Locale.ROOT) + description.substring(1);
-    }
-
-    private static MCRConfigurationException inconsistentKeysException(String property, Target<?> target,
-        String key1, String key2, String description) {
-        return new MCRConfigurationException(
-            capitalize(description) + ", configured in " + property + " (and its sub-properties),"
-                + " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
-                + target.declaringClass().getName() + " has element with inconsistent integer keys "
-                + key1 + " and " + key2);
-    }
-
-    private static List<String> orderedKeys(String property, Target<?> target, Map<String, ?> map, String description) {
-
-        SortedMap<Integer, String> keyMap = new TreeMap<>();
-        for (String key : map.keySet()) {
-            try {
-                Integer integerValue = Integer.parseInt(key);
-                String alreadyMappedKey = keyMap.put(integerValue, key);
-                if (alreadyMappedKey != null && !alreadyMappedKey.equals(key)) {
-                    throw inconsistentKeysException(property, target, key, alreadyMappedKey, description);
-                }
-            } catch (NumberFormatException e) {
-                throw nonIntegerKeyException(property, target, key, description, e);
-            }
-        }
-
-        return new ArrayList<>(keyMap.values());
-
-    }
-
-    public static void clearCache() {
-        CONFIG_CACHE.clear();
-        INFOS.clear();
-    }
-
-    /**
-     * A {@link ClassInfo} is a helper class that gathers and holds some information about a target class.
-     * <p>
-     * This class gathers the following information about the target class:
-     * <ul>
-     *   <li>
-     *     A {@link Supplier} as a factory for creating instances of the target class.
-     *     That factory is
-     *     <ol>
-     *       <li>
-     *         preferably the target classes parameterless public constructor or
-     *       </li>
-     *       <li>
-     *         a parameterless public static factory method whose name case-insensitively contains
-     *         the word "instance".
-     *       </li>
-     *     </ol>
-     *     An exception is thrown if neither kind of factory exists or if no suitable constructor but
-     *     multiple suitable factory methods exists.
-     *   </li>
-     *   <li>
-     *     A list of {@link Injector} that are executed after an instance of the target class has been created.
-     *     Each injector binds together a {@link Source} and a {@link Target}.
-     *     <br/>
-     *     Sources implement the varying strategies that create values from configuration properties.
-     *     Source implementations exist for all supported annotations:
-     *     <ol>
-     *       <li>{@link MCRProperty}</li>
-     *       <li>{@link MCRRawProperties}</li>
-     *       <li>{@link MCRInstance}</li>
-     *       <li>{@link MCRInstanceMap}</li>
-     *       <li>{@link MCRInstanceList}</li>
-     *       <li>{@link MCRPostConstruction}</li>
-     *     </ol>
-     *     Targets are:
-     *     <ul>
-     *       <li>public fields,</li>
-     *       <li>public methods with no parameter or</li>
-     *       <li>public methods with one parameter.</li>
-     *     </ul>
-     *     The list of injectors is created by
-     *     <ol>
-     *       <li>
-     *         examining all possible fields and methods, generalized as {@link Injectable},
-     *         (done in {@link ClassInfo#findInjectors(Class)}),
-     *       </li>
-     *       <li>
-     *         checking, if such an injectable is annotated with a supported annotation
-     *         (done in {@link AnnotationMapper#injectableToSource(Injectable)}),
-     *       </li>
-     *       <li>
-     *         creating a corresponding source for that annotation
-     *         (using {@link AnnotationMapper#annotationToSource(Annotation)}) and
-     *       </li>
-     *       <li>
-     *         creating a corresponding target for that injectable
-     *         (using {@link Injectable#toTarget()}).
-     *       </li>
-     *     </ol>
-     *     An exception is thrown if multiple sources are detected for the same target (for example, because a method is
-     *     annotated with {@link MCRProperty} and {@link MCRPostConstruction}), if the target is not allowed for the
-     *     detected source (for example, {@link MCRPostConstruction} is only allowed on methods) or if the values
-     *     produced by the source are assignment-incompatible with the target (for example, values produced by a
-     *     {@link InstanceSource} are not assignment-compatible with {@link String}) (as far as type erasure allows it
-     *     to determine this preemptively).
-     *     <br/>
-     *     The list is ordered by the type of target (all fields first, then all methods), the type of source annotation
-     *     (first everything other than {@link MCRPostConstruction}, then {@link MCRPostConstruction}) and lastly the
-     *     order attribute of the source annotations, if available (for example {@link MCRProperty#order()}).
-     *   </li>
-     * </ul>
-     * <p>
-     * It is intended that instances of this class are cached, such that the information about the target class
-     * only needs to be gathered once.
-     */
-    private static final class ClassInfo<T> {
-
-        private final Class<T> targetClass;
-
-        private final Supplier<T> factory;
-
-        private final List<Injector<T, ?>> injectors;
-
-        private ClassInfo(Class<T> targetClass) {
-            this.targetClass = targetClass;
-            this.factory = getFactory(targetClass);
-            this.injectors = findInjectors(targetClass);
-        }
-
-        private Supplier<T> getFactory(Class<T> targetClass) {
-
-            List<Method> declaredFactoryMethods = findFactoryMethods(targetClass, targetClass.getDeclaredMethods());
-            Optional<Supplier<T>> factory = Stream.<Supplier<Optional<Supplier<T>>>>of(
-                () -> findSingletonFactoryMethod(declaredFactoryMethods),
-                () -> findAnnotatedFactoryMethod(declaredFactoryMethods),
-                () -> findDefaultConstructor(targetClass))
-                .map(Supplier::get)
-                .filter(Optional::isPresent)
-                .map(Optional::get)
-                .findFirst();
-
-            return factory.orElseThrow(() -> new MCRConfigurationException("Class " + targetClass.getName() + " has "
-                + " has no singleton factory method (public, static, matching return type, parameterless, name"
-                + " equals 'getInstance'), no annotated factory method (public, static, matching return type,"
-                + " parameterless, annotated with @MCRFactory) and no public parameterless constructor"));
-
-        }
-
-        private static <T> List<Method> findFactoryMethods(Class<T> targetClass, Method[] declaredMethods) {
-            return Stream.of(declaredMethods)
-                .filter(method -> Modifier.isPublic(method.getModifiers()))
-                .filter(method -> Modifier.isStatic(method.getModifiers()))
-                .filter(method -> method.getReturnType().isAssignableFrom(targetClass))
-                .filter(method -> method.getParameterTypes().length == 0)
-                .filter(method -> !method.isVarArgs())
-                .toList();
-        }
-
-        private Optional<Supplier<T>> findSingletonFactoryMethod(List<Method> factoryMethods) {
-
-            List<Method> singletonFactoryMethods = factoryMethods.stream()
-                .filter(method -> method.getName().equals("getInstance"))
-                .toList();
-
-            if (singletonFactoryMethods.size() > 1) {
-                throw new MCRConfigurationException("Class " + targetClass.getName()
-                    + " has multiple singleton factory methods (public, static, matching return type, parameterless,"
-                    + " name equals 'getInstance'): " + methodNames(singletonFactoryMethods));
-            }
-
-            return singletonFactoryMethods.stream().findFirst().map(this::createFactoryMethodFactory);
-
-        }
-
-        private Optional<Supplier<T>> findAnnotatedFactoryMethod(List<Method> factoryMethods) {
-
-            List<Method> annotatedFactoryMethods = factoryMethods.stream()
-                .filter(method -> method.getDeclaredAnnotation(MCRFactory.class) != null)
-                .toList();
-
-            if (annotatedFactoryMethods.size() > 1) {
-                throw new MCRConfigurationException("Class " + targetClass.getName()
-                    + " has multiple annotated factory methods (public, static, matching return type, parameterless,"
-                    + " annotated with @MCRFactory): " + methodNames(annotatedFactoryMethods));
-            }
-
-            return annotatedFactoryMethods.stream().findFirst().map(this::createFactoryMethodFactory);
-
-        }
-
-        private Optional<Supplier<T>> findDefaultConstructor(Class<T> targetClass) {
-            try {
-                return Optional.of(createConstructorFactory(targetClass.getConstructor()));
-            } catch (NoSuchMethodException e) {
-                return Optional.empty();
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        private Supplier<T> createFactoryMethodFactory(Method method) {
-            return () -> {
-                try {
-                    return (T) method.invoke(method.getDeclaringClass(), (Object[]) null);
-                } catch (Exception e) {
-                    throw new MCRConfigurationException("Unable to create an instance of "
-                        + method.getDeclaringClass().getName() + " using public, parameterless constructor", e);
-                }
-            };
-        }
-
-        private Supplier<T> createConstructorFactory(Constructor<T> constructor) {
-            return () -> {
-                try {
-                    return constructor.newInstance();
-                } catch (Exception e) {
-                    throw new MCRConfigurationException("Unable to create an instance of "
-                        + constructor.getDeclaringClass().getName() + " using parameterless public constructor", e);
-                }
-            };
-        }
-
-        private List<Injector<T, ?>> findInjectors(Class<T> targetClass) {
-            List<Injector<T, ?>> injectors = new LinkedList<>();
-            for (Field field : targetClass.getFields()) {
-                findInjector(new FieldInjectable(field)).ifPresent(injectors::add);
-            }
-            for (Method method : targetClass.getMethods()) {
-                findInjector(new MethodInjectable(method)).ifPresent(injectors::add);
-            }
-            Collections.sort(injectors);
-            return injectors;
-        }
-
-        private Optional<Injector<T, ?>> findInjector(Injectable injectable) {
-
-            List<Source<?, ?>> sources = new LinkedList<>();
-            for (SourceType sourceType : SourceType.values()) {
-                sourceType.mapper.injectableToSource(injectable).ifPresent(sources::add);
-            }
-
-            if (sources.isEmpty()) {
-                return Optional.empty();
-            }
-
-            Target<T> target = injectable.toTarget();
-            if (sources.size() != 1) {
-                throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
-                    + target.name() + "' has multiple annotations (" + annotationClassNames(sources)
-                    + ") in configured class " + targetClass.getName());
-            }
-
-            Source<?, ?> source = sources.getFirst();
-
-            if (!source.allowedTargetTypes().contains(target.type())) {
-                throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
-                    + target.name() + "' is not allowed for annotation (" + annotationClassName(source)
-                    + ") in configured class " + targetClass.getName());
-            }
-
-            if (!target.isAssignableFrom(source.valueClass())) {
-                throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
-                    + target.name() + "' has incompatible type for annotation (" + annotationClassName(source)
-                    + ") in configured class " + targetClass.getName());
-            }
-
-            return Optional.of(new Injector<>(target, source));
-
-        }
-
-        public T createInstance(MCRInstanceConfiguration configuration) {
-            T instance = factory.get();
-            for (Injector<T, ?> injector : injectors) {
-                injector.inject(instance, configuration);
-            }
-            return instance;
-        }
-
-    }
-
-    private static abstract class Injectable {
-
-        public abstract <A extends Annotation> Optional<A> annotation(Class<A> annotationClass);
-
-        public abstract <T> Target<T> toTarget();
-
-    }
-
-    private static final class FieldInjectable extends Injectable {
-
-        private final Field field;
-
-        private FieldInjectable(Field field) {
-            this.field = field;
-        }
-
-        @Override
-        public <A extends Annotation> Optional<A> annotation(Class<A> annotationClass) {
-            return Optional.ofNullable(field.getDeclaredAnnotation(annotationClass));
-        }
-
-        @Override
-        public <T> Target<T> toTarget() {
-            return new FieldTarget<>(field);
-        }
-
-    }
-
-    private static final class MethodInjectable extends Injectable {
-
-        private final Method method;
-
-        private MethodInjectable(Method method) {
-            this.method = method;
-        }
-
-        @Override
-        public <A extends Annotation> Optional<A> annotation(Class<A> annotationClass) {
-            return Optional.ofNullable(method.getDeclaredAnnotation(annotationClass));
-        }
-
-        @Override
-        public <T> Target<T> toTarget() {
-            int numberOfParameters = method.getParameterTypes().length;
-            return switch (numberOfParameters) {
-                case 0 -> new NoParameterMethodTarget<>(method);
-                case 1 -> new SingleParameterMethodTarget<>(method);
-                default -> throw new MCRConfigurationException("Target method '" + method.getName() +
-                    "' has an unexpected number of parameters (" + numberOfParameters +
-                    ") in configured class " + method.getDeclaringClass().getName());
-            };
-        }
-
-    }
-
-    private enum TargetType {
-
-        FIELD(0),
-
-        METHOD(1);
-
-        public final int order;
-
-        TargetType(int order) {
-            this.order = order;
-        }
-
-    }
-
-    private static abstract class Target<T> {
-
-        public abstract TargetType type();
-
-        public abstract Class<? super T> declaringClass();
-
-        public abstract String name();
-
-        public abstract boolean isAssignableFrom(Class<?> valueClass);
-
-        public abstract void set(T instance, Object value);
-
-    }
-
-    private static final class FieldTarget<T> extends Target<T> {
-
-        private final Field field;
-
-        private FieldTarget(Field field) {
-            this.field = field;
-        }
-
-        @Override
-        public TargetType type() {
-            return TargetType.FIELD;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public Class<? super T> declaringClass() {
-            return (Class<? super T>) field.getDeclaringClass();
-        }
-
-        @Override
-        public String name() {
-            return field.getName();
-        }
-
-        @Override
-        public boolean isAssignableFrom(Class<?> valueClass) {
-            return valueClass.isAssignableFrom(field.getType());
-        }
-
-        @Override
-        public void set(T instance, Object value) {
-            try {
-                field.set(instance, value);
-            } catch (Exception e) {
-                throw new MCRConfigurationException("Failed to set target field '" + name() + "' to '" + value
-                    + "' in configurable class " + field.getDeclaringClass().getName(), e);
-            }
-        }
-
-    }
-
-    private static abstract class MethodTarget<T> extends Target<T> {
-
-        private final Method method;
-
-        private MethodTarget(Method method) {
-            this.method = method;
-        }
-
-        @Override
-        public final TargetType type() {
-            return TargetType.METHOD;
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public Class<? super T> declaringClass() {
-            return (Class<? super T>) method.getDeclaringClass();
-        }
-
-        @Override
-        public final String name() {
-            return method.getName();
-        }
-
-    }
-
-    private static final class NoParameterMethodTarget<T> extends MethodTarget<T> {
-
-        private final Method method;
-
-        private NoParameterMethodTarget(Method method) {
-            super(method);
-            this.method = method;
-        }
-
-        @Override
-        public boolean isAssignableFrom(Class<?> valueClass) {
-            return true;
-        }
-
-        @Override
-        public void set(T instance, Object value) {
-            try {
-                method.invoke(instance);
-            } catch (Exception e) {
-                throw new MCRConfigurationException("Failed to call target method '" + name()
-                    + "' in configurable class " + method.getDeclaringClass().getName(), e);
-            }
-        }
-
-    }
-
-    private static final class SingleParameterMethodTarget<T> extends MethodTarget<T> {
-
-        private final Method method;
-
-        private SingleParameterMethodTarget(Method method) {
-            super(method);
-            this.method = method;
-        }
-
-        @Override
-        public boolean isAssignableFrom(Class<?> valueClass) {
-            return method.getParameterTypes()[0].isAssignableFrom(valueClass);
-        }
-
-        @Override
-        public void set(T instance, Object value) {
-            try {
-                method.invoke(instance, value);
-            } catch (Exception e) {
-                throw new MCRConfigurationException("Failed to call target method '" + name() + "' with '"
-                    + value + "' in configurable class " + method.getDeclaringClass().getName(), e);
-            }
-        }
-
-    }
-
-    private enum SourceGroup {
-
-        VALUE_INJECTION,
-
-        POST_CONSTRUCTION;
-
-    }
-
-    private enum SourceType {
-
-        PROPERTY(SourceGroup.VALUE_INJECTION, new AnnotationMapper<MCRProperty>() {
-
-            @Override
-            public Class<MCRProperty> annotationClass() {
-                return MCRProperty.class;
-            }
-
-            @Override
-            public Source<MCRProperty, ?> annotationToSource(MCRProperty annotation) {
-                return new PropertySource(annotation);
-            }
-
-        }),
-
-        PROPERTY_MAP(SourceGroup.VALUE_INJECTION, new AnnotationMapper<MCRPropertyMap>() {
-
-            @Override
-            public Class<MCRPropertyMap> annotationClass() {
-                return MCRPropertyMap.class;
-            }
-
-            @Override
-            public Source<MCRPropertyMap, ?> annotationToSource(MCRPropertyMap annotation) {
-                return new PropertyMapSource(annotation);
-            }
-
-        }),
-
-        PROPERTY_LIST(SourceGroup.VALUE_INJECTION, new AnnotationMapper<MCRPropertyList>() {
-
-            @Override
-            public Class<MCRPropertyList> annotationClass() {
-                return MCRPropertyList.class;
-            }
-
-            @Override
-            public Source<MCRPropertyList, ?> annotationToSource(MCRPropertyList annotation) {
-                return new PropertyListSource(annotation);
-            }
-
-        }),
-
-        RAW_PROPERTIES(SourceGroup.VALUE_INJECTION, new AnnotationMapper<MCRRawProperties>() {
-
-            @Override
-            public Class<MCRRawProperties> annotationClass() {
-                return MCRRawProperties.class;
-            }
-
-            @Override
-            public Source<MCRRawProperties, ?> annotationToSource(MCRRawProperties annotation) {
-                return new RawPropertiesSource(annotation);
-            }
-
-        }),
-
-        INSTANCE(SourceGroup.VALUE_INJECTION, new AnnotationMapper<MCRInstance>() {
-
-            @Override
-            public Class<MCRInstance> annotationClass() {
-                return MCRInstance.class;
-            }
-
-            @Override
-            public Source<MCRInstance, ?> annotationToSource(MCRInstance annotation) {
-                return new InstanceSource(annotation);
-            }
-
-        }),
-
-        INSTANCE_MAP(SourceGroup.VALUE_INJECTION, new AnnotationMapper<MCRInstanceMap>() {
-
-            @Override
-            public Class<MCRInstanceMap> annotationClass() {
-                return MCRInstanceMap.class;
-            }
-
-            @Override
-            public Source<MCRInstanceMap, ?> annotationToSource(MCRInstanceMap annotation) {
-                return new InstanceMapSource(annotation);
-            }
-
-        }),
-
-        INSTANCE_LIST(SourceGroup.VALUE_INJECTION, new AnnotationMapper<MCRInstanceList>() {
-
-            @Override
-            public Class<MCRInstanceList> annotationClass() {
-                return MCRInstanceList.class;
-            }
-
-            @Override
-            public Source<MCRInstanceList, ?> annotationToSource(MCRInstanceList annotation) {
-                return new InstanceListSource(annotation);
-            }
-
-        }),
-
-        POST_CONSTRUCTION(SourceGroup.POST_CONSTRUCTION, new AnnotationMapper<MCRPostConstruction>() {
-
-            @Override
-            public Class<MCRPostConstruction> annotationClass() {
-                return MCRPostConstruction.class;
-            }
-
-            @Override
-            public Source<MCRPostConstruction, ?> annotationToSource(MCRPostConstruction annotation) {
-                return new PostConstructionSource(annotation);
-            }
-
-        });
-
-        public final int order;
-
-        public final AnnotationMapper<? extends Annotation> mapper;
-
-        SourceType(SourceGroup group, AnnotationMapper<? extends Annotation> mapper) {
-            this.order = group.ordinal();
-            this.mapper = mapper;
-        }
-
-    }
-
-    private abstract static class AnnotationMapper<A extends Annotation> {
-
-        public abstract Class<A> annotationClass();
-
-        public abstract Source<A, ?> annotationToSource(A annotation);
-
-        public Optional<Source<A, ?>> injectableToSource(Injectable injectable) {
-            return injectable.annotation(annotationClass()).map(this::annotationToSource);
-        }
-
-    }
-
-    private static abstract class Source<A extends Annotation, V> {
-
-        public abstract SourceType type();
-
-        public abstract Class<A> annotationClass();
-
-        public abstract A annotation();
-
-        public abstract int order();
-
-        public abstract Set<TargetType> allowedTargetTypes();
-
-        public abstract Class<?> valueClass();
-
-        public abstract V get(MCRInstanceConfiguration configuration, Target<?> target);
-
-        public final Set<Option> createOptions(Class<?> valueClass) {
-            return Modifier.isFinal(valueClass.getModifiers())
-                ? ADD_IMPLICIT_CLASS_PROPERTIES : NO_OPTIONS;
-        }
-
-    }
-
-    private static final class PropertySource extends Source<MCRProperty, String> {
-
-        private final MCRProperty annotation;
-
-        private PropertySource(MCRProperty annotation) {
-            this.annotation = annotation;
-        }
-
-        @Override
-        public SourceType type() {
-            return SourceType.PROPERTY;
-        }
-
-        @Override
-        public Class<MCRProperty> annotationClass() {
-            return MCRProperty.class;
-        }
-
-        @Override
-        public MCRProperty annotation() {
-            return annotation;
-        }
-
-        @Override
-        public int order() {
-            return annotation.order();
-        }
-
-        @Override
-        public Set<TargetType> allowedTargetTypes() {
-            return EnumSet.allOf(TargetType.class);
-        }
-
-        @Override
-        public Class<?> valueClass() {
-            return String.class;
-        }
-
-        @Override
-        public String get(MCRInstanceConfiguration configuration, Target<?> target) {
-
-            String name = annotation.name();
-            if (name.isEmpty()) {
-                throw new MCRConfigurationException(
-                    "The name for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
-                        + target.declaringClass().getName() + " must not be empty");
-            }
-
-            String property;
-            String description;
-            String propertyValue;
-            if (annotation.absolute()) {
-                property = annotation.name();
-                description = "absolute property";
-                propertyValue = getPropertyValue(property, annotation.name(),
-                    configuration.fullProperties(), description);
-            } else {
-                property = configuration.name().canonical() + "." + annotation.name();
-                description = "property";
-                propertyValue = getPropertyValue(property, annotation.name(),
-                    configuration.properties(), description);
-            }
-
-            String defaultName = annotation.defaultName();
-            if (propertyValue == null && !defaultName.isEmpty()) {
-
-                property = defaultName;
-                description = "default property";
-                propertyValue = getPropertyValue(defaultName, defaultName,
-                    configuration.fullProperties(), description);
-
-                if (propertyValue == null) {
-                    throw missingException(property, target, description);
-                }
-
-            }
-
-            if (propertyValue == null && annotation.required()) {
-                throw missingException(property, target, description);
-            }
-
-            return propertyValue;
-
-        }
-
-        private String getPropertyValue(String property, String prefix,
-            Map<String, String> properties, String description) {
-
-            MCRSentinel sentinel = annotation.sentinel();
-
-            if (sentinel.enabled()) {
-                boolean sentinelValue = sentinel.defaultValue();
-                String configurationValue = properties.get(prefix + "." + sentinel.name());
-                if (configurationValue != null) {
-                    sentinelValue = Boolean.parseBoolean(configurationValue);
-                }
-                if (sentinelValue == sentinel.rejectionValue()) {
-                    if (LOGGER.isInfoEnabled()) {
-                        LOGGER.info("[SENTINEL] Ignoring {} {} and all sub-properties",
-                            description, property);
-                    }
-                    return null;
-                }
-
-            }
-
-            return properties.get(prefix);
-
-        }
-
-    }
-
-    private static final class PropertyMapSource extends Source<MCRPropertyMap, Map<String, String>> {
-
-        private final MCRPropertyMap annotation;
-
-        private PropertyMapSource(MCRPropertyMap annotation) {
-            this.annotation = annotation;
-        }
-
-        @Override
-        public SourceType type() {
-            return SourceType.PROPERTY_MAP;
-        }
-
-        @Override
-        public Class<MCRPropertyMap> annotationClass() {
-            return MCRPropertyMap.class;
-        }
-
-        @Override
-        public MCRPropertyMap annotation() {
-            return annotation;
-        }
-
-        @Override
-        public int order() {
-            return annotation.order();
-        }
-
-        @Override
-        public Set<TargetType> allowedTargetTypes() {
-            return EnumSet.allOf(TargetType.class);
-        }
-
-        @Override
-        public Class<?> valueClass() {
-            return Map.class;
-        }
-
-        @Override
-        public Map<String, String> get(MCRInstanceConfiguration configuration, Target<?> target) {
-
-            String property;
-            String description;
-            Map<String, String> propertyMap;
-            if (annotation.absolute()) {
-                property = annotation.name();
-                description = "absolute property map";
-                Map<String, String> properties = configuration.fullProperties();
-                propertyMap = getPropertyMap(property, annotation.name(), ".", properties, description);
-            } else {
-                Map<String, String> properties = configuration.properties();
-                if (annotation.name().isEmpty()) {
-                    property = configuration.name().canonical();
-                    description = "property map";
-                    // when non-empty class suffix is used, the property with empty name may contain the short-form-map
-                    if (configuration.name().suffix() != MCRInstanceName.Suffix.NONE) {
-                        properties.put("", configuration.fullProperties().get(property));
-                    }
-                    propertyMap = getPropertyMap(property, "", "", properties, description);
-                } else {
-                    property = configuration.name().canonical() + "." + annotation.name();
-                    description = "property map";
-                    propertyMap = getPropertyMap(property, annotation.name(), ".", properties, description);
-                }
-            }
-
-            String defaultName = annotation.defaultName();
-            if (propertyMap == null && !defaultName.isEmpty()) {
-
-                property = defaultName;
-                description = "default property map";
-                propertyMap = getPropertyMap(defaultName, defaultName, ".",
-                    configuration.fullProperties(), description);
-
-                if (propertyMap == null || (propertyMap.isEmpty() && annotation.required())) {
-                    throw emptyException(property, target, description);
-                }
-
-            }
-
-            if ((propertyMap == null || propertyMap.isEmpty()) && annotation.required()) {
-                throw emptyException(property, target, description);
-            }
-
-            return propertyMap == null ? new HashMap<>() : propertyMap;
-
-        }
-
-        private Map<String, String> getPropertyMap(String property, String prefix, String delimiter,
-            Map<String, String> properties, String description) {
-
-            AtomicBoolean hasRelevantProperty = new AtomicBoolean(false);
-            MCRSentinel sentinel = annotation.sentinel();
-
-            Map<String, String> shortFormMap = Map.of();
-            String shortFormPropertyValue = properties.get(prefix);
-            if (shortFormPropertyValue != null) {
-                hasRelevantProperty.set(true);
-                shortFormMap = parseShortFormMap(property, shortFormPropertyValue);
-            }
-
-            Map<String, String> rawPropertyMap = new HashMap<>(shortFormMap);
-            String keyPrefix = prefix + delimiter;
-            int keyPrefixLength = keyPrefix.length();
-            properties.forEach((key, value) -> {
-                if (key.startsWith(keyPrefix) && !key.isEmpty()) {
-                    int index = key.indexOf('.', keyPrefixLength);
-                    if (index == -1) {
-                        if (!value.isEmpty()) {
-                            hasRelevantProperty.set(true);
-                            rawPropertyMap.put(key.substring(keyPrefixLength), value);
-                        }
-                    }
-                }
-            });
-
-            Map<String, String> propertyMap = new HashMap<>();
-
-            for (String key : rawPropertyMap.keySet()) {
-                String value = rawPropertyMap.get(key);
-                if (sentinel.enabled()) {
-                    boolean sentinelValue = sentinel.defaultValue();
-                    String configurationValue = properties.get(keyPrefix + key + "." + sentinel.name());
-                    if (configurationValue != null) {
-                        sentinelValue = Boolean.parseBoolean(configurationValue);
-                    }
-                    if (sentinelValue == sentinel.rejectionValue()) {
-                        LOGGER.info("[SENTINEL] Ignoring {} entry {}.{} and all sub-properties",
-                            description, property, key);
-                        continue;
-                    }
-                }
-
-                propertyMap.put(key, value);
-
-            }
-
-            return hasRelevantProperty.get() ? propertyMap : null;
-
-        }
-
-        private Map<String, String> parseShortFormMap(String property, String value) {
-            Map<String, String> shortFormMap = new HashMap<>();
-            MCRConfiguration2.splitValue(value).forEach(string -> {
-                String[] parts = string.split(":", 2);
-                if (parts.length != 2 || parts[0].isBlank() || parts[1].isBlank()) {
-                    if (LOGGER.isWarnEnabled()) {
-                        LOGGER.warn("Ignoring incomplete short-form-map entry {} while processing {}",
-                            value, property);
-                    }
-                } else {
-                    shortFormMap.put(parts[0], parts[1]);
-                }
-            });
-            return shortFormMap;
-        }
-
-    }
-
-    private static final class PropertyListSource extends Source<MCRPropertyList, List<String>> {
-
-        private final MCRPropertyList annotation;
-
-        private PropertyListSource(MCRPropertyList annotation) {
-            this.annotation = annotation;
-        }
-
-        @Override
-        public SourceType type() {
-            return SourceType.PROPERTY_LIST;
-        }
-
-        @Override
-        public Class<MCRPropertyList> annotationClass() {
-            return MCRPropertyList.class;
-        }
-
-        @Override
-        public MCRPropertyList annotation() {
-            return annotation;
-        }
-
-        @Override
-        public int order() {
-            return annotation.order();
-        }
-
-        @Override
-        public Set<TargetType> allowedTargetTypes() {
-            return EnumSet.allOf(TargetType.class);
-        }
-
-        @Override
-        public Class<?> valueClass() {
-            return List.class;
-        }
-
-        @Override
-        public List<String> get(MCRInstanceConfiguration configuration, Target<?> target) {
-
-            String property;
-            String description;
-            List<String> propertyList;
-            if (annotation.absolute()) {
-                property = annotation.name();
-                description = "absolute property list";
-                Map<String, String> properties = configuration.fullProperties();
-                propertyList = getPropertyList(property, annotation.name(), ".", target, properties, description);
-            } else {
-                Map<String, String> properties = configuration.properties();
-                if (annotation.name().isEmpty()) {
-                    property = configuration.name().canonical();
-                    description = "property list";
-                    // when non-empty class suffix is used, the property with empty name may contain the short-form-list
-                    if (configuration.name().suffix() != MCRInstanceName.Suffix.NONE) {
-                        properties.put("", configuration.fullProperties().get(property));
-                    }
-                    propertyList = getPropertyList(property, "", "", target, properties, description);
-                } else {
-                    property = configuration.name().canonical() + "." + annotation.name();
-                    description = "property list";
-                    propertyList = getPropertyList(property, annotation.name(), ".", target, properties, description);
-                }
-            }
-
-            String defaultName = annotation.defaultName();
-            if (propertyList == null && !defaultName.isEmpty()) {
-
-                property = defaultName;
-                description = "default property list";
-                propertyList = getPropertyList(defaultName, defaultName, ".",
-                    target, configuration.fullProperties(), description);
-
-                if (propertyList == null || (propertyList.isEmpty() && annotation.required())) {
-                    throw emptyException(property, target, description);
-                }
-            }
-
-            if ((propertyList == null || propertyList.isEmpty()) && annotation.required()) {
-                throw emptyException(property, target, description);
-            }
-
-            return propertyList == null ? new ArrayList<>() : propertyList;
-
-        }
-
-        private List<String> getPropertyList(String property, String prefix, String delimiter,
-            Target<?> target, Map<String, String> properties, String description) {
-
-            AtomicBoolean hasRelevantProperty = new AtomicBoolean(false);
-            MCRSentinel sentinel = annotation.sentinel();
-
-            Map<String, String> rawPropertyMap = new HashMap<>();
-            String keyPrefix = prefix + delimiter;
-            int keyPrefixLength = keyPrefix.length();
-            properties.forEach((key, value) -> {
-                if (key.startsWith(keyPrefix) && !key.isEmpty()) {
-                    int index = key.indexOf('.', keyPrefixLength);
-                    if (index == -1) {
-                        if (!value.isEmpty()) {
-                            hasRelevantProperty.set(true);
-                            rawPropertyMap.put(key.substring(keyPrefixLength), value);
-                        }
-                    }
-                }
-            });
-
-            List<String> headPropertyList = new ArrayList<>(0);
-            List<String> tailPropertyList = new ArrayList<>(rawPropertyMap.size());
-
-            List<String> keyList = orderedKeys(property, target, rawPropertyMap, description);
-            for (String key : keyList) {
-                String value = rawPropertyMap.get(key);
-                if (sentinel.enabled()) {
-                    boolean sentinelValue = sentinel.defaultValue();
-                    String configurationValue = properties.get(keyPrefix + key + "." + sentinel.name());
-                    if (configurationValue != null) {
-                        sentinelValue = Boolean.parseBoolean(configurationValue);
-                    }
-                    if (sentinelValue == sentinel.rejectionValue()) {
-                        LOGGER.info("[SENTINEL] Ignoring {} element {}.{} and all sup-properties",
-                            description, property, key);
-                        continue;
-                    }
-                }
-
-                if (key.charAt(0) == '-') {
-                    headPropertyList.add(value);
-                } else {
-                    tailPropertyList.add(value);
-                }
-
-            }
-
-            List<String> shortFormList = List.of();
-            String shortFormPropertyValue = properties.get(prefix);
-            if (shortFormPropertyValue != null) {
-                hasRelevantProperty.set(true);
-                shortFormList = parseShortFormList(shortFormPropertyValue);
-            }
-
-            int totalSize = headPropertyList.size() + shortFormList.size() + tailPropertyList.size();
-            List<String> fullPropertyList = new ArrayList<>(totalSize);
-            fullPropertyList.addAll(headPropertyList);
-            fullPropertyList.addAll(shortFormList);
-            fullPropertyList.addAll(tailPropertyList);
-
-            return hasRelevantProperty.get() ? fullPropertyList : null;
-
-        }
-
-        private List<String> parseShortFormList(String value) {
-            return MCRConfiguration2.splitValue(value).toList();
-        }
-
-    }
-
-    private static final class RawPropertiesSource extends Source<MCRRawProperties, Map<String, String>> {
-
-        private final MCRRawProperties annotation;
-
-        private final String prefix;
-
-        private RawPropertiesSource(MCRRawProperties annotation) {
-            this.annotation = annotation;
-            String namePattern = annotation.namePattern();
-            if (namePattern.equals("*")) {
-                this.prefix = "";
-            } else if (namePattern.endsWith(".*")) {
-                this.prefix = namePattern.substring(0, namePattern.length() - 1);
-            } else {
-                throw new MCRConfigurationException("Unsupported name pattern:" + annotation.namePattern());
-            }
-        }
-
-        @Override
-        public SourceType type() {
-            return SourceType.RAW_PROPERTIES;
-        }
-
-        @Override
-        public Class<MCRRawProperties> annotationClass() {
-            return MCRRawProperties.class;
-        }
-
-        @Override
-        public MCRRawProperties annotation() {
-            return annotation;
-        }
-
-        @Override
-        public int order() {
-            return annotation.order();
-        }
-
-        @Override
-        public Set<TargetType> allowedTargetTypes() {
-            return EnumSet.allOf(TargetType.class);
-        }
-
-        @Override
-        public Class<?> valueClass() {
-            return Map.class;
-        }
-
-        @Override
-        public Map<String, String> get(MCRInstanceConfiguration configuration, Target<?> target) {
-
-            Map<String, String> properties =
-                annotation.absolute() ? configuration.fullProperties() : configuration.properties();
-
-            Map<String, String> filteredProperties = new HashMap<>();
-            properties.forEach((key, value) -> {
-                if (key.startsWith(prefix)) {
-                    filteredProperties.put(key.substring(prefix.length()), value);
-                }
-            });
-
-            if (filteredProperties.isEmpty() && annotation.required()) {
-                String property;
-                String description;
-                if (annotation.absolute()) {
-                    property = annotation.namePattern();
-                    description = "absolute raw property map";
-                } else {
-                    property = configuration.name().canonical() + "." + annotation.namePattern();
-                    description = "raw property map";
-                }
-                throw emptyRawException(property, target, description);
-            }
-
-            return filteredProperties;
-
-        }
-
-    }
-
-    @SuppressWarnings("PMD.SingletonClassReturningNewInstance")
-    private static abstract class InstanceSourceBase<A extends Annotation, V> extends Source<A, V> {
-
-        protected Object getInstance(String property, Target<?> target, Class<?> valueClass,
-            MCRInstanceConfiguration nestedConfiguration, MCRSentinel sentinel) {
-
-            Set<Option> options = createOptions(valueClass);
-            boolean implicitValueClass = Modifier.isFinal(valueClass.getModifiers());
-
-            if (sentinel.enabled()) {
-                boolean sentinelValue = sentinel.defaultValue();
-                String configuredSentinelValue = nestedConfiguration.properties().remove(sentinel.name());
-                if (configuredSentinelValue != null) {
-                    sentinelValue = Boolean.parseBoolean(configuredSentinelValue);
-                }
-                if (sentinelValue == sentinel.rejectionValue()) {
-                    if (LOGGER.isInfoEnabled()) {
-                        LOGGER.info("[SENTINEL] Ignoring {} {} and all sup-properties",
-                            description(), property);
-                    }
-                    return null;
-                }
-            }
-
-            String className = nestedConfiguration.className();
-            if (className == null && !implicitValueClass) {
-                if (LOGGER.isInfoEnabled()) {
-                    LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sup-properties (no class name)",
-                        description(), property);
-                }
-                return null;
-            } else if (className != null && className.isBlank()) {
-                if (LOGGER.isInfoEnabled()) {
-                    LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sup-properties (empty class name)",
-                        description(), property);
-                }
-                return null;
-            }
-
-            Object instance = MCRConfigurableInstanceHelper.getInstance(valueClass, nestedConfiguration, options);
-            if (!valueClass.isAssignableFrom(instance.getClass())) {
-                throw incompatibilityException(property, target, valueClass, instance);
-            }
-
-            return instance;
-
-        }
-
-        protected abstract String description();
-
-    }
-
-    private static final class InstanceSource extends InstanceSourceBase<MCRInstance, Object> {
-
-        private final MCRInstance annotation;
-
-        private InstanceSource(MCRInstance annotation) {
-            this.annotation = annotation;
-        }
-
-        @Override
-        public SourceType type() {
-            return SourceType.INSTANCE;
-        }
-
-        @Override
-        public Class<MCRInstance> annotationClass() {
-            return MCRInstance.class;
-        }
-
-        @Override
-        public MCRInstance annotation() {
-            return annotation;
-        }
-
-        @Override
-        public int order() {
-            return annotation.order();
-        }
-
-        @Override
-        public Set<TargetType> allowedTargetTypes() {
-            return EnumSet.allOf(TargetType.class);
-        }
-
-        @Override
-        public Class<?> valueClass() {
-            return annotation.valueClass();
-        }
-
-        @Override
-        public Object get(MCRInstanceConfiguration configuration, Target<?> target) {
-
-            String name = annotation.name();
-            if (name.isEmpty()) {
-                throw new MCRConfigurationException(
-                    "The name for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
-                        + target.declaringClass().getName() + " must not be empty");
-            }
-
-            Object instance = getInstance(configuration, target, name);
-
-            if (instance == null && annotation.required()) {
-                throw missingException(property(configuration, annotation.name()), target, "instance");
-            }
-
-            return instance;
-
-        }
-
-        private Object getInstance(MCRInstanceConfiguration configuration, Target<?> target, String name) {
-
-            MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration(name);
-            String property = nestedConfiguration.name().canonical();
-
-            Class<?> valueClass = annotation.valueClass();
-            MCRSentinel sentinel = annotation.sentinel();
-
-            return getInstance(property, target, valueClass, nestedConfiguration, sentinel);
-
-        }
-
-        @Override
-        protected String description() {
-            return "instance";
-        }
-
-    }
-
-    private static final class InstanceMapSource extends InstanceSourceBase<MCRInstanceMap, Map<String, Object>> {
-
-        private final MCRInstanceMap annotation;
-
-        private InstanceMapSource(MCRInstanceMap annotation) {
-            this.annotation = annotation;
-        }
-
-        @Override
-        public SourceType type() {
-            return SourceType.INSTANCE_MAP;
-        }
-
-        @Override
-        public Class<MCRInstanceMap> annotationClass() {
-            return MCRInstanceMap.class;
-        }
-
-        @Override
-        public MCRInstanceMap annotation() {
-            return annotation;
-        }
-
-        @Override
-        public int order() {
-            return annotation.order();
-        }
-
-        @Override
-        public Set<TargetType> allowedTargetTypes() {
-            return EnumSet.allOf(TargetType.class);
-        }
-
-        @Override
-        public Class<?> valueClass() {
-            return Map.class;
-        }
-
-        @Override
-        public Map<String, Object> get(MCRInstanceConfiguration configuration, Target<?> target) {
-
-            Map<String, Object> instanceMap = getInstanceMap(target, configuration);
-
-            if (instanceMap.isEmpty() && annotation.required()) {
-                throw emptyException(property(configuration, annotation.name()), target, "instance map");
-            }
-
-            return instanceMap;
-
-        }
-
-        private Map<String, Object> getInstanceMap(Target<?> target, MCRInstanceConfiguration configuration) {
-
-            Map<String, MCRInstanceConfiguration> nestedConfigurationMap = nestedConfigurationMap(configuration);
-
-            Class<?> valueClass = annotation.valueClass();
-            MCRSentinel sentinel = annotation.sentinel();
-
-            Map<String, Object> instanceMap = new HashMap<>();
-            for (String key : nestedConfigurationMap.keySet()) {
-
-                MCRInstanceConfiguration nestedConfiguration = nestedConfigurationMap.get(key);
-                String property = nestedConfiguration.name().canonical();
-
-                Object instance = getInstance(property, target, valueClass, nestedConfiguration, sentinel);
-                if (instance != null) {
-                    instanceMap.put(key, instance);
-                }
-
-            }
-
-            return instanceMap;
-
-        }
-
-        private Map<String, MCRInstanceConfiguration> nestedConfigurationMap(MCRInstanceConfiguration configuration) {
-            if (Objects.equals("", annotation.name())) {
-                return configuration.nestedConfigurationMap();
-            } else {
-                return configuration.nestedConfigurationMap(annotation().name());
-            }
-        }
-
-        @Override
-        protected String description() {
-            return "instance map entry";
-        }
-
-    }
-
-    private static final class InstanceListSource extends InstanceSourceBase<MCRInstanceList, List<Object>> {
-
-        private final MCRInstanceList annotation;
-
-        private InstanceListSource(MCRInstanceList annotation) {
-            this.annotation = annotation;
-        }
-
-        @Override
-        public SourceType type() {
-            return SourceType.INSTANCE_LIST;
-        }
-
-        @Override
-        public Class<MCRInstanceList> annotationClass() {
-            return MCRInstanceList.class;
-        }
-
-        @Override
-        public MCRInstanceList annotation() {
-            return annotation;
-        }
-
-        @Override
-        public int order() {
-            return annotation.order();
-        }
-
-        @Override
-        public Set<TargetType> allowedTargetTypes() {
-            return EnumSet.allOf(TargetType.class);
-        }
-
-        @Override
-        public Class<?> valueClass() {
-            return List.class;
-        }
-
-        @Override
-        public List<Object> get(MCRInstanceConfiguration configuration, Target<?> target) {
-
-            List<Object> instanceMap = getInstanceList(target, configuration);
-
-            if (instanceMap.isEmpty() && annotation.required()) {
-                throw emptyException(property(configuration, annotation.name()), target, "instance list");
-            }
-
-            return instanceMap;
-
-        }
-
-        private List<Object> getInstanceList(Target<?> target, MCRInstanceConfiguration configuration) {
-
-            Map<String, MCRInstanceConfiguration> nestedConfigurationMap = nestedConfigurationMap(configuration);
-            List<String> keyList = orderedKeys(property(configuration, annotation.name()), target,
-                nestedConfigurationMap, "instance list");
-
-            Class<?> valueClass = annotation.valueClass();
-            MCRSentinel sentinel = annotation.sentinel();
-
-            List<Object> instanceList = new ArrayList<>(nestedConfigurationMap.size());
-            for (String key : keyList) {
-
-                MCRInstanceConfiguration nestedConfiguration = nestedConfigurationMap.get(key);
-                String property = nestedConfiguration.name().canonical();
-
-                Object instance = getInstance(property, target, valueClass, nestedConfiguration, sentinel);
-                if (instance != null) {
-                    instanceList.add(instance);
-                }
-
-            }
-
-            return instanceList;
-
-        }
-
-        private Map<String, MCRInstanceConfiguration> nestedConfigurationMap(MCRInstanceConfiguration configuration) {
-            if (Objects.equals("", annotation.name())) {
-                return configuration.nestedConfigurationMap();
-            } else {
-                return configuration.nestedConfigurationMap(annotation().name());
-            }
-        }
-
-        @Override
-        protected String description() {
-            return "instance list element";
-        }
-    }
-
-    private static final class PostConstructionSource extends Source<MCRPostConstruction, String> {
-
-        private final MCRPostConstruction annotation;
-
-        private PostConstructionSource(MCRPostConstruction annotation) {
-            this.annotation = annotation;
-        }
-
-        @Override
-        public SourceType type() {
-            return SourceType.POST_CONSTRUCTION;
-        }
-
-        @Override
-        public Class<MCRPostConstruction> annotationClass() {
-            return MCRPostConstruction.class;
-        }
-
-        @Override
-        public MCRPostConstruction annotation() {
-            return annotation;
-        }
-
-        @Override
-        public int order() {
-            return annotation.order();
-        }
-
-        @Override
-        public Set<TargetType> allowedTargetTypes() {
-            return EnumSet.allOf(TargetType.class);
-        }
-
-        @Override
-        public Class<?> valueClass() {
-            return String.class;
-        }
-
-        @Override
-        public String get(MCRInstanceConfiguration configuration, Target<?> target) {
-            return switch (annotation.value()) {
-                case ACTUAL -> configuration.name().actual();
-                case CANONICAL -> configuration.name().canonical();
-            };
-        }
-
-    }
-
-    private record Injector<T, A extends Annotation>(Target<T> target, Source<A, ?> source)
-        implements Comparable<Injector<?, ?>> {
-
-        private static final Comparator<Injector<?, ?>> COMPARATOR = Comparator
-            .comparingInt((ToIntFunction<Injector<?, ?>>) injector -> injector.target.type().order)
-            .thenComparingInt(injector -> injector.source.type().order)
-            .thenComparingInt(injector -> injector.source.order());
-
-        public void inject(T instance, MCRInstanceConfiguration configuration) {
-            Object value = source.get(configuration, target);
-            if (value != null) {
-                target.set(instance, value);
-            }
-        }
-
-        @Override
-        public int compareTo(Injector<?, ?> other) {
-            return COMPARATOR.compare(this, other);
-        }
-
-    }
-
-    public enum Option {
-
-        /**
-         * If a class is required to be in the configuration properties (for example, because of usage of
-         * {@link MCRConfiguration2#getInstanceOfOrThrow(Class, String)} or because of an annotation with required=true)
-         * and the expected super class is a final class (i.e. if the class name that has to be present in the
-         * properties could ever be only exactly the class name of that final class), add corresponding entries to the
-         * properties during instantiation, if not present anyway.
-         */
-        ADD_IMPLICIT_CLASS_PROPERTIES;
-
-    }
-
-}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRConfiguration2.java b/mycore-base/src/main/java/org/mycore/common/config/MCRConfiguration2.java
index e7ee5aa3f8..2edf019055 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRConfiguration2.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/MCRConfiguration2.java
@@ -18,7 +18,10 @@
 
 package org.mycore.common.config;
 
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
+
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -32,8 +35,15 @@
 import java.util.stream.Stream;
 
 import org.mycore.common.MCRClassTools;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration.Option;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration.Options;
+import org.mycore.common.config.instantiator.MCRInstanceName;
+import org.mycore.common.config.instantiator.MCRInstanceName.Suffix;
 import org.mycore.common.function.MCRTriConsumer;
 
+import jakarta.inject.Singleton;
+
 /**
  * Provides methods to manage and read all configuration properties from the MyCoRe configuration files.
  * The Properties used by this class are used from {@link MCRConfigurationBase}.
@@ -81,7 +91,7 @@
  * @since 2018.05
  */
 // because of intrusive test case org.mycore.common.config.MCRConfigurationTest.testSingletonMapGet
-@SuppressWarnings("PMD.MutableStaticState") 
+@SuppressWarnings("PMD.MutableStaticState")
 public class MCRConfiguration2 {
 
     private static final Map<UUID, EventListener> LISTENERS = new ConcurrentHashMap<>();
@@ -131,16 +141,7 @@ public static Map<String, String> getSubPropertiesMap(String propertyPrefix) {
      * @throws MCRConfigurationException if the class can not be loaded or instantiated
      */
     public static <S> Optional<S> getInstanceOf(Class<S> superClass, String name) throws MCRConfigurationException {
-        return getInstanceOf(superClass, name, MCRConfigurableInstanceHelper.NO_OPTIONS);
-    }
-
-    private static <S> Optional<S> getInstanceOf(Class<S> superClass, String name,
-        Set<MCRConfigurableInstanceHelper.Option> options) {
-        if (MCRConfigurableInstanceHelper.isSingleton(superClass)) {
-            return getSingleInstanceOf(superClass, name, options);
-        } else {
-            return MCRConfigurableInstanceHelper.getInstance(superClass, name, options);
-        }
+        return getInstanceOf(superClass, name, Options.NONE);
     }
 
     /**
@@ -153,7 +154,7 @@ private static <S> Optional<S> getInstanceOf(Class<S> superClass, String name,
      * or the configuration property is not set
      */
     public static <S> S getInstanceOfOrThrow(Class<S> superClass, String name) throws MCRConfigurationException {
-        return getInstanceOf(superClass, name, MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES)
+        return getInstanceOf(superClass, name, Options.IMPLICIT)
             .orElseThrow(() -> createConfigurationException(name));
     }
 
@@ -167,15 +168,7 @@ public static <S> S getInstanceOfOrThrow(Class<S> superClass, String name) throw
      * @throws MCRConfigurationException if the class can not be loaded or instantiated
      */
     public static <S> Optional<S> getSingleInstanceOf(Class<S> superClass, String name) {
-        return getSingleInstanceOf(superClass, name, MCRConfigurableInstanceHelper.NO_OPTIONS);
-    }
-
-    private static <S> Optional<S> getSingleInstanceOf(Class<S> superClass, String name,
-        Set<MCRConfigurableInstanceHelper.Option> options) {
-        return getString(name)
-            .map(className -> new ConfigSingletonKey(name, className))
-            .map(key -> (S) instanceHolder.computeIfAbsent(key,
-                k -> MCRConfigurableInstanceHelper.getInstance(superClass, name, options).orElse(null)));
+        return getSingleInstanceOf(superClass, name, Options.NONE);
     }
 
     /**
@@ -189,17 +182,51 @@ private static <S> Optional<S> getSingleInstanceOf(Class<S> superClass, String n
      * or the configuration property is not set
      */
     public static <S> S getSingleInstanceOfOrThrow(Class<S> superClass, String name) {
-        return getSingleInstanceOf(superClass, name, MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES)
+        return getSingleInstanceOf(superClass, name, Options.IMPLICIT)
             .orElseThrow(() -> createConfigurationException(name));
     }
 
+    private static <S> Optional<S> getInstanceOf(Class<S> superClass, String name, Set<Option> options) {
+        if (isSingleton(superClass)) {
+            return getSingleInstanceOf(superClass, name, options);
+        }
+        return getInstantiableConfiguration(superClass, name, options).map(MCRInstanceConfiguration::instantiate);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <S> Optional<S> getSingleInstanceOf(Class<S> superClass, String name, Set<Option> options) {
+        return getInstantiableConfiguration(superClass, name, options).map(
+            configuration -> {
+                SingletonKey key = new ConfigSingletonKey(name, configuration.valueClass().getName());
+                return (S) instanceHolder.computeIfAbsent(key, _ -> configuration.instantiate());
+            });
+    }
+
+    private static <S> Optional<MCRInstanceConfiguration<S>> getInstantiableConfiguration(Class<S> superClass,
+        String name, Set<Option> options) {
+        MCRInstanceConfiguration<S> configuration = ofName(superClass, name, getPropertiesMap(), options);
+        return configuration.instantiatable() ? Optional.of(configuration) : Optional.empty();
+
+    }
+
+    /**
+     * Checks if a class is annotated with {@link Singleton}.
+     *
+     * @param targetClass the class
+     * @return true if the class in the property is annotated with {@link Singleton}
+     */
+    public static boolean isSingleton(Class<?> targetClass) {
+        return targetClass.getDeclaredAnnotation(Singleton.class) != null;
+    }
+
     /**
      * Loads a Java Class defined in property <code>name</code>.
      * @param name Name of the property
      * @param <T> Supertype of class defined in <code>name</code>
-     * @return Optional of Class asignable to <code>&lt;T&gt;</code>
+     * @return Optional of Class assignable to <code>&lt;T&gt;</code>
      * @throws MCRConfigurationException
-     *             if the the class can not be loaded or instantiated
+     *             if the class can not be loaded or instantiated
      */
     public static <T> Optional<Class<? extends T>> getClass(String name) throws MCRConfigurationException {
         return getString(name).map(MCRConfiguration2::<T>getClassObject);
@@ -425,7 +452,8 @@ public static boolean removePropertyChangeEventListener(UUID uuid) {
     }
 
     public static <S> S instantiateClass(Class<S> superClass, String className) {
-        return MCRConfigurableInstanceHelper.getInstance(superClass, MCRInstanceConfiguration.ofClass(className));
+        return MCRInstanceConfiguration.ofClassName(superClass, className, "MCR.AnonymousInstance." + className,
+            Suffix.UPPER_CASE, new HashMap<>(), getPropertiesMap()).instantiate();
     }
 
     public static <S> Stream<S> instantiateClasses(Class<S> superClass, String propertyName) {
@@ -445,11 +473,11 @@ private static <T> Class<? extends T> getClassObject(String classname) {
 
     private static class EventListener {
 
-        private Predicate<String> keyPredicate;
+        private final Predicate<String> keyPredicate;
 
-        private MCRTriConsumer<String, Optional<String>, Optional<String>> listener;
+        private final MCRTriConsumer<String, Optional<String>, Optional<String>> listener;
 
-        private UUID uuid;
+        private final UUID uuid;
 
         EventListener(Predicate<String> keyPredicate,
             MCRTriConsumer<String, Optional<String>, Optional<String>> listener) {
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationBase.java b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationBase.java
index f8cab370ab..22cd9971c2 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationBase.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationBase.java
@@ -258,11 +258,6 @@ public static synchronized void initialize(Map<String, String> deprecated, Map<S
         deprecatedProperties.putAll(deprecated);
         checkForDeprecatedProperties(props);
 
-        // instance helper cache
-        if (clear) {
-            MCRConfigurableInstanceHelper.clearCache();
-        }
-
         // base properties
         if (clear) {
             getBaseProperties().clear();
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationException.java b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationException.java
index 30b121ba29..7e2d1308ca 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationException.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurationException.java
@@ -18,10 +18,10 @@
 
 package org.mycore.common.config;
 
-import org.mycore.common.MCRException;
-
 import java.io.Serial;
 
+import org.mycore.common.MCRException;
+
 /**
  * Instances of this class represent an exception thrown because of an error in the MyCoRe configuration. Normally this
  * will be the case when a configuration property that is required is not set or has an illegal value.
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstance.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstance.java
index c613577894..6407271c25 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstance.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstance.java
@@ -54,11 +54,6 @@
      */
     boolean required() default true;
 
-    /**
-     * @return The {@link MCRSentinel} for the configured instance.
-     */
-    MCRSentinel sentinel() default @MCRSentinel(enabled = false);
-
     /**
      * @return The order in which the annotated fields or methods are processed. The higher the value, the later the
      * field or method is processed. All fields are processed first, then all methods are processed.
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstanceList.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstanceList.java
index 83ad0f983d..7c001dfca6 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstanceList.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstanceList.java
@@ -55,11 +55,6 @@
      */
     boolean required() default true;
 
-    /**
-     * @return The {@link MCRSentinel} for the configured instances.
-     */
-    MCRSentinel sentinel() default @MCRSentinel(enabled = false);
-
     /**
      * @return The order in which the annotated fields or methods are processed. The higher the value, the later the
      * field or method is processed. All fields are processed first, then all methods are processed.
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstanceMap.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstanceMap.java
index 2572e20c72..2046bb9743 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstanceMap.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRInstanceMap.java
@@ -55,11 +55,6 @@
      */
     boolean required() default true;
 
-    /**
-     * @return The {@link MCRSentinel} for the configured instances.
-     */
-    MCRSentinel sentinel() default @MCRSentinel(enabled = false);
-
     /**
      * @return The order in which the annotated fields or methods are processed. The higher the value, the later the
      * field or method is processed. All fields are processed first, then all methods are processed.
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRProperty.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRProperty.java
index b83716774f..e88a986dd1 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRProperty.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRProperty.java
@@ -63,11 +63,6 @@
      */
     String defaultName() default "";
 
-    /**
-     * @return The {@link MCRSentinel} for the configured property.
-     */
-    MCRSentinel sentinel() default @MCRSentinel(enabled = false);
-    
     /**
      * @return The order in which the annotated fields or methods are processed. The higher the value, the later the
      * field or method is processed. All fields are processed first, then all methods are processed.
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRPropertyList.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRPropertyList.java
index 56d948466f..2fca14190e 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRPropertyList.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRPropertyList.java
@@ -61,11 +61,6 @@
      * The default property must be absolute, e.g. <code>MCR.Foo.Bar</code>.
      */
     String defaultName() default "";
-    
-    /**
-     * @return The {@link MCRSentinel} for the configured properties.
-     */
-    MCRSentinel sentinel() default @MCRSentinel(enabled = false);
 
     /**
      * @return The order in which the annotated fields or methods are processed. The higher the value, the later the
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRPropertyMap.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRPropertyMap.java
index d5a5ce2fa1..f476b85203 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRPropertyMap.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRPropertyMap.java
@@ -62,11 +62,6 @@
      */
     String defaultName() default "";
 
-    /**
-     * @return The {@link MCRSentinel} for the configured properties.
-     */
-    MCRSentinel sentinel() default @MCRSentinel(enabled = false);
-
     /**
      * @return The order in which the annotated fields or methods are processed. The higher the value, the later the
      * field or method is processed. All fields are processed first, then all methods are processed.
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRRawProperties.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRRawProperties.java
index d2de781cc2..7495bec9a1 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRRawProperties.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRRawProperties.java
@@ -18,14 +18,14 @@
 
 package org.mycore.common.config.annotation;
 
-import org.mycore.common.config.MCRConfigurationException;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.mycore.common.config.MCRConfigurationException;
+
 /**
  * This annotation is used to mark fields or methods that should be set to or called with
  * a map of string values from the configuration properties.
diff --git a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRSentinel.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRSentinel.java
index e497fc52b6..14fff23d15 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRSentinel.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRSentinel.java
@@ -54,9 +54,4 @@
      */
     boolean rejectionValue() default false;
 
-    /**
-     * @return Weather or not the sentinel is enabled.
-     */
-    boolean enabled() default true;
-
 }
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
similarity index 58%
rename from mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java
rename to mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
index f10d9c66ac..2036fb0557 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
@@ -16,19 +16,28 @@
  * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mycore.common.config;
+package org.mycore.common.config.instantiator;
 
-import java.util.Collections;
+import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.mycore.common.MCRClassTools;
+import org.mycore.common.MCRException;
+import org.mycore.common.config.MCRConfiguration2;
+import org.mycore.common.config.MCRConfigurationException;
+import org.mycore.common.config.instantiator.MCRInstanceName.Suffix;
 
 /**
  * Represents an extract of properties (typically {@link MCRConfiguration2#getPropertiesMap()}) used to
  * instantiate an object. Provides methods to extract nested configurations.
  * <p>
  * Generally speaking, a configuration has a {@link MCRInstanceConfiguration#name()} that represents the
- * property key used to convey the {@link MCRInstanceConfiguration#className()} of the class that should
+ * property key used to convey the {@link MCRInstanceConfiguration#valueClass()} of the class that should
  * be instantiated and {@link MCRInstanceConfiguration#properties()} that are relevant for instantiation
  * (i.e. properties whose key originally started with the configuration name, but with that name removed
  * from the start of such keys; a configuration name of <code>Foo.Bar</code> and a property key of
@@ -37,59 +46,129 @@
  * Each configuration (top level or nested) keeps an unmodified  reference to the properties used to create
  * the top level configuration.
  */
-public final class MCRInstanceConfiguration {
+public final class MCRInstanceConfiguration<S> {
 
-    private final MCRInstanceName name;
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private final Class<S> superClass;
+
+    private final Class<? extends S> valueClass;
 
-    private final String className;
+    private final MCRInstanceName name;
 
     private final Map<String, String> properties;
 
     private final Map<String, String> fullProperties;
 
-    private MCRInstanceConfiguration(MCRInstanceName name, String className, Map<String, String> properties,
-        Map<String, String> fullProperties) {
+    private MCRInstanceConfiguration(Class<S> superClass, Class<? extends S> valueClass, MCRInstanceName name,
+        Map<String, String> properties, Map<String, String> fullProperties) {
+        this.superClass = superClass;
+        this.valueClass = valueClass;
         this.name = name;
-        this.className = className;
         this.properties = properties;
         this.fullProperties = fullProperties;
     }
 
+    public boolean instantiatable() {
+        return valueClass != null;
+    }
+
+    public S instantiate() {
+        return MCRInstantiator.instantiate(this);
+    }
+
     /**
-     * Shorthand for {@link MCRInstanceConfiguration#ofName(MCRInstanceName, Map)} that creates the name with
-     * {@link MCRInstanceName#of(String)} and uses {@link MCRConfiguration2#getPropertiesMap()} as the properties.
-     *
-     * @param name the name
-     * @return the configuration
+     * Shorthand for {@link MCRInstanceConfiguration#ofClass(Class, Class, String, Suffix, Map, Map)} that
+     * creates uses {@link MCRClassTools#forName(String)} to resolve the value class.
      */
-    public static MCRInstanceConfiguration ofName(String name) {
-        return ofName(MCRInstanceName.of(name), MCRConfiguration2.getPropertiesMap());
+    public static <S> MCRInstanceConfiguration<S> ofClassName(Class<S> superClass, String className,
+        String prefix, Suffix suffix, Map<String, String> properties, Map<String, String> fullProperties) {
+        try {
+            Class<? extends S> valueClass = MCRClassTools.forName(className);
+            return ofClass(superClass, valueClass, prefix, suffix, properties, fullProperties);
+        } catch (ClassNotFoundException e) {
+            throw new MCRException("Failed to load class " + className, e);
+
+        }
     }
 
     /**
-     * Shorthand for {@link MCRInstanceConfiguration#ofName(MCRInstanceName, Map)} that creates the name with
-     * {@link MCRInstanceName#of(String)}.
-     *
-     * @param name the name
-     * @return the configuration
+     * Creates a new configuration for the given super class and value class based on the given properties.
+     * <p>
+     * Example: Given value class <code>Some.Instance.Name</code>, prefix <code>Some.Instance.Name</code>,
+     * suffix {@link Suffix#NONE} and properties
+     * <ul>
+     *     <li><code>Some.Instance.Name.Key1=Value1</code></li>
+     *     <li><code>Some.Instance.Name.Key2=Value1</code></li>
+     * </ul>
+     * this will return an {@link MCRInstanceConfiguration} representing the
+     * {@link MCRInstanceConfiguration#name()} <code>Some.Instance.Name</code>,
+     * the {@link MCRInstanceConfiguration#valueClass()} <code>some.instance.ClassName</code>,
+     * {@link MCRInstanceConfiguration#properties()}
+     * <ul>
+     *     <li><code>Key1=Value1</code></li>
+     *     <li><code>Key2=Value2</code></li>
+     * </ul>
+     * and {@link MCRInstanceConfiguration#fullProperties()} that are equal to the given properties.
+     * <p>
+     * Alternatively, the {@link Suffix#LOWER_CASE} or {@link Suffix#NONE} could be used, in which case
+     * the keys <code>Class</code>, <code>class</code> and the empty key, if present,
+     * are not added to the {@link MCRInstanceConfiguration#properties()}.
+     * <p>
+     * Example: If prefix <code>Some.Instance.Name</code> and suffix {@link Suffix#UPPER_CASE}
+     * would have been used, properties <code>Some.Instance.Name.class=Foo</code> and
+     * <code>Some.Instance.Name=Bar</code> would be ignored. The resulting
+     * {@link MCRInstanceConfiguration#properties()} would not contains entries with keys <code>class</code>
+     * or the empty key, respectively.
      */
-    public static MCRInstanceConfiguration ofName(String name, Map<String, String> properties) {
-        return ofName(MCRInstanceName.of(name), properties);
+    public static <S> MCRInstanceConfiguration<S> ofClass(Class<S> superClass, Class<? extends S> valueClass,
+        String prefix, Suffix suffix, Map<String, String> properties, Map<String, String> fullProperties) {
+        MCRInstanceName name = MCRInstanceName.of(suffix.appendTo(prefix));
+        name.ignoredKeys().forEach(properties::remove);
+        return new MCRInstanceConfiguration<>(superClass, valueClass, name, properties, fullProperties);
     }
 
     /**
-     * Shorthand for {@link MCRInstanceConfiguration#ofName(MCRInstanceName, Map)} that uses
-     * {@link MCRConfiguration2#getPropertiesMap()} as the properties.
-     *
-     * @param name the name
-     * @return the configuration
+     * Shorthand for {@link MCRInstanceConfiguration#ofName(Class, MCRInstanceName, Map, Set)} that
+     * creates the name with {@link MCRInstanceName#of(String)} and
+     * uses {@link MCRConfiguration2#getPropertiesMap()} as the properties and
+     * uses {@link Options#NONE} as the options.
+     */
+    public static <T> MCRInstanceConfiguration<T> ofName(Class<T> superClass, String name) {
+        return ofName(superClass, MCRInstanceName.of(name), MCRConfiguration2.getPropertiesMap(), Options.NONE);
+    }
+
+    /**
+     * Shorthand for {@link MCRInstanceConfiguration#ofName(Class, MCRInstanceName, Map, Set)} that
+     * creates the name with {@link MCRInstanceName#of(String)} and
+     * uses {@link Options#NONE} as the options.
+     */
+    public static <T> MCRInstanceConfiguration<T> ofName(Class<T> superClass, String name,
+        Map<String, String> properties) {
+        return ofName(superClass, MCRInstanceName.of(name), properties, Options.NONE);
+    }
+
+    /**
+     * Shorthand for {@link MCRInstanceConfiguration#ofName(Class, MCRInstanceName, Map, Set)} that
+     * creates the name with {@link MCRInstanceName#of(String)} and
+     * uses {@link MCRConfiguration2#getPropertiesMap()} as the properties.
+     */
+    public static <T> MCRInstanceConfiguration<T> ofName(Class<T> superClass, String name,
+        Set<Option> options) {
+        return ofName(superClass, MCRInstanceName.of(name), MCRConfiguration2.getPropertiesMap(), options);
+    }
+
+    /**
+     * Shorthand for {@link MCRInstanceConfiguration#ofName(Class, MCRInstanceName, Map, Set)} that
+     * creates the name with {@link MCRInstanceName#of(String)} and.
      */
-    public static MCRInstanceConfiguration ofName(MCRInstanceName name) {
-        return ofName(name, MCRConfiguration2.getPropertiesMap());
+    public static <T> MCRInstanceConfiguration<T> ofName(Class<T> superClass, String name,
+        Map<String, String> properties, Set<Option> options) {
+        return ofName(superClass, MCRInstanceName.of(name), properties, options);
     }
 
     /**
-     * Creates a new configuration based on the given properties.
+     * Creates a new configuration for the given super class and instance name based on the given properties.
      * <p>
      * Example: Given an {@link MCRInstanceName} <code>Some.Instance.Name</code> and properties
      * <ul>
@@ -97,9 +176,9 @@ public static MCRInstanceConfiguration ofName(MCRInstanceName name) {
      *     <li><code>Some.Instance.Name.Key1=Value1</code></li>
      *     <li><code>Some.Instance.Name.Key2=Value1</code></li>
      * </ul>
-     * this will return an {@link MCRInstanceConfiguration}
-     * representing the {@link MCRInstanceConfiguration#name()} <code>Some.Instance.Name</code>,
-     * the {@link MCRInstanceConfiguration#className()} <code>some.instance.ClassName</code>,
+     * this will return an {@link MCRInstanceConfiguration} representing the
+     * {@link MCRInstanceConfiguration#name()} <code>Some.Instance.Name</code>,
+     * the {@link MCRInstanceConfiguration#valueClass()} <code>some.instance.ClassName</code>,
      * {@link MCRInstanceConfiguration#properties()}
      * <ul>
      *     <li><code>Key1=Value1</code></li>
@@ -108,7 +187,7 @@ public static MCRInstanceConfiguration ofName(MCRInstanceName name) {
      * and {@link MCRInstanceConfiguration#fullProperties()} that are equal to the given properties.
      * <p>
      * Alternatively, the {@link MCRInstanceName} <code>Some.Instance.Name.Class</code> or
-     * <code>Some.Instance.Name.class</code> could have been used to convey the class name, in which case
+     * <code>Some.Instance.Name.class</code> could be used to convey the class name, in which case
      * the keys <code>Class</code>, <code>class</code> and the empty key, if present,
      * are not added to the {@link MCRInstanceConfiguration#properties()}.
      * <p>
@@ -117,15 +196,38 @@ public static MCRInstanceConfiguration ofName(MCRInstanceName name) {
      * <code>Some.Instance.Name=Bar</code> would be ignored. The resulting
      * {@link MCRInstanceConfiguration#properties()} would not contains entries with keys <code>class</code>
      * or the empty key, respectively.
-     *
-     * @param name the name
-     * @param properties the properties
-     * @return the configuration
      */
-    public static MCRInstanceConfiguration ofName(MCRInstanceName name, Map<String, String> properties) {
-        String className = properties.get(name.actual());
+    public static <T> MCRInstanceConfiguration<T> ofName(Class<T> superClass, MCRInstanceName name,
+        Map<String, String> properties, Set<Option> options) {
+        Class<? extends T> valueClass = getValueClass(superClass, name, name.actual(), properties, options);
         Map<String, String> reducedProperties = reduceProperties(name, name.canonical(), properties);
-        return new MCRInstanceConfiguration(name, className, reducedProperties, properties);
+        return new MCRInstanceConfiguration<>(superClass, valueClass, name, reducedProperties, properties);
+    }
+
+    private static <S> Class<? extends S> getValueClass(Class<S> superClass, MCRInstanceName name,
+        String classProperty, Map<String, String> properties, Set<Option> options) {
+        String className = properties.get(classProperty);
+
+        if (className != null) {
+            if (className.isBlank()) {
+                return null;
+            }
+            try {
+                return MCRClassTools.forName(className);
+            } catch (ClassNotFoundException e) {
+                throw new MCRConfigurationException("Missing class (" + className + ")" +
+                    " configured in: " + name.actual(), e);
+            }
+        }
+
+        if (options.contains(Option.IMPLICIT) && Modifier.isFinal(superClass.getModifiers())) {
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("[IMPLICIT] Assuming implicit property {}={}", name.actual(), superClass.getName());
+            }
+            return superClass;
+        }
+        return null;
+
     }
 
     private static Map<String, String> reduceProperties(MCRInstanceName name, String prefix,
@@ -150,74 +252,18 @@ private static Map<String, String> reduceProperties(MCRInstanceName name, String
         return reducedProperties;
     }
 
-    /**
-     * Shorthand for {@link MCRInstanceConfiguration#ofClass(String, Map)} that uses the given classes name
-     * and empty properties.
-     *
-     * @param instanceClass the class
-     * @return the configuration
-     */
-    public static MCRInstanceConfiguration ofClass(Class<?> instanceClass) {
-        return ofClass(instanceClass.getName(), Collections.emptyMap());
+    public Class<S> superClass() {
+        return superClass;
     }
 
-    /**
-     * Shorthand for {@link MCRInstanceConfiguration#ofClass(String, Map)} that uses the given classes name.
-     *
-     * @param instanceClass the class
-     * @return the configuration
-     */
-    public static MCRInstanceConfiguration ofClass(Class<?> instanceClass, Map<String, String> properties) {
-        return ofClass(instanceClass.getName(), properties);
-    }
-
-    /**
-     * Shorthand for {@link MCRInstanceConfiguration#ofClass(String, Map)} that uses empty properties.
-     *
-     * @param className the class name
-     * @return the configuration
-     */
-    public static MCRInstanceConfiguration ofClass(String className) {
-        return ofClass(className, Collections.emptyMap());
-    }
-
-    /**
-     * Creates a new configuration for a given class name and the given properties.
-     * <p>
-     * Example: Given a class name <code>some.instance.ClassName</code> and properties
-     * <ul>
-     *     <li><code>Key1=Value1</code></li>
-     *     <li><code>Key2=Value1</code></li>
-     * </ul>
-     * this will return an {@link MCRInstanceConfiguration}
-     * representing an empty {@link MCRInstanceConfiguration#name()},
-     * the {@link MCRInstanceConfiguration#className()} <code>some.instance.ClassName</code>,
-     * {@link MCRInstanceConfiguration#properties()}
-     * <ul>
-     *     <li><code>Key1=Value1</code></li>
-     *     <li><code>Key2=Value2</code></li>
-     * </ul>
-     * and {@link MCRInstanceConfiguration#fullProperties()} that are equal to the given properties.
-     * <p>
-     *
-     * @param className the class name
-     * @param properties the properties
-     * @return the configuration
-     */
-    public static MCRInstanceConfiguration ofClass(String className, Map<String, String> properties) {
-        MCRInstanceName name = MCRInstanceName.of(MCRInstanceName.Suffix.UPPER_CASE.representation().orElse(""));
-        name.ignoredKeys().forEach(properties::remove);
-        return new MCRInstanceConfiguration(name, className, properties, properties);
+    public Class<? extends S> valueClass() {
+        return valueClass;
     }
 
     public MCRInstanceName name() {
         return name;
     }
 
-    public String className() {
-        return className;
-    }
-
     public Map<String, String> properties() {
         return properties;
     }
@@ -239,7 +285,7 @@ public Map<String, String> fullProperties() {
      * </ul>
      * and a <em>prefix</em> of <code>Foo</code>, this will return a an {@link MCRInstanceConfiguration}
      * representing the {@link MCRInstanceConfiguration#name()} <code>Some.Instance.Name.Foo</code>,
-     * {@link MCRInstanceConfiguration#className()} <code>some.nested.ClassName</code>
+     * {@link MCRInstanceConfiguration#valueClass()} <code>some.nested.ClassName</code>
      * and properties
      * <ul>
      *     <li><code>Key1=Value1</code></li>
@@ -258,11 +304,13 @@ public Map<String, String> fullProperties() {
      * @param prefix the prefix
      * @return the nested configuration
      */
-    public MCRInstanceConfiguration nestedConfiguration(String prefix) {
+    public <N> MCRInstanceConfiguration<N> nested(Class<N> superClass, String prefix) {
         MCRInstanceName nestedName = name.subName(prefix);
-        String className = properties.get(nestedName.suffix().appendTo(prefix));
+        String classProperty = nestedName.suffix().appendTo(prefix);
+        Class<? extends N> valueClass =
+            getValueClass(superClass, nestedName, classProperty, properties, Options.IMPLICIT);
         Map<String, String> reducedProperties = reduceProperties(nestedName, prefix, properties);
-        return new MCRInstanceConfiguration(nestedName, className, reducedProperties, fullProperties);
+        return new MCRInstanceConfiguration<>(superClass, valueClass, nestedName, reducedProperties, fullProperties);
     }
 
     /**
@@ -283,7 +331,7 @@ public MCRInstanceConfiguration nestedConfiguration(String prefix) {
      *     <li>
      *         an entry with key <code>A</code> mapping to an {@link MCRInstanceConfiguration}
      *         representing the {@link MCRInstanceConfiguration#name()} <code>Some.Instance.Name.Foo.A</code>,
-     *         {@link MCRInstanceConfiguration#className()} <code>some.nested.ClassNameA</code>
+     *         {@link MCRInstanceConfiguration#valueClass()} <code>some.nested.ClassNameA</code>
      *         and {@link MCRInstanceConfiguration#properties()}
      *        <ul>
      *            <li><code>Key1=ValueA1</code></li>
@@ -295,7 +343,7 @@ public MCRInstanceConfiguration nestedConfiguration(String prefix) {
      *     <li>
      *         an entry with key <code>B</code> mapping to an {@link MCRInstanceConfiguration}
      *         representing the {@link MCRInstanceConfiguration#name()} <code>Some.Instance.Name.Foo.B</code>,
-     *         {@link MCRInstanceConfiguration#className()} <code>some.nested.ClassNameB</code>
+     *         {@link MCRInstanceConfiguration#valueClass()} <code>some.nested.ClassNameB</code>
      *         and {@link MCRInstanceConfiguration#properties()}
      *        <ul>
      *            <li><code>Key1=ValueB1</code></li>
@@ -318,15 +366,16 @@ public MCRInstanceConfiguration nestedConfiguration(String prefix) {
      *
      * @return the nested configuration map
      */
-    public Map<String, MCRInstanceConfiguration> nestedConfigurationMap() {
-        Map<String, MCRInstanceConfiguration> nestedConfigurationMap = new HashMap<>();
+    public <N> Map<String, MCRInstanceConfiguration<N>> nestedMap(Class<N> superClass) {
+        Map<String, MCRInstanceConfiguration<N>> nestedConfigurationMap = new HashMap<>();
         for (Map.Entry<String, String> entry : properties().entrySet()) {
             String key = entry.getKey();
             int index = key.indexOf('.');
             String nestedConfigurationKey = -1 == index ? key : key.substring(0, index);
             if (!nestedConfigurationMap.containsKey(nestedConfigurationKey)) {
                 String nestedConfigurationSuffix = nestedConfigurationKey;
-                nestedConfigurationMap.put(nestedConfigurationKey, nestedConfiguration(nestedConfigurationSuffix));
+                nestedConfigurationMap.put(nestedConfigurationKey,
+                    nested(superClass, nestedConfigurationSuffix));
             }
         }
         return nestedConfigurationMap;
@@ -352,7 +401,7 @@ public Map<String, MCRInstanceConfiguration> nestedConfigurationMap() {
      *     <li>
      *         an entry with key <code>A</code> mapping to an {@link MCRInstanceConfiguration}
      *         representing the {@link MCRInstanceConfiguration#name()} <code>Some.Instance.Name.Foo.A</code>,
-     *         {@link MCRInstanceConfiguration#className()} <code>some.nested.ClassNameA</code>
+     *         {@link MCRInstanceConfiguration#valueClass()} <code>some.nested.ClassNameA</code>
      *         and {@link MCRInstanceConfiguration#properties()}
      *        <ul>
      *            <li><code>Key1=ValueA1</code></li>
@@ -364,7 +413,7 @@ public Map<String, MCRInstanceConfiguration> nestedConfigurationMap() {
      *     <li>
      *         an entry with key <code>B</code> mapping to an {@link MCRInstanceConfiguration}
      *         representing the {@link MCRInstanceConfiguration#name()} <code>Some.Instance.Name.Foo.B</code>,
-     *         {@link MCRInstanceConfiguration#className()} <code>some.nested.ClassNameB</code>
+     *         {@link MCRInstanceConfiguration#valueClass()} <code>some.nested.ClassNameB</code>
      *         and {@link MCRInstanceConfiguration#properties()}
      *        <ul>
      *            <li><code>Key1=ValueB1</code></li>
@@ -385,63 +434,63 @@ public Map<String, MCRInstanceConfiguration> nestedConfigurationMap() {
      * The resulting {@link MCRInstanceConfiguration#properties()} would not contain entries with keys
      * <code>class</code> or the empty key, respectively.
      *
-     * @param commonPrefix the common prefix
+     * @param prefix the common prefix
      * @return the nested configuration map
      */
-    public Map<String, MCRInstanceConfiguration> nestedConfigurationMap(String commonPrefix) {
-        String commonSuffixWithDelimiter = commonPrefix + ".";
-        Map<String, MCRInstanceConfiguration> nestedConfigurationMap = new HashMap<>();
+    public <N> Map<String, MCRInstanceConfiguration<N>> nestedMap(Class<N> superClass, String prefix) {
+        if (prefix.isEmpty()) {
+            return nestedMap(superClass);
+        }
+        String suffixWithDelimiter = prefix + ".";
+        Map<String, MCRInstanceConfiguration<N>> nestedConfigurationMap = new HashMap<>();
         for (Map.Entry<String, String> entry : properties().entrySet()) {
             String key = entry.getKey();
-            if (key.startsWith(commonSuffixWithDelimiter)) {
-                String remainingKey = key.substring(commonSuffixWithDelimiter.length());
+            if (key.startsWith(suffixWithDelimiter)) {
+                String remainingKey = key.substring(suffixWithDelimiter.length());
                 int index = remainingKey.indexOf('.');
                 String nestedConfigurationKey = -1 == index ? remainingKey : remainingKey.substring(0, index);
                 if (!nestedConfigurationMap.containsKey(nestedConfigurationKey)) {
-                    String nestedConfigurationSuffix = commonSuffixWithDelimiter + nestedConfigurationKey;
-                    nestedConfigurationMap.put(nestedConfigurationKey, nestedConfiguration(nestedConfigurationSuffix));
+                    String nestedConfigurationSuffix = suffixWithDelimiter + nestedConfigurationKey;
+                    nestedConfigurationMap.put(nestedConfigurationKey,
+                        nested(superClass, nestedConfigurationSuffix));
                 }
             }
         }
         return nestedConfigurationMap;
     }
 
-    /**
-     * Returns the configuration with a fixed class name.
-     * <p>
-     * Example: Given an {@link MCRInstanceConfiguration}
-     * representing the {@link MCRInstanceName} <code>Some.Instance.Name</code>, properties
-     * <ul>
-     *     <li><code>Foo=some.nested.ClassName</code></li>
-     *     <li><code>Foo.Key1=Value1</code></li>
-     *     <li><code>Foo.Key2=Value2</code></li>
-     *     <li><code>Bar=UnrelatedValue</code></li>
-     * </ul>
-     * and a <em>class</em> with class name <code>some.other.ClassName</code>, this will return 
-     * an {@link MCRInstanceConfiguration} representing the {@link MCRInstanceConfiguration#name()}
-     * <code>Some.Instance.Name</code>, {@link MCRInstanceConfiguration#className()}
-     * <code>some.other.ClassName</code> and properties
-     * <ul>
-     *     <li><code>Foo=some.nested.ClassName</code></li>
-     *     <li><code>Foo.Key1=Value1</code></li>
-     *     <li><code>Foo.Key2=Value2</code></li>
-     *     <li><code>Bar=UnrelatedValue</code></li>
-     * </ul>
-     *
-     * @param fixedClass the class to be used as a class name
-     * @return the modified configuration
-     */
-    public <S> MCRInstanceConfiguration withClass(Class<S> fixedClass) {
-        return new MCRInstanceConfiguration(name, fixedClass.getName(), properties, fullProperties);
-    }
-
     @Override
     public String toString() {
         return "MCRInstanceConfiguration {" +
+            "superClass=" + superClass.getName() + ", " +
+            "valueClass=" + valueClass.getName() + ", " +
             "name=" + name + ", " +
-            "className=" + className + ", " +
             "fullProperties=" + properties + ", " +
             "#fullProperties=" + fullProperties.size() + "}";
     }
 
+    public enum Option {
+
+        /**
+         * If a class name is required to be in the configuration properties (for example, because of usage of
+         * {@link MCRConfiguration2#getInstanceOfOrThrow(Class, String)} or because of an annotation with
+         * <code>required=true</code>) and the expected super class is a final class (meaning, if the property
+         * containing the class name is required to exist and can only have the class name of that final class),
+         * assume that that property exists (if it doesn't).
+         */
+        IMPLICIT
+
+    }
+
+    public static final class Options {
+
+        public static final Set<Option> NONE = Set.of();
+
+        public static final Set<Option> IMPLICIT = Set.of(Option.IMPLICIT);
+
+        private Options() {
+        }
+
+    }
+
 }
diff --git a/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceName.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceName.java
similarity index 94%
rename from mycore-base/src/main/java/org/mycore/common/config/MCRInstanceName.java
rename to mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceName.java
index 940fca990f..2e85025acb 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceName.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceName.java
@@ -16,7 +16,7 @@
  * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.mycore.common.config;
+package org.mycore.common.config.instantiator;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -137,15 +137,14 @@ public static Suffix[] representedValues() {
         public String appendTo(String string) {
             if (representation == null) {
                 return string;
-            } else {
-                if (string.isEmpty()) {
-                    return representation;
-                } else {
-                    return string + "." + representation;
-
-                }
             }
+            if (string.isEmpty()) {
+                return representation;
+            }
+            return string + "." + representation;
+
         }
+
     }
 
 }
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiator.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiator.java
new file mode 100644
index 0000000000..06d9120b2a
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiator.java
@@ -0,0 +1,370 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator;
+
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.annotationClassName;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.annotationClassNames;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.methodNames;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.targetTypeName;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.Supplier;
+import java.util.function.ToIntFunction;
+import java.util.stream.Stream;
+
+import org.mycore.common.config.MCRConfigurationException;
+import org.mycore.common.config.annotation.MCRConfigurationProxy;
+import org.mycore.common.config.annotation.MCRFactory;
+import org.mycore.common.config.annotation.MCRInstance;
+import org.mycore.common.config.annotation.MCRInstanceList;
+import org.mycore.common.config.annotation.MCRInstanceMap;
+import org.mycore.common.config.annotation.MCRPostConstruction;
+import org.mycore.common.config.annotation.MCRProperty;
+import org.mycore.common.config.annotation.MCRRawProperties;
+import org.mycore.common.config.instantiator.injectable.MCRFieldInjectable;
+import org.mycore.common.config.instantiator.injectable.MCRInjectable;
+import org.mycore.common.config.instantiator.injectable.MCRMethodInjectable;
+import org.mycore.common.config.instantiator.source.MCRSource;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRInstantiator} creates configured instances, by interpreting supported annotations on fields and methods,
+ * using information from these annotations to select values, from the configuration properties, and injecting thees
+ * values into the annotated fields and methods.
+ */
+@SuppressWarnings({ "PMD.MCR.Singleton.ClassModifiers", "PMD.MCR.Singleton.PrivateConstructor",
+    "PMD.MCR.Singleton.NonPrivateConstructors", "PMD.MCR.Singleton.MethodModifiers",
+    "PMD.MCR.Singleton.MethodReturnType", "PMD.SingletonClassReturningNewInstance" })
+final class MCRInstantiator {
+
+    private static final ConcurrentMap<Class<?>, MCRClassInfo<?>> INFOS = new ConcurrentHashMap<>();
+
+    private MCRInstantiator() {
+    }
+
+    static <S> S instantiate(MCRInstanceConfiguration<S> configuration) throws MCRConfigurationException {
+
+        Class<S> superClass = configuration.superClass();
+
+        if (configuration.valueClass() == null) {
+            throw new MCRConfigurationException("Missing or empty property: " + configuration.name().actual()
+                + " (and instance is not required or expected class " + superClass.getName()
+                + " is not final, therefore, the class name cannot be determined implicitly)");
+        }
+
+        Object instance = createInstanceDirectOrViaProxy(configuration);
+
+        if (!superClass.isAssignableFrom(instance.getClass())) {
+            throw new MCRConfigurationException("Instance of class " + instance.getClass().getName()
+                + ", configured in " + configuration.name().actual() + ", is incompatible with" +
+                " intended super class " + superClass.getName());
+        }
+
+        return superClass.cast(instance);
+
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <S> S createInstanceDirectOrViaProxy(MCRInstanceConfiguration<S> configuration) {
+
+        Class<? extends S> valaueClass = configuration.valueClass();
+        MCRConfigurationProxy productAnnotation = valaueClass.getDeclaredAnnotation(MCRConfigurationProxy.class);
+
+        if (productAnnotation != null) {
+            Class<Supplier<? extends S>> proxyClass = (Class<Supplier<? extends S>>) productAnnotation.proxyClass();
+            return getInfo(proxyClass).createInstance(configuration).get();
+        } else {
+            return getInfo(valaueClass).createInstance(configuration);
+        }
+
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <V> MCRClassInfo<V> getInfo(Class<V> valueClass) {
+        return (MCRClassInfo<V>) INFOS.computeIfAbsent(valueClass, MCRClassInfo::new);
+    }
+
+    /**
+     * A {@link MCRClassInfo} is a helper class that gathers and holds some information about a value class.
+     * <p>
+     * This class gathers the following information about the value class:
+     * <ul>
+     *   <li>
+     *     A {@link Supplier} as a factory for creating instances of the value class.
+     *     That factory is
+     *     <ol>
+     *       <li>
+     *         preferably the value classes parameterless public constructor or
+     *       </li>
+     *       <li>
+     *         a parameterless public static factory method whose name case-insensitively contains
+     *         the word "instance".
+     *       </li>
+     *     </ol>
+     *     An exception is thrown if neither kind of factory exists or if no suitable constructor but
+     *     multiple suitable factory methods exists.
+     *   </li>
+     *   <li>
+     *     A list of {@link Injector} that are executed after an instance of the value class has been created.
+     *     Each injector binds together a {@link MCRSource} and a {@link MCRTarget}.
+     *     <br/>
+     *     Sources implement the varying strategies that create values from configuration properties.
+     *     Source implementations exist for all supported annotations:
+     *     <ol>
+     *       <li>{@link MCRProperty}</li>
+     *       <li>{@link MCRRawProperties}</li>
+     *       <li>{@link MCRInstance}</li>
+     *       <li>{@link MCRInstanceMap}</li>
+     *       <li>{@link MCRInstanceList}</li>
+     *       <li>{@link MCRPostConstruction}</li>
+     *     </ol>
+     *     Targets are:
+     *     <ul>
+     *       <li>public fields,</li>
+     *       <li>public methods with no parameter or</li>
+     *       <li>public methods with one parameter.</li>
+     *     </ul>
+     *     The list of injectors is created by
+     *     <ol>
+     *       <li>
+     *         examining all possible fields and methods, generalized as {@link MCRInjectable},
+     *         (done in {@link MCRClassInfo#findInjectors(Class)}),
+     *       </li>
+     *       <li>
+     *         creating a corresponding source for supported annotations
+     *         (done in {@link MCRInjectable#toSource(MCRSource.Type)}),
+     *       </li>
+     *       <li>
+     *         creating a corresponding target for that injectable
+     *         (using {@link MCRInjectable#toTarget()}).
+     *       </li>
+     *     </ol>
+     *     An exception is thrown if multiple sources are detected for the same target (for example, because a method is
+     *     annotated with {@link MCRProperty} and {@link MCRPostConstruction}), if the target is not allowed for the
+     *     detected source (for example, {@link MCRPostConstruction} is only allowed on methods) or if the values
+     *     produced by the source are assignment-incompatible with the target (for example, values produced by a
+     *     source for {@link MCRProperty} are not assignment-compatible with {@link String}) (as far as type erasure
+     *     allows it to determine this preemptively).
+     *     <br/>
+     *     The list is ordered by the type of target (all fields first, then all methods), the type of source annotation
+     *     (first everything other than {@link MCRPostConstruction}, then {@link MCRPostConstruction}) and lastly the
+     *     order attribute of the source annotations, if available (for example {@link MCRProperty#order()}).
+     *   </li>
+     * </ul>
+     * <p>
+     * It is intended that instances of this class are cached, such that the information about the value class
+     * only needs to be gathered once.
+     */
+    private static final class MCRClassInfo<T> {
+
+        private final Class<T> valueClass;
+
+        private final Supplier<T> factory;
+
+        private final List<Injector> injectors;
+
+        private MCRClassInfo(Class<T> valueClass) {
+            this.valueClass = valueClass;
+            this.factory = getFactory(valueClass);
+            this.injectors = findInjectors(valueClass);
+        }
+
+        private Supplier<T> getFactory(Class<T> valueClass) {
+
+            List<Method> declaredFactoryMethods = findFactoryMethods(valueClass, valueClass.getDeclaredMethods());
+            Optional<Supplier<T>> factory = Stream.<Supplier<Optional<Supplier<T>>>>of(
+                () -> findSingletonFactoryMethod(declaredFactoryMethods),
+                () -> findAnnotatedFactoryMethod(declaredFactoryMethods),
+                () -> findDefaultConstructor(valueClass))
+                .map(Supplier::get)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .findFirst();
+
+            return factory.orElseThrow(() -> new MCRConfigurationException("Class " + valueClass.getName()
+                + " has no singleton factory method (public, static, matching return type, parameterless, name"
+                + " equals 'getInstance'), no annotated factory method (public, static, matching return type,"
+                + " parameterless, annotated with @MCRFactory) and no public parameterless constructor"));
+
+        }
+
+        private static <T> List<Method> findFactoryMethods(Class<T> valueClass, Method[] declaredMethods) {
+            return Stream.of(declaredMethods)
+                .filter(method -> Modifier.isPublic(method.getModifiers()))
+                .filter(method -> Modifier.isStatic(method.getModifiers()))
+                .filter(method -> method.getReturnType().isAssignableFrom(valueClass))
+                .filter(method -> method.getParameterTypes().length == 0)
+                .filter(method -> !method.isVarArgs())
+                .toList();
+        }
+
+        private Optional<Supplier<T>> findSingletonFactoryMethod(List<Method> factoryMethods) {
+
+            List<Method> singletonFactoryMethods = factoryMethods.stream()
+                .filter(method -> method.getName().equals("getInstance"))
+                .toList();
+
+            if (singletonFactoryMethods.size() > 1) {
+                throw new MCRConfigurationException("Class " + valueClass.getName()
+                    + " has multiple singleton factory methods (public, static, matching return type, parameterless,"
+                    + " name equals 'getInstance'): " + methodNames(singletonFactoryMethods));
+            }
+
+            return singletonFactoryMethods.stream().findFirst().map(this::createFactoryMethodFactory);
+
+        }
+
+        private Optional<Supplier<T>> findAnnotatedFactoryMethod(List<Method> factoryMethods) {
+
+            List<Method> annotatedFactoryMethods = factoryMethods.stream()
+                .filter(method -> method.getDeclaredAnnotation(MCRFactory.class) != null)
+                .toList();
+
+            if (annotatedFactoryMethods.size() > 1) {
+                throw new MCRConfigurationException("Class " + valueClass.getName()
+                    + " has multiple annotated factory methods (public, static, matching return type, parameterless,"
+                    + " annotated with @MCRFactory): " + methodNames(annotatedFactoryMethods));
+            }
+
+            return annotatedFactoryMethods.stream().findFirst().map(this::createFactoryMethodFactory);
+
+        }
+
+        private Optional<Supplier<T>> findDefaultConstructor(Class<T> valueClass) {
+            try {
+                return Optional.of(createConstructorFactory(valueClass.getConstructor()));
+            } catch (NoSuchMethodException e) {
+                return Optional.empty();
+            }
+        }
+
+        @SuppressWarnings("unchecked")
+        private Supplier<T> createFactoryMethodFactory(Method method) {
+            return () -> {
+                try {
+                    return (T) method.invoke(method.getDeclaringClass(), (Object[]) null);
+                } catch (Exception e) {
+                    throw new MCRConfigurationException("Unable to create an instance of "
+                        + method.getDeclaringClass().getName() + " using public, parameterless constructor", e);
+                }
+            };
+        }
+
+        private Supplier<T> createConstructorFactory(Constructor<T> constructor) {
+            return () -> {
+                try {
+                    return constructor.newInstance();
+                } catch (Exception e) {
+                    throw new MCRConfigurationException("Unable to create an instance of "
+                        + constructor.getDeclaringClass().getName() + " using parameterless public constructor", e);
+                }
+            };
+        }
+
+        private List<Injector> findInjectors(Class<T> valueClass) {
+            List<Injector> injectors = new LinkedList<>();
+            for (Field field : valueClass.getFields()) {
+                findInjector(new MCRFieldInjectable(field)).ifPresent(injectors::add);
+            }
+            for (Method method : valueClass.getMethods()) {
+                findInjector(new MCRMethodInjectable(method)).ifPresent(injectors::add);
+            }
+            Collections.sort(injectors);
+            return injectors;
+        }
+
+        private Optional<Injector> findInjector(MCRInjectable injectable) {
+
+            List<MCRSource> sources = new LinkedList<>();
+            for (MCRSource.Type sourceType : MCRSource.Type.values()) {
+                injectable.toSource(sourceType).ifPresent(sources::add);
+            }
+
+            if (sources.isEmpty()) {
+                return Optional.empty();
+            }
+
+            MCRTarget target = injectable.toTarget();
+            if (sources.size() != 1) {
+                throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
+                    + target.name() + "' has multiple annotations (" + annotationClassNames(sources)
+                    + ") in configured class " + valueClass.getName());
+            }
+
+            MCRSource source = sources.getFirst();
+
+            if (!source.allowedTargetTypes().contains(target.type())) {
+                throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
+                    + target.name() + "' is not allowed for annotation (" + annotationClassName(source)
+                    + ") in configured class " + valueClass.getName());
+            }
+
+            if (!target.isAssignableFrom(source.valueClass())) {
+                throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
+                    + target.name() + "' has incompatible type for annotation (" + annotationClassName(source)
+                    + ") in configured class " + valueClass.getName());
+            }
+
+            return Optional.of(new Injector(source, target));
+
+        }
+
+        public T createInstance(MCRInstanceConfiguration<?> configuration) {
+            T instance = factory.get();
+            for (Injector injector : injectors) {
+                injector.inject(instance, configuration);
+            }
+            return instance;
+        }
+
+    }
+
+    private record Injector(MCRSource source, MCRTarget target) implements Comparable<Injector> {
+
+        private static final Comparator<Injector> COMPARATOR = Comparator
+            .comparingInt((ToIntFunction<Injector>) injector -> injector.target.type().order())
+            .thenComparingInt(injector -> injector.source.type().order())
+            .thenComparingInt(injector -> injector.source.order());
+
+        private void inject(Object instance, MCRInstanceConfiguration<?> configuration) {
+            Object value = source.get(configuration, target);
+            if (value != null) {
+                target.set(instance, value);
+            }
+
+        }
+
+        @Override
+        public int compareTo(Injector other) {
+            return COMPARATOR.compare(this, other);
+        }
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiatorUtils.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiatorUtils.java
new file mode 100644
index 0000000000..e432a68d58
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiatorUtils.java
@@ -0,0 +1,211 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.mycore.common.MCRClassTools;
+import org.mycore.common.config.MCRConfigurationException;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.source.MCRSource;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * Utility class providing functions commonly used by {@link MCRInstantiator} and related classes.
+ */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
+public final class MCRInstantiatorUtils {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private MCRInstantiatorUtils() {
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> getClass(String property, String className) {
+        try {
+            return (Class<T>) MCRClassTools.forName(className);
+        } catch (ClassNotFoundException e) {
+            throw new MCRConfigurationException("Missing class (" + className + ") configured in: " + property, e);
+        }
+    }
+
+    public static Object createInstance(MCRTarget target, MCRInstanceConfiguration<?> configuration,
+        MCRSentinel sentinel, String description) {
+
+        String property = configuration.name().canonical();
+
+        if (sentinel != null) {
+            boolean sentinelValue = sentinel.defaultValue();
+            String configuredSentinelValue = configuration.properties().remove(sentinel.name());
+            if (configuredSentinelValue != null) {
+                sentinelValue = Boolean.parseBoolean(configuredSentinelValue);
+            }
+            if (sentinelValue == sentinel.rejectionValue()) {
+                if (LOGGER.isInfoEnabled()) {
+                    LOGGER.info("[SENTINEL] Ignoring {} {} and all sub-properties", description, property);
+                }
+                return null;
+            }
+        }
+
+        Class<?> className = configuration.valueClass();
+        if (className == null) {
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sub-properties (no or empty class name)", description,
+                    property);
+            }
+            return null;
+        }
+
+        if (!configuration.instantiatable()) {
+            return null;
+        }
+
+        Object instance = configuration.instantiate();
+
+        if (!configuration.valueClass().isAssignableFrom(instance.getClass())) {
+            throw incompatibilityException(property, target, configuration.valueClass(), instance);
+        }
+
+        return instance;
+
+    }
+
+    public static String methodNames(List<Method> methods) {
+        return methods.stream()
+            .map(Method::getName)
+            .collect(Collectors.joining(", "));
+    }
+
+    public static String targetTypeName(MCRTarget target) {
+        return target.type().name().toLowerCase(Locale.ROOT);
+    }
+
+    public static String annotationClassNames(List<MCRSource> sources) {
+        return sources.stream()
+            .map(MCRInstantiatorUtils::annotationClassName)
+            .collect(Collectors.joining(", "));
+    }
+
+    public static String annotationClassName(MCRSource source) {
+        return source.annotationClass().getName();
+    }
+
+    public static String property(MCRInstanceConfiguration<?> configuration, String annotationName) {
+        if (Objects.equals("", annotationName)) {
+            return configuration.name().canonical();
+        } else {
+            return configuration.name().canonical() + "." + annotationName;
+        }
+    }
+
+    public static MCRConfigurationException emptyNameException(MCRTarget target) {
+        return new MCRConfigurationException("The name for target " + targetTypeName(target) + " '" + target.name()
+            + "' in configured class " + target.declaringClass().getName() + " must not be empty");
+    }
+
+    public static MCRConfigurationException incompatibilityException(String property, MCRTarget target,
+        Class<?> annotationValueClass, Object instance) {
+        return new MCRConfigurationException("Instance of class " + instance.getClass().getName()
+            + "', configured in " + property + ", is incompatible with annotated value class "
+            + annotationValueClass.getName() + " for target " + targetTypeName(target)
+            + " '" + target.name() + "' in configured class " + target.declaringClass().getName());
+    }
+
+    public static MCRConfigurationException missingException(String property, MCRTarget target,
+        String description) {
+        return new MCRConfigurationException(
+            capitalize(description) + ", configured in " + property + " (and its sub-properties)," +
+                " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
+                + target.declaringClass().getName()
+                + " is missing");
+    }
+
+    public static MCRConfigurationException emptyException(String property, MCRTarget target, String description) {
+        return new MCRConfigurationException(
+            capitalize(description) + ", configured in " + property + " (and its sub-properties)," +
+                " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
+                + target.declaringClass().getName()
+                + " is empty");
+    }
+
+    public static MCRConfigurationException emptyRawException(String property, MCRTarget target,
+        String description) {
+        return new MCRConfigurationException(
+            capitalize(description) + ", configured in " + property + "," +
+                " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
+                + target.declaringClass().getName()
+                + " is empty");
+    }
+
+    public static MCRConfigurationException nonIntegerKeyException(String property, MCRTarget target,
+        String key, String description, NumberFormatException exception) {
+        return new MCRConfigurationException(
+            capitalize(description) + ", configured in " + property + " (and its sub-properties)," +
+                " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
+                + target.declaringClass().getName() + " has element with non-integer key " + key,
+            exception);
+    }
+
+    public static String capitalize(String description) {
+        return description.substring(0, 1).toUpperCase(Locale.ROOT) + description.substring(1);
+    }
+
+    public static MCRConfigurationException inconsistentKeysException(String property, MCRTarget target,
+        String key1, String key2, String description) {
+        return new MCRConfigurationException(
+            capitalize(description) + ", configured in " + property + " (and its sub-properties),"
+                + " for target " + targetTypeName(target) + " '" + target.name() + "' in configured class "
+                + target.declaringClass().getName() + " has element with inconsistent integer keys "
+                + key1 + " and " + key2);
+    }
+
+    @SuppressWarnings("PMD.PreserveStackTrace")
+    public static List<String> orderedKeys(String property, MCRTarget target, Map<String, ?> map,
+        String description) {
+
+        SortedMap<Integer, String> keyMap = new TreeMap<>();
+        for (String key : map.keySet()) {
+            try {
+                Integer integerValue = Integer.parseInt(key);
+                String alreadyMappedKey = keyMap.put(integerValue, key);
+                if (alreadyMappedKey != null && !alreadyMappedKey.equals(key)) {
+                    throw inconsistentKeysException(property, target, key, alreadyMappedKey, description);
+                }
+            } catch (NumberFormatException e) {
+                throw nonIntegerKeyException(property, target, key, description, e);
+            }
+        }
+
+        return new ArrayList<>(keyMap.values());
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRFieldInjectable.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRFieldInjectable.java
new file mode 100644
index 0000000000..5f7d3efd2d
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRFieldInjectable.java
@@ -0,0 +1,49 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.injectable;
+
+import java.lang.reflect.Field;
+import java.util.Optional;
+
+import org.mycore.common.config.instantiator.source.MCRSource;
+import org.mycore.common.config.instantiator.target.MCRFieldTarget;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRFieldInjectable} is a {@link MCRInjectable} that abstracts a {@link Field}.
+ */
+public final class MCRFieldInjectable implements MCRInjectable {
+
+    private final Field field;
+
+    public MCRFieldInjectable(Field field) {
+        this.field = field;
+    }
+
+    @Override
+    public Optional<MCRSource> toSource(MCRSource.Type sourceType) {
+        return sourceType.toSource(field::getAnnotation);
+    }
+
+    @Override
+    public MCRTarget toTarget() {
+        return new MCRFieldTarget(field);
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRInjectable.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRInjectable.java
new file mode 100644
index 0000000000..afb08441e0
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRInjectable.java
@@ -0,0 +1,39 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.injectable;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+import org.mycore.common.config.instantiator.source.MCRSource;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * Common abstraction for components of a class (i.e., a {@link Field} or a {@link Method}) that can,
+ * in principle, be used for injection. It provides abstractions for obtaining a value ({@link MCRSource})
+ * based on present annotations, and injecting obtained values ({@link MCRTarget}).
+ */
+public sealed interface MCRInjectable permits MCRFieldInjectable, MCRMethodInjectable {
+
+    Optional<MCRSource> toSource(MCRSource.Type sourceType);
+
+    MCRTarget toTarget();
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRMethodInjectable.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRMethodInjectable.java
new file mode 100644
index 0000000000..29fd47a4f9
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRMethodInjectable.java
@@ -0,0 +1,49 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.injectable;
+
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+import org.mycore.common.config.instantiator.source.MCRSource;
+import org.mycore.common.config.instantiator.target.MCRMethodTarget;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRFieldInjectable} is a {@link MCRInjectable} that abstracts a {@link Method}.
+ */
+public final class MCRMethodInjectable implements MCRInjectable {
+
+    private final Method method;
+
+    public MCRMethodInjectable(Method method) {
+        this.method = method;
+    }
+
+    @Override
+    public Optional<MCRSource> toSource(MCRSource.Type sourceType) {
+        return sourceType.toSource(method::getAnnotation);
+    }
+
+    @Override
+    public MCRTarget toTarget() {
+        return new MCRMethodTarget(method);
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRAnnotationProvider.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRAnnotationProvider.java
new file mode 100644
index 0000000000..8e1565f96b
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRAnnotationProvider.java
@@ -0,0 +1,27 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import java.lang.annotation.Annotation;
+
+public interface MCRAnnotationProvider {
+
+    <A extends Annotation> A get(Class<A> annotationClass);
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceListSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceListSource.java
new file mode 100644
index 0000000000..5dd4e6b7df
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceListSource.java
@@ -0,0 +1,101 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.createInstance;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.emptyException;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.orderedKeys;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.property;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.mycore.common.config.annotation.MCRInstanceList;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRInstanceListSource} is a {@link MCRSource} that interprets a {@link MCRInstanceList}.
+ */
+final class MCRInstanceListSource implements MCRSource {
+
+    private final MCRInstanceList annotation;
+
+    private final MCRSentinel sentinel;
+
+    MCRInstanceListSource(MCRInstanceList annotation, MCRAnnotationProvider annotationProvider) {
+        this.annotation = annotation;
+        this.sentinel = annotationProvider.get(MCRSentinel.class);
+    }
+
+    @Override
+    public Type type() {
+        return Type.INSTANCE_LIST;
+    }
+
+    @Override
+    public Class<MCRInstanceList> annotationClass() {
+        return MCRInstanceList.class;
+    }
+
+    @Override
+    public int order() {
+        return annotation.order();
+    }
+
+    @Override
+    public Set<MCRTarget.Type> allowedTargetTypes() {
+        return MCRTarget.Types.ALL;
+    }
+
+    @Override
+    public Class<?> valueClass() {
+        return List.class;
+    }
+
+    @Override
+    public List<Object> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurationMap =
+            configuration.nestedMap(annotation.valueClass(), annotation.name());
+
+        List<String> keyList = orderedKeys(property(configuration, annotation.name()), target,
+            nestedConfigurationMap, "instance list");
+
+        List<Object> instanceList = new ArrayList<>(nestedConfigurationMap.size());
+        for (String key : keyList) {
+            MCRInstanceConfiguration<?> nestedConfiguration = nestedConfigurationMap.get(key);
+            Object instance = createInstance(target, nestedConfiguration, sentinel, "instance list element");
+            if (instance != null) {
+                instanceList.add(instance);
+            }
+        }
+
+        if (instanceList.isEmpty() && annotation.required()) {
+            throw emptyException(property(configuration, annotation.name()), target, "instance list");
+        }
+
+        return instanceList;
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceMapSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceMapSource.java
new file mode 100644
index 0000000000..05b369675c
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceMapSource.java
@@ -0,0 +1,96 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.createInstance;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.emptyException;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.property;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.mycore.common.config.annotation.MCRInstanceMap;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRInstanceMapSource} is a {@link MCRSource} that interprets a {@link MCRInstanceMap}.
+ */
+final class MCRInstanceMapSource implements MCRSource {
+
+    private final MCRInstanceMap annotation;
+
+    private final MCRSentinel sentinel;
+
+    MCRInstanceMapSource(MCRInstanceMap annotation, MCRAnnotationProvider annotationProvider) {
+        this.annotation = annotation;
+        this.sentinel = annotationProvider.get(MCRSentinel.class);
+    }
+
+    @Override
+    public Type type() {
+        return Type.INSTANCE_MAP;
+    }
+
+    @Override
+    public Class<MCRInstanceMap> annotationClass() {
+        return MCRInstanceMap.class;
+    }
+
+    @Override
+    public int order() {
+        return annotation.order();
+    }
+
+    @Override
+    public Set<MCRTarget.Type> allowedTargetTypes() {
+        return MCRTarget.Types.ALL;
+    }
+
+    @Override
+    public Class<?> valueClass() {
+        return Map.class;
+    }
+
+    @Override
+    public Map<String, Object> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurationMap =
+            configuration.nestedMap(annotation.valueClass(), annotation.name());
+
+        Map<String, Object> instanceMap = new HashMap<>();
+        for (String key : nestedConfigurationMap.keySet()) {
+            MCRInstanceConfiguration<?> nestedConfiguration = nestedConfigurationMap.get(key);
+            Object instance = createInstance(target, nestedConfiguration, sentinel, "instance map entry");
+            if (instance != null) {
+                instanceMap.put(key, instance);
+            }
+        }
+
+        if (instanceMap.isEmpty() && annotation.required()) {
+            throw emptyException(property(configuration, annotation.name()), target, "instance map");
+        }
+
+        return instanceMap;
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceSource.java
new file mode 100644
index 0000000000..1960a96fb8
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceSource.java
@@ -0,0 +1,94 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.createInstance;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.emptyNameException;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.missingException;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.property;
+
+import java.util.Set;
+
+import org.mycore.common.config.annotation.MCRInstance;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRInstanceSource} is a {@link MCRSource} that interprets a {@link MCRInstance}.
+ */
+@SuppressWarnings({ "PMD.MCR.Singleton.ClassModifiers", "PMD.MCR.Singleton.PrivateConstructor",
+    "PMD.MCR.Singleton.NonPrivateConstructors", "PMD.MCR.Singleton.MethodModifiers",
+    "PMD.MCR.Singleton.MethodReturnType", "PMD.SingletonClassReturningNewInstance" })
+final class MCRInstanceSource implements MCRSource {
+
+    private final MCRInstance annotation;
+
+    private final MCRSentinel sentinel;
+
+    MCRInstanceSource(MCRInstance annotation, MCRAnnotationProvider annotationProvider) {
+        this.annotation = annotation;
+        this.sentinel = annotationProvider.get(MCRSentinel.class);
+    }
+
+    @Override
+    public Type type() {
+        return Type.INSTANCE;
+    }
+
+    @Override
+    public Class<MCRInstance> annotationClass() {
+        return MCRInstance.class;
+    }
+
+    @Override
+    public int order() {
+        return annotation.order();
+    }
+
+    @Override
+    public Set<MCRTarget.Type> allowedTargetTypes() {
+        return MCRTarget.Types.ALL;
+    }
+
+    @Override
+    public Class<?> valueClass() {
+        return annotation.valueClass();
+    }
+
+    @Override
+    public Object get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        String name = annotation.name();
+        if (name.isEmpty()) {
+            throw emptyNameException(target);
+        }
+
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(annotation.valueClass(), name);
+        Object instance = createInstance(target, nestedConfiguration, sentinel, "instance");
+
+        if (instance == null && annotation.required()) {
+            throw missingException(property(configuration, annotation.name()), target, "instance");
+        }
+
+        return instance;
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPostConstructionSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPostConstructionSource.java
new file mode 100644
index 0000000000..d2e8bec4f7
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPostConstructionSource.java
@@ -0,0 +1,71 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import java.util.Set;
+
+import org.mycore.common.config.annotation.MCRPostConstruction;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRPostConstructionSource} is a {@link MCRSource} that interprets a {@link MCRPostConstruction}.
+ */
+final class MCRPostConstructionSource implements MCRSource {
+
+    private final MCRPostConstruction annotation;
+
+    MCRPostConstructionSource(MCRPostConstruction annotation, MCRAnnotationProvider annotationProvider) {
+        this.annotation = annotation;
+    }
+
+    @Override
+    public Type type() {
+        return Type.POST_CONSTRUCTION;
+    }
+
+    @Override
+    public Class<MCRPostConstruction> annotationClass() {
+        return MCRPostConstruction.class;
+    }
+
+    @Override
+    public int order() {
+        return annotation.order();
+    }
+
+    @Override
+    public Set<MCRTarget.Type> allowedTargetTypes() {
+        return MCRTarget.Types.METHOD;
+    }
+
+    @Override
+    public Class<?> valueClass() {
+        return String.class;
+    }
+
+    @Override
+    public String get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+        return switch (annotation.value()) {
+            case ACTUAL -> configuration.name().actual();
+            case CANONICAL -> configuration.name().canonical();
+        };
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyListSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyListSource.java
new file mode 100644
index 0000000000..e2ff5333b2
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyListSource.java
@@ -0,0 +1,202 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.emptyException;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.orderedKeys;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.mycore.common.config.MCRConfiguration2;
+import org.mycore.common.config.annotation.MCRPropertyList;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.MCRInstanceName;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRPropertyListSource} is a {@link MCRSource} that interprets a {@link MCRPropertyList}.
+ */
+final class MCRPropertyListSource implements MCRSource {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private final MCRPropertyList annotation;
+
+    private final MCRSentinel sentinel;
+
+    MCRPropertyListSource(MCRPropertyList annotation, MCRAnnotationProvider annotationProvider) {
+        this.annotation = annotation;
+        this.sentinel = annotationProvider.get(MCRSentinel.class);
+    }
+
+    @Override
+    public Type type() {
+        return Type.PROPERTY_LIST;
+    }
+
+    @Override
+    public Class<MCRPropertyList> annotationClass() {
+        return MCRPropertyList.class;
+    }
+
+    @Override
+    public int order() {
+        return annotation.order();
+    }
+
+    @Override
+    public Set<MCRTarget.Type> allowedTargetTypes() {
+        return MCRTarget.Types.ALL;
+    }
+
+    @Override
+    public Class<?> valueClass() {
+        return List.class;
+    }
+
+    @Override
+    public List<String> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        Map<String, String> fullProperties = configuration.fullProperties();
+
+        String property;
+        String description;
+        List<String> propertyList;
+        if (annotation.absolute()) {
+            property = annotation.name();
+            description = "absolute property list";
+            Map<String, String> properties = fullProperties;
+            propertyList = getPropertyList(property, annotation.name(), ".", target, properties, description);
+        } else {
+            Map<String, String> properties = configuration.properties();
+            if (annotation.name().isEmpty()) {
+                property = configuration.name().canonical();
+                description = "property list";
+                // when non-empty class suffix is used, the property with empty name may contain the short-form-list
+                if (configuration.name().suffix() != MCRInstanceName.Suffix.NONE) {
+                    properties.put("", fullProperties.get(property));
+                }
+                propertyList = getPropertyList(property, "", "", target, properties, description);
+            } else {
+                property = configuration.name().canonical() + "." + annotation.name();
+                description = "property list";
+                propertyList = getPropertyList(property, annotation.name(), ".", target, properties, description);
+            }
+        }
+
+        String defaultName = annotation.defaultName();
+        if (propertyList == null && !defaultName.isEmpty()) {
+
+            property = defaultName;
+            description = "default property list";
+            propertyList = getPropertyList(defaultName, defaultName, ".", target, fullProperties, description);
+
+            if (propertyList == null || (propertyList.isEmpty() && annotation.required())) {
+                throw emptyException(property, target, description);
+            }
+
+        }
+
+        if ((propertyList == null || propertyList.isEmpty()) && annotation.required()) {
+            throw emptyException(property, target, description);
+        }
+
+        return propertyList == null ? new ArrayList<>() : propertyList;
+
+    }
+
+    private List<String> getPropertyList(String property, String prefix, String delimiter,
+        MCRTarget target, Map<String, String> properties, String description) {
+
+        AtomicBoolean hasRelevantProperty = new AtomicBoolean(false);
+
+        Map<String, String> rawPropertyMap = new HashMap<>();
+        String keyPrefix = prefix + delimiter;
+        int keyPrefixLength = keyPrefix.length();
+        properties.forEach((key, value) -> {
+            if (key.startsWith(keyPrefix) && !key.isEmpty()) {
+                int index = key.indexOf('.', keyPrefixLength);
+                if (index == -1) {
+                    if (!value.isEmpty()) {
+                        hasRelevantProperty.set(true);
+                        rawPropertyMap.put(key.substring(keyPrefixLength), value);
+                    }
+                }
+            }
+        });
+
+        List<String> headPropertyList = new ArrayList<>(0);
+        List<String> tailPropertyList = new ArrayList<>(rawPropertyMap.size());
+
+        List<String> keyList = orderedKeys(property, target, rawPropertyMap, description);
+        for (String key : keyList) {
+            String value = rawPropertyMap.get(key);
+            if (sentinel != null) {
+                boolean sentinelValue = sentinel.defaultValue();
+                String configuredSentinelValue = properties.get(keyPrefix + key + "." + sentinel.name());
+                if (configuredSentinelValue != null) {
+                    sentinelValue = Boolean.parseBoolean(configuredSentinelValue);
+                }
+                if (sentinelValue == sentinel.rejectionValue()) {
+                    if (LOGGER.isInfoEnabled()) {
+                        LOGGER.info("[SENTINEL] Ignoring {} element {}.{} and all sub-properties",
+                            description, property, key);
+                    }
+                    continue;
+                }
+            }
+
+            if (key.charAt(0) == '-') {
+                headPropertyList.add(value);
+            } else {
+                tailPropertyList.add(value);
+            }
+
+        }
+
+        List<String> shortFormList = List.of();
+        String shortFormProperty = properties.get(prefix);
+        if (shortFormProperty != null) {
+            hasRelevantProperty.set(true);
+            shortFormList = parseShortFormList(shortFormProperty);
+        }
+
+        int totalSize = headPropertyList.size() + shortFormList.size() + tailPropertyList.size();
+        List<String> fullPropertyList = new ArrayList<>(totalSize);
+        fullPropertyList.addAll(headPropertyList);
+        fullPropertyList.addAll(shortFormList);
+        fullPropertyList.addAll(tailPropertyList);
+
+        return hasRelevantProperty.get() ? fullPropertyList : null;
+
+    }
+
+    private List<String> parseShortFormList(String value) {
+        return MCRConfiguration2.splitValue(value).toList();
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyMapSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyMapSource.java
new file mode 100644
index 0000000000..3672ca6b2c
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyMapSource.java
@@ -0,0 +1,192 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.emptyException;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.mycore.common.config.MCRConfiguration2;
+import org.mycore.common.config.annotation.MCRPropertyMap;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.MCRInstanceName;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRPropertyMapSource} is a {@link MCRSource} that interprets a {@link MCRPropertyMap}.
+ */
+final class MCRPropertyMapSource implements MCRSource {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private final MCRPropertyMap annotation;
+
+    private final MCRSentinel sentinel;
+
+    MCRPropertyMapSource(MCRPropertyMap annotation, MCRAnnotationProvider annotationProvider) {
+        this.annotation = annotation;
+        this.sentinel = annotationProvider.get(MCRSentinel.class);
+    }
+
+    @Override
+    public Type type() {
+        return Type.PROPERTY_MAP;
+    }
+
+    @Override
+    public Class<MCRPropertyMap> annotationClass() {
+        return MCRPropertyMap.class;
+    }
+
+    @Override
+    public int order() {
+        return annotation.order();
+    }
+
+    @Override
+    public Set<MCRTarget.Type> allowedTargetTypes() {
+        return MCRTarget.Types.ALL;
+    }
+
+    @Override
+    public Class<?> valueClass() {
+        return Map.class;
+    }
+
+    @Override
+    public Map<String, String> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        Map<String, String> fullProperties = configuration.fullProperties();
+
+        String property;
+        String description;
+        Map<String, String> propertyMap;
+        if (annotation.absolute()) {
+            property = annotation.name();
+            description = "absolute property map";
+            Map<String, String> properties = fullProperties;
+            propertyMap = getPropertyMap(property, annotation.name(), ".", properties, description);
+        } else {
+            Map<String, String> properties = configuration.properties();
+            if (annotation.name().isEmpty()) {
+                property = configuration.name().canonical();
+                description = "property map";
+                // when non-empty class suffix is used, the property with empty name may contain the short-form-map
+                if (configuration.name().suffix() != MCRInstanceName.Suffix.NONE) {
+                    properties.put("", fullProperties.get(property));
+                }
+                propertyMap = getPropertyMap(property, "", "", properties, description);
+            } else {
+                property = configuration.name().canonical() + "." + annotation.name();
+                description = "property map";
+                propertyMap = getPropertyMap(property, annotation.name(), ".", properties, description);
+            }
+        }
+
+        String defaultName = annotation.defaultName();
+        if (propertyMap == null && !defaultName.isEmpty()) {
+
+            property = defaultName;
+            description = "default property map";
+            propertyMap = getPropertyMap(defaultName, defaultName, ".", fullProperties, description);
+
+            if (propertyMap == null || (propertyMap.isEmpty() && annotation.required())) {
+                throw emptyException(property, target, description);
+            }
+
+        }
+
+        if ((propertyMap == null || propertyMap.isEmpty()) && annotation.required()) {
+            throw emptyException(property, target, description);
+        }
+
+        return propertyMap == null ? new HashMap<>() : propertyMap;
+
+    }
+
+    private Map<String, String> getPropertyMap(String property, String prefix, String delimiter,
+        Map<String, String> properties, String description) {
+
+        AtomicBoolean hasRelevantProperty = new AtomicBoolean(false);
+
+        Map<String, String> shortFormMap = Map.of();
+        String shortFormProperty = properties.get(prefix);
+        if (shortFormProperty != null) {
+            hasRelevantProperty.set(true);
+            shortFormMap = parseShortFormMap(shortFormProperty);
+        }
+
+        Map<String, String> rawPropertyMap = new HashMap<>(shortFormMap);
+        String keyPrefix = prefix + delimiter;
+        int keyPrefixLength = keyPrefix.length();
+        properties.forEach((key, value) -> {
+            if (key.startsWith(keyPrefix) && !key.isEmpty()) {
+                int index = key.indexOf('.', keyPrefixLength);
+                if (index == -1) {
+                    if (!value.isEmpty()) {
+                        hasRelevantProperty.set(true);
+                        rawPropertyMap.put(key.substring(keyPrefixLength), value);
+                    }
+                }
+            }
+        });
+
+        Map<String, String> propertyMap = new HashMap<>();
+
+        for (String key : rawPropertyMap.keySet()) {
+            String value = rawPropertyMap.get(key);
+            if (sentinel != null) {
+                boolean sentinelValue = sentinel.defaultValue();
+                String configuredSentinelValue = properties.get(keyPrefix + key + "." + sentinel.name());
+                if (configuredSentinelValue != null) {
+                    sentinelValue = Boolean.parseBoolean(configuredSentinelValue);
+                }
+                if (sentinelValue == sentinel.rejectionValue()) {
+                    if (LOGGER.isInfoEnabled()) {
+                        LOGGER.info("[SENTINEL] Ignoring {} entry {}.{} and all sub-properties",
+                            description, property, key);
+                    }
+                    continue;
+                }
+            }
+
+            propertyMap.put(key, value);
+
+        }
+
+        return hasRelevantProperty.get() ? propertyMap : null;
+
+    }
+
+    private Map<String, String> parseShortFormMap(String value) {
+        return MCRConfiguration2.splitValue(value)
+            .map(s -> s.split(":", 2))
+            .filter(parts -> parts.length != 1)
+            .filter(parts -> !parts[1].isBlank())
+            .collect(Collectors.toMap(parts -> parts[0].trim(), parts -> parts[1].trim()));
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertySource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertySource.java
new file mode 100644
index 0000000000..a76d817746
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertySource.java
@@ -0,0 +1,141 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.emptyNameException;
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.missingException;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.mycore.common.config.annotation.MCRProperty;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRPropertySource} is a {@link MCRSource} that interprets a {@link MCRProperty}.
+ */
+final class MCRPropertySource implements MCRSource {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private final MCRProperty annotation;
+
+    private final MCRSentinel sentinel;
+
+    MCRPropertySource(MCRProperty annotation, MCRAnnotationProvider annotationProvider) {
+        this.annotation = annotation;
+        this.sentinel = annotationProvider.get(MCRSentinel.class);
+    }
+
+    @Override
+    public Type type() {
+        return Type.PROPERTY;
+    }
+
+    @Override
+    public Class<MCRProperty> annotationClass() {
+        return MCRProperty.class;
+    }
+
+    @Override
+    public int order() {
+        return annotation.order();
+    }
+
+    @Override
+    public Set<MCRTarget.Type> allowedTargetTypes() {
+        return MCRTarget.Types.ALL;
+    }
+
+    @Override
+    public Class<?> valueClass() {
+        return String.class;
+    }
+
+    @Override
+    public String get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        String name = annotation.name();
+        if (name.isEmpty()) {
+            throw emptyNameException(target);
+        }
+
+        Map<String, String> fullProperties = configuration.fullProperties();
+
+        String property;
+        String description;
+        String propertyValue;
+        if (annotation.absolute()) {
+            property = annotation.name();
+            description = "absolute property";
+            propertyValue = getPropertyValue(property, annotation.name(), fullProperties, description);
+        } else {
+            property = configuration.name().canonical() + "." + annotation.name();
+            description = "property";
+            propertyValue = getPropertyValue(property, annotation.name(), configuration.properties(), description);
+        }
+
+        String defaultName = annotation.defaultName();
+        if (propertyValue == null && !defaultName.isEmpty()) {
+
+            property = defaultName;
+            description = "default property";
+            propertyValue = getPropertyValue(defaultName, defaultName, fullProperties, description);
+
+            if (propertyValue == null) {
+                throw missingException(property, target, description);
+            }
+
+        }
+
+        if (propertyValue == null && annotation.required()) {
+            throw missingException(property, target, description);
+        }
+
+        return propertyValue;
+
+    }
+
+    private String getPropertyValue(String property, String prefix,
+        Map<String, String> properties, String description) {
+
+        if (sentinel != null) {
+            boolean sentinelValue = sentinel.defaultValue();
+            String configuredSentinelValue = properties.get(prefix + "." + sentinel.name());
+            if (configuredSentinelValue != null) {
+                sentinelValue = Boolean.parseBoolean(configuredSentinelValue);
+            }
+            if (sentinelValue == sentinel.rejectionValue()) {
+                if (LOGGER.isInfoEnabled()) {
+                    LOGGER.info("[SENTINEL] Ignoring {} {} and all sub-properties", description, property);
+                }
+                return null;
+            }
+
+        }
+
+        return properties.get(prefix);
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRRawPropertiesSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRRawPropertiesSource.java
new file mode 100644
index 0000000000..8a424855c5
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRRawPropertiesSource.java
@@ -0,0 +1,108 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import static org.mycore.common.config.instantiator.MCRInstantiatorUtils.emptyRawException;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.mycore.common.config.MCRConfigurationException;
+import org.mycore.common.config.annotation.MCRRawProperties;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * A {@link MCRRawPropertiesSource} is a {@link MCRRawProperties} that interprets a {@link MCRSource}.
+ */
+final class MCRRawPropertiesSource implements MCRSource {
+
+    private final MCRRawProperties annotation;
+
+    private final String prefix;
+
+    MCRRawPropertiesSource(MCRRawProperties annotation, MCRAnnotationProvider annotationProvider) {
+        this.annotation = annotation;
+        String namePattern = annotation.namePattern();
+        if (namePattern.equals("*")) {
+            this.prefix = "";
+        } else if (namePattern.endsWith(".*")) {
+            this.prefix = namePattern.substring(0, namePattern.length() - 1);
+        } else {
+            throw new MCRConfigurationException("Unsupported name pattern:" + annotation.namePattern());
+        }
+    }
+
+    @Override
+    public Type type() {
+        return Type.RAW_PROPERTIES;
+    }
+
+    @Override
+    public Class<MCRRawProperties> annotationClass() {
+        return MCRRawProperties.class;
+    }
+
+    @Override
+    public int order() {
+        return annotation.order();
+    }
+
+    @Override
+    public Set<MCRTarget.Type> allowedTargetTypes() {
+        return MCRTarget.Types.ALL;
+    }
+
+    @Override
+    public Class<?> valueClass() {
+        return Map.class;
+    }
+
+    @Override
+    public Map<String, String> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        Map<String, String> properties =
+            annotation.absolute() ? configuration.fullProperties() : configuration.properties();
+
+        Map<String, String> filteredProperties = new HashMap<>();
+        properties.forEach((key, value) -> {
+            if (key.startsWith(prefix)) {
+                filteredProperties.put(key.substring(prefix.length()), value);
+            }
+        });
+
+        if (filteredProperties.isEmpty() && annotation.required()) {
+            String property;
+            String description;
+            if (annotation.absolute()) {
+                property = annotation.namePattern();
+                description = "absolute raw property map";
+            } else {
+                property = configuration.name().canonical() + "." + annotation.namePattern();
+                description = "raw property map";
+            }
+            throw emptyRawException(property, target, description);
+        }
+
+        return filteredProperties;
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRSource.java
new file mode 100644
index 0000000000..bc8d0b0ca0
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRSource.java
@@ -0,0 +1,134 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.source;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+import org.mycore.common.config.annotation.MCRInstance;
+import org.mycore.common.config.annotation.MCRInstanceList;
+import org.mycore.common.config.annotation.MCRInstanceMap;
+import org.mycore.common.config.annotation.MCRPostConstruction;
+import org.mycore.common.config.annotation.MCRProperty;
+import org.mycore.common.config.annotation.MCRPropertyList;
+import org.mycore.common.config.annotation.MCRPropertyMap;
+import org.mycore.common.config.annotation.MCRRawProperties;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.target.MCRTarget;
+
+/**
+ * Common abstraction for components of a class (i.e., a {@link Field} or a {@link Method}) that can,
+ * in principle, be used for injection. It provides an abstraction for obtaining a value based on present annotations.
+ */
+public sealed interface MCRSource permits MCRInstanceListSource, MCRInstanceMapSource, MCRInstanceSource,
+    MCRPostConstructionSource, MCRPropertyListSource, MCRPropertyMapSource, MCRPropertySource, MCRRawPropertiesSource {
+
+    Type type();
+
+    Class<? extends Annotation> annotationClass();
+
+    int order();
+
+    Set<MCRTarget.Type> allowedTargetTypes();
+
+    Class<?> valueClass();
+
+    Object get(MCRInstanceConfiguration<?> configuration, MCRTarget target);
+
+    enum Type {
+
+        PROPERTY(Group.VALUE_INJECTION,
+            new Mapper<>(MCRProperty.class, MCRPropertySource::new)),
+
+        PROPERTY_MAP(
+            Group.VALUE_INJECTION,
+            new Mapper<>(MCRPropertyMap.class, MCRPropertyMapSource::new)),
+
+        PROPERTY_LIST(
+            Group.VALUE_INJECTION,
+            new Mapper<>(MCRPropertyList.class, MCRPropertyListSource::new)),
+
+        RAW_PROPERTIES(
+            Group.VALUE_INJECTION,
+            new Mapper<>(MCRRawProperties.class, MCRRawPropertiesSource::new)),
+
+        INSTANCE(
+            Group.VALUE_INJECTION,
+            new Mapper<>(MCRInstance.class, MCRInstanceSource::new)),
+
+        INSTANCE_MAP(
+            Group.VALUE_INJECTION,
+            new Mapper<>(MCRInstanceMap.class, MCRInstanceMapSource::new)),
+
+        INSTANCE_LIST(
+            Group.VALUE_INJECTION,
+            new Mapper<>(MCRInstanceList.class, MCRInstanceListSource::new)),
+
+        POST_CONSTRUCTION(
+            Group.POST_CONSTRUCTION,
+            new Mapper<>(MCRPostConstruction.class, MCRPostConstructionSource::new));
+
+        private final Group group;
+
+        private final Mapper<? extends Annotation> mapper;
+
+        Type(Group group, Mapper<? extends Annotation> mapper) {
+            this.group = group;
+            this.mapper = mapper;
+        }
+
+        public int order() {
+            return group.ordinal();
+        }
+
+        public Optional<MCRSource> toSource(MCRAnnotationProvider annotationProvider) {
+            return mapper.toSource(annotationProvider);
+        }
+
+        private enum Group {
+
+            VALUE_INJECTION,
+
+            POST_CONSTRUCTION
+
+        }
+
+        private record Mapper<A extends Annotation>(Class<A> annotationClass,
+            BiFunction<A, MCRAnnotationProvider, MCRSource> factory)
+            implements Serializable {
+
+            @Serial
+            private static final long serialVersionUID = 1L;
+
+            private Optional<MCRSource> toSource(MCRAnnotationProvider annotationProvider) {
+                return Optional.ofNullable(annotationProvider.get(annotationClass()))
+                    .map(annotation -> factory.apply(annotation, annotationProvider));
+            }
+
+        }
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRFieldTarget.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRFieldTarget.java
new file mode 100644
index 0000000000..b4eae9f3c2
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRFieldTarget.java
@@ -0,0 +1,71 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.target;
+
+import java.lang.reflect.Field;
+
+import org.mycore.common.config.MCRConfigurationException;
+
+/**
+ * A {@link MCRFieldTarget} is a {@link MCRTarget} that abstracts a {@link Field}.
+ */
+public final class MCRFieldTarget implements MCRTarget {
+
+    private final Field field;
+
+    public MCRFieldTarget(Field field) {
+        this.field = field;
+    }
+
+    @Override
+    public Type type() {
+        return Type.FIELD;
+    }
+
+    @Override
+    public Class<?> declaringClass() {
+        return field.getDeclaringClass();
+    }
+
+    @Override
+    public String name() {
+        return field.getName();
+    }
+
+    @Override
+    public boolean isAssignableFrom(Class<?> valueClass) {
+        return valueClass.isAssignableFrom(field.getType());
+    }
+
+    @Override
+    public void set(Object instance, Object value) {
+        try {
+            field.set(instance, value);
+        } catch (Exception e) {
+            throw new MCRConfigurationException("Failed to set target field '" + name() + "' to '" + value
+                + "' in configurable class " + field.getDeclaringClass().getName(), e);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return field.getDeclaringClass().getSimpleName() + "#" + field.getName();
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRMethodTarget.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRMethodTarget.java
new file mode 100644
index 0000000000..c4460a9390
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRMethodTarget.java
@@ -0,0 +1,85 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.target;
+
+import java.lang.reflect.Method;
+
+import org.mycore.common.config.MCRConfigurationException;
+
+/**
+ * A {@link MCRMethodTarget} is a {@link MCRTarget} that abstracts a {@link Method}.
+ */
+public final class MCRMethodTarget implements MCRTarget {
+
+    private final Method method;
+
+    private final boolean hasParameter;
+
+    public MCRMethodTarget(Method method) {
+        this.method = method;
+        int numberOfParameters = method.getParameterTypes().length;
+        if (numberOfParameters > 1) {
+            throw new MCRConfigurationException("Target method '" + method.getName() +
+                "' has an unexpected number of parameters (" + numberOfParameters +
+                ") in configured class " + method.getDeclaringClass().getName());
+        }
+        this.hasParameter = numberOfParameters == 1;
+    }
+
+    @Override
+    public Type type() {
+        return Type.METHOD;
+    }
+
+    @Override
+    public Class<?> declaringClass() {
+        return method.getDeclaringClass();
+    }
+
+    @Override
+    public String name() {
+        return method.getName();
+    }
+
+    @Override
+    public boolean isAssignableFrom(Class<?> valueClass) {
+        return !hasParameter || method.getParameterTypes()[0].isAssignableFrom(valueClass);
+    }
+
+    @Override
+    public void set(Object instance, Object value) {
+        try {
+            if (hasParameter) {
+                method.invoke(instance, value);
+            } else {
+                method.invoke(instance);
+            }
+        } catch (Exception e) {
+            throw new MCRConfigurationException("Failed to call target method '" + name() + "' " +
+                (hasParameter ? ("with '" + value + "' ") : "") + "in configurable class "
+                + method.getDeclaringClass().getName(), e);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return method.getDeclaringClass().getSimpleName() + "#" + method.getName() + "()";
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRTarget.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRTarget.java
new file mode 100644
index 0000000000..d2027467b8
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRTarget.java
@@ -0,0 +1,68 @@
+/*
+ * This file is part of ***  M y C o R e  ***
+ * See https://www.mycore.de/ for details.
+ *
+ * MyCoRe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * MyCoRe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with MyCoRe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.mycore.common.config.instantiator.target;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * Common abstraction for components of a class (i.e., a {@link Field} or a {@link Method}) that
+ * is, in fact, being used for injection. It provides an abstraction for injecting obtained values.
+ */
+public sealed interface MCRTarget permits MCRFieldTarget, MCRMethodTarget {
+
+    Type type();
+
+    Class<?> declaringClass();
+
+    String name();
+
+    boolean isAssignableFrom(Class<?> valueClass);
+
+    void set(Object instance, Object value);
+
+    enum Type {
+
+        FIELD,
+
+        METHOD;
+
+        public int order() {
+            return ordinal();
+        }
+
+    }
+
+    final class Types {
+
+        public static final Set<Type> FIELD = Set.of(Type.FIELD);
+
+        public static final Set<Type> METHOD = Set.of(Type.METHOD);
+
+        public static final Set<Type> ALL = Collections.unmodifiableSet(EnumSet.allOf(Type.class));
+
+        private Types() {
+        }
+
+    }
+
+}
diff --git a/mycore-base/src/main/java/org/mycore/common/xml/derivate/MCRCombinedDerivateDisplayFilter.java b/mycore-base/src/main/java/org/mycore/common/xml/derivate/MCRCombinedDerivateDisplayFilter.java
index dc9b1732b0..385cc795ac 100644
--- a/mycore-base/src/main/java/org/mycore/common/xml/derivate/MCRCombinedDerivateDisplayFilter.java
+++ b/mycore-base/src/main/java/org/mycore/common/xml/derivate/MCRCombinedDerivateDisplayFilter.java
@@ -83,8 +83,8 @@ public Boolean isDisplayEnabled(MCRDerivate derivate, String intent) {
 
     public static class Factory implements Supplier<MCRCombinedDerivateDisplayFilter> {
 
-        @MCRInstanceList(name = FILTERS_KEY, valueClass = MCRDerivateDisplayFilter.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = FILTERS_KEY, valueClass = MCRDerivateDisplayFilter.class, required = false)
         public List<MCRDerivateDisplayFilter> filters;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRConditionalXMappingEvaluator.java b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRConditionalXMappingEvaluator.java
index b1ba338cf0..59aafe3e8c 100644
--- a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRConditionalXMappingEvaluator.java
+++ b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRConditionalXMappingEvaluator.java
@@ -307,12 +307,12 @@ public interface Condition {
 
     public static class Factory implements Supplier<MCRConditionalXMappingEvaluator> {
 
-        @MCRInstance(name = STRING_EVALUATOR_KEY, valueClass = Evaluator.class,
-            required = false, sentinel = @MCRSentinel(name = MCRSentinel.DEFAULT_KEY, rejectionValue = true,
-                defaultValue = false))
+        @MCRSentinel(name = MCRSentinel.DEFAULT_KEY, rejectionValue = true, defaultValue = false)
+        @MCRInstance(name = STRING_EVALUATOR_KEY, valueClass = Evaluator.class, required = false)
         public Evaluator stringEvaluator;
 
-        @MCRInstanceMap(name = CONDITIONS_KEY, valueClass = Condition.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = CONDITIONS_KEY, valueClass = Condition.class, required = false)
         public Map<String, Condition> conditions;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRDefaultGeneratorClassificationMapper.java b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRDefaultGeneratorClassificationMapper.java
index 535d4b0ef2..073d7fece3 100644
--- a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRDefaultGeneratorClassificationMapper.java
+++ b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRDefaultGeneratorClassificationMapper.java
@@ -101,7 +101,8 @@ private static MCRMetaClassification toMetaClassification(MCRCategoryID category
 
     public static class Factory implements Supplier<MCRDefaultGeneratorClassificationMapper> {
 
-        @MCRInstanceMap(name = GENERATORS_KEY, valueClass = Generator.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = GENERATORS_KEY, valueClass = Generator.class, required = false)
         public Map<String, Generator> generators;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRDefaultXMappingClassificationGenerator.java b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRDefaultXMappingClassificationGenerator.java
index 088a09917b..e48e9f95e4 100644
--- a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRDefaultXMappingClassificationGenerator.java
+++ b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/mapping/MCRDefaultXMappingClassificationGenerator.java
@@ -114,8 +114,8 @@ private MCRCategory loadClassification(MCRCategoryDAO dao, Element classificatio
 
     public static class Factory implements Supplier<MCRDefaultXMappingClassificationGenerator> {
 
-        @MCRInstance(name = EVALUATOR_KEY, valueClass = Evaluator.class, required = false,
-            sentinel = @MCRSentinel(name = MCRSentinel.DEFAULT_KEY, rejectionValue = true, defaultValue = false))
+        @MCRSentinel(name = MCRSentinel.DEFAULT_KEY, rejectionValue = true, defaultValue = false)
+        @MCRInstance(name = EVALUATOR_KEY, valueClass = Evaluator.class, required = false)
         public Evaluator evaluator;
 
         @MCRProperty(name = ON_MISSING_MAPPED_CATEGORY_KEY)
diff --git a/mycore-base/src/main/java/org/mycore/resource/MCRResourceResolver.java b/mycore-base/src/main/java/org/mycore/resource/MCRResourceResolver.java
index a32e132310..e1b1ae6ecc 100644
--- a/mycore-base/src/main/java/org/mycore/resource/MCRResourceResolver.java
+++ b/mycore-base/src/main/java/org/mycore/resource/MCRResourceResolver.java
@@ -358,12 +358,12 @@ public MCRHints defaultHints() {
     @SuppressWarnings("PMD.SystemPrintln")
     public static class Factory implements Supplier<MCRResourceResolver> {
 
-        @MCRInstanceMap(name = HINTS_KEY, valueClass = MCRHint.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = HINTS_KEY, valueClass = MCRHint.class, required = false)
         public Map<String, MCRHint<?>> hints;
 
-        @MCRInstanceMap(name = PROVIDERS_KEY, valueClass = MCRResourceProvider.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = PROVIDERS_KEY, valueClass = MCRResourceProvider.class, required = false)
         public Map<String, MCRResourceProvider> providers;
 
         @MCRProperty(name = SELECTED_PROVIDER_KEY)
diff --git a/mycore-base/src/main/java/org/mycore/resource/filter/MCRCombinedResourceFilter.java b/mycore-base/src/main/java/org/mycore/resource/filter/MCRCombinedResourceFilter.java
index 0240955fac..baea46edf2 100644
--- a/mycore-base/src/main/java/org/mycore/resource/filter/MCRCombinedResourceFilter.java
+++ b/mycore-base/src/main/java/org/mycore/resource/filter/MCRCombinedResourceFilter.java
@@ -88,8 +88,8 @@ public MCRTreeMessage compileDescription(Level level) {
 
     public static class Factory implements Supplier<MCRCombinedResourceFilter> {
 
-        @MCRInstanceList(name = FILTERS_KEY, valueClass = MCRResourceFilter.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = FILTERS_KEY, valueClass = MCRResourceFilter.class, required = false)
         public List<MCRResourceFilter> filters;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/resource/hint/MCRClasspathDirsProviderResourceHint.java b/mycore-base/src/main/java/org/mycore/resource/hint/MCRClasspathDirsProviderResourceHint.java
index 14ec5fd642..2f13c8a2b1 100644
--- a/mycore-base/src/main/java/org/mycore/resource/hint/MCRClasspathDirsProviderResourceHint.java
+++ b/mycore-base/src/main/java/org/mycore/resource/hint/MCRClasspathDirsProviderResourceHint.java
@@ -72,8 +72,8 @@ public Optional<MCRClasspathDirsProvider> value() {
 
     public static class Factory implements Supplier<MCRClasspathDirsProviderResourceHint> {
 
-        @MCRInstance(name = PROVIDER_KEY, valueClass = MCRClasspathDirsProvider.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstance(name = PROVIDER_KEY, valueClass = MCRClasspathDirsProvider.class, required = false)
         public MCRClasspathDirsProvider provider;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/resource/locator/MCRCombinedResourceLocator.java b/mycore-base/src/main/java/org/mycore/resource/locator/MCRCombinedResourceLocator.java
index 5216d51ba0..c1a397bf57 100644
--- a/mycore-base/src/main/java/org/mycore/resource/locator/MCRCombinedResourceLocator.java
+++ b/mycore-base/src/main/java/org/mycore/resource/locator/MCRCombinedResourceLocator.java
@@ -88,8 +88,8 @@ public Stream<PrefixStripper> prefixStrippers(MCRHints hints) {
 
     public static class Factory implements Supplier<MCRCombinedResourceLocator> {
 
-        @MCRInstanceList(name = LOCATORS_KEY, valueClass = MCRResourceLocator.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = LOCATORS_KEY, valueClass = MCRResourceLocator.class, required = false)
         public List<MCRResourceLocator> locators;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/resource/provider/MCRCombinedResourceProvider.java b/mycore-base/src/main/java/org/mycore/resource/provider/MCRCombinedResourceProvider.java
index 9a51a31dda..0148a284c3 100644
--- a/mycore-base/src/main/java/org/mycore/resource/provider/MCRCombinedResourceProvider.java
+++ b/mycore-base/src/main/java/org/mycore/resource/provider/MCRCombinedResourceProvider.java
@@ -123,8 +123,8 @@ public static class Factory implements Supplier<MCRCombinedResourceProvider> {
         @MCRProperty(name = COVERAGE_KEY, defaultName = "MCR.Resource.Provider.Default.Combined.Coverage")
         public String coverage;
 
-        @MCRInstanceList(name = PROVIDERS_KEY, valueClass = MCRResourceProvider.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = PROVIDERS_KEY, valueClass = MCRResourceProvider.class, required = false)
         public List<MCRResourceProvider> providers;
 
         @Override
diff --git a/mycore-base/src/main/java/org/mycore/resource/selector/MCRCombinedResourceSelector.java b/mycore-base/src/main/java/org/mycore/resource/selector/MCRCombinedResourceSelector.java
index 5ec62be935..62e91ed000 100644
--- a/mycore-base/src/main/java/org/mycore/resource/selector/MCRCombinedResourceSelector.java
+++ b/mycore-base/src/main/java/org/mycore/resource/selector/MCRCombinedResourceSelector.java
@@ -94,8 +94,8 @@ public MCRTreeMessage compileDescription(Level level) {
 
     public static class Factory implements Supplier<MCRCombinedResourceSelector> {
 
-        @MCRInstanceList(name = SELECTORS_KEY, valueClass = MCRResourceSelector.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = SELECTORS_KEY, valueClass = MCRResourceSelector.class, required = false)
         public List<MCRResourceSelector> selectors;
 
         @Override
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRInstanceConfigurationTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstanceConfigurationTest.java
index 1614a9f2ab..14c36feebe 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRInstanceConfigurationTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstanceConfigurationTest.java
@@ -20,27 +20,41 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofClass;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.MCRInstanceName.Suffix;
 import org.mycore.test.MyCoReTest;
 
 @MyCoReTest
 public class MCRInstanceConfigurationTest {
 
+    private static final String TEST_CLASS = TestClass.class.getName();
+
+    private static final String NESTED_TEST_CLASS = NestedTestClass.class.getName();
+
+    private static final String NESTED_TEST_CLASS_A = NestedTestClassA.class.getName();
+
+    private static final String NESTED_TEST_CLASS_B = NestedTestClassB.class.getName();
+
+    private static final String NESTED_TEST_CLASS_C = NestedTestClassC.class.getName();
+
     @Test
     public void configurationWithoutSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
+        properties.put("Foo.Bar", TEST_CLASS);
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
 
         assertEquals("Foo.Bar", configuration.name().actual());
         assertEquals("Foo.Bar", configuration.name().canonical());
-        assertEquals("foo.bar.TestClass", configuration.className());
+        assertEquals(TestClass.class, configuration.valueClass());
         assertEquals(properties, configuration.fullProperties());
 
     }
@@ -49,11 +63,11 @@ public void configurationWithoutSuffix() {
     public void configurationWithoutSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
+        properties.put("Foo.Bar", TEST_CLASS);
         properties.put("Foo.Bar.Key1", "Value1");
         properties.put("Foo.Bar.Key2", "Value2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
 
         assertEquals("Value1", configuration.properties().get("Key1"));
         assertEquals("Value2", configuration.properties().get("Key2"));
@@ -65,11 +79,11 @@ public void configurationWithoutSuffixMovesEntries() {
     public void configurationWithoutSuffixKeepsClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
+        properties.put("Foo.Bar", TEST_CLASS);
         properties.put("Foo.Bar.Class", "ClassValue");
         properties.put("Foo.Bar.class", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
 
         assertFalse(configuration.properties().containsKey(""));
         assertEquals("ClassValue", configuration.properties().get("Class"));
@@ -82,13 +96,13 @@ public void configurationWithoutSuffixKeepsClassEntries() {
     public void configurationWithUpperCaseSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
 
         assertEquals("Foo.Bar.Class", configuration.name().actual());
         assertEquals("Foo.Bar", configuration.name().canonical());
-        assertEquals("foo.bar.TestClass", configuration.className());
+        assertEquals(TestClass.class, configuration.valueClass());
         assertEquals(properties, configuration.fullProperties());
 
     }
@@ -97,11 +111,11 @@ public void configurationWithUpperCaseSuffix() {
     public void configurationWithUpperCaseSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
         properties.put("Foo.Bar.Key1", "Value1");
         properties.put("Foo.Bar.Key2", "Value2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
 
         assertEquals("Value1", configuration.properties().get("Key1"));
         assertEquals("Value2", configuration.properties().get("Key2"));
@@ -113,11 +127,11 @@ public void configurationWithUpperCaseSuffixMovesEntries() {
     public void configurationWithUpperCaseSuffixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
         properties.put("Foo.Bar.class", "ClassValue");
         properties.put("Foo.Bar", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
 
         assertFalse(configuration.properties().containsKey(""));
         assertFalse(configuration.properties().containsKey("Class"));
@@ -130,13 +144,13 @@ public void configurationWithUpperCaseSuffixRemovesClassEntries() {
     public void configurationWithLowerCaseSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
+        properties.put("Foo.Bar.class", TEST_CLASS);
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
 
         assertEquals("Foo.Bar.class", configuration.name().actual());
         assertEquals("Foo.Bar", configuration.name().canonical());
-        assertEquals("foo.bar.TestClass", configuration.className());
+        assertEquals(TestClass.class, configuration.valueClass());
         assertEquals(properties, configuration.fullProperties());
 
     }
@@ -145,11 +159,11 @@ public void configurationWithLowerCaseSuffix() {
     public void configurationWithLowerCaseSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
+        properties.put("Foo.Bar.class", TEST_CLASS);
         properties.put("Foo.Bar.Key1", "Value1");
         properties.put("Foo.Bar.Key2", "Value2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
 
         assertEquals("Value1", configuration.properties().get("Key1"));
         assertEquals("Value2", configuration.properties().get("Key2"));
@@ -161,11 +175,11 @@ public void configurationWithLowerCaseSuffixMovesEntries() {
     public void configurationWithLowerCaseSuffixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
+        properties.put("Foo.Bar.class", TEST_CLASS);
         properties.put("Foo.Bar.Class", "ClassValue");
         properties.put("Foo.Bar", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
 
         assertFalse(configuration.properties().containsKey(""));
         assertFalse(configuration.properties().containsKey("Class"));
@@ -178,15 +192,15 @@ public void configurationWithLowerCaseSuffixRemovesClassEntries() {
     public void nestedConfigurationWithoutSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.Baz", NESTED_TEST_CLASS);
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertEquals("Foo.Bar.Baz", nestedConfiguration.name().actual());
         assertEquals("Foo.Bar.Baz", nestedConfiguration.name().canonical());
-        assertEquals("foo.bar.NestedTestClass", nestedConfiguration.className());
+        assertEquals(NestedTestClass.class, nestedConfiguration.valueClass());
         assertEquals(properties, nestedConfiguration.fullProperties());
 
     }
@@ -195,13 +209,13 @@ public void nestedConfigurationWithoutSuffix() {
     public void nestedConfigurationWithoutSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.Baz", NESTED_TEST_CLASS);
         properties.put("Foo.Bar.Baz.Key1", "Value1");
         properties.put("Foo.Bar.Baz.Key2", "Value2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertEquals("Value1", nestedConfiguration.properties().get("Key1"));
         assertEquals("Value2", nestedConfiguration.properties().get("Key2"));
@@ -213,13 +227,13 @@ public void nestedConfigurationWithoutSuffixMovesEntries() {
     public void nestedConfigurationWithoutSuffixKeepsClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.Baz", NESTED_TEST_CLASS);
         properties.put("Foo.Bar.Baz.Class", "ClassValue");
         properties.put("Foo.Bar.Baz.class", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertFalse(nestedConfiguration.properties().containsKey(""));
         assertEquals("ClassValue", nestedConfiguration.properties().get("Class"));
@@ -232,15 +246,15 @@ public void nestedConfigurationWithoutSuffixKeepsClassEntries() {
     public void nestedConfigurationWithUpperCaseSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.Class", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.Class", NESTED_TEST_CLASS);
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertEquals("Foo.Bar.Baz.Class", nestedConfiguration.name().actual());
         assertEquals("Foo.Bar.Baz", nestedConfiguration.name().canonical());
-        assertEquals("foo.bar.NestedTestClass", nestedConfiguration.className());
+        assertEquals(NestedTestClass.class, nestedConfiguration.valueClass());
         assertEquals(properties, nestedConfiguration.fullProperties());
 
     }
@@ -249,13 +263,13 @@ public void nestedConfigurationWithUpperCaseSuffix() {
     public void nestedConfigurationWithUpperCaseSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.Class", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.Class", NESTED_TEST_CLASS);
         properties.put("Foo.Bar.Baz.Key1", "Value1");
         properties.put("Foo.Bar.Baz.Key2", "Value2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertEquals("Value1", nestedConfiguration.properties().get("Key1"));
         assertEquals("Value2", nestedConfiguration.properties().get("Key2"));
@@ -267,13 +281,13 @@ public void nestedConfigurationWithUpperCaseSuffixMovesEntries() {
     public void nestedConfigurationWithUpperCaseSuffixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.Class", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.Class", NESTED_TEST_CLASS);
         properties.put("Foo.Bar.Baz.class", "ClassValue");
         properties.put("Foo.Bar.Baz", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertFalse(nestedConfiguration.properties().containsKey(""));
         assertFalse(nestedConfiguration.properties().containsKey("Class"));
@@ -286,15 +300,15 @@ public void nestedConfigurationWithUpperCaseSuffixRemovesClassEntries() {
     public void nestedConfigurationWithLowerCaseSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.class", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.class", NESTED_TEST_CLASS);
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertEquals("Foo.Bar.Baz.class", nestedConfiguration.name().actual());
         assertEquals("Foo.Bar.Baz", nestedConfiguration.name().canonical());
-        assertEquals("foo.bar.NestedTestClass", nestedConfiguration.className());
+        assertEquals(NestedTestClass.class, nestedConfiguration.valueClass());
         assertEquals(properties, nestedConfiguration.fullProperties());
 
     }
@@ -303,13 +317,13 @@ public void nestedConfigurationWithLowerCaseSuffix() {
     public void nestedConfigurationWithLowerCaseSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.class", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.class", NESTED_TEST_CLASS);
         properties.put("Foo.Bar.Baz.Key1", "Value1");
         properties.put("Foo.Bar.Baz.Key2", "Value2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertEquals("Value1", nestedConfiguration.properties().get("Key1"));
         assertEquals("Value2", nestedConfiguration.properties().get("Key2"));
@@ -321,13 +335,13 @@ public void nestedConfigurationWithLowerCaseSuffixMovesEntries() {
     public void nestedConfigurationWithLowerCaseSuffixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.class", "foo.bar.NestedTestClass");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.class", NESTED_TEST_CLASS);
         properties.put("Foo.Bar.Baz.Class", "ClassValue");
         properties.put("Foo.Bar.Baz", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
+        MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
         assertFalse(nestedConfiguration.properties().containsKey(""));
         assertFalse(nestedConfiguration.properties().containsKey("Class"));
@@ -337,58 +351,58 @@ public void nestedConfigurationWithLowerCaseSuffixRemovesClassEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithoutSuffix() {
+    public void nestedMapWithoutSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A", "foo.bar.NestedTestClassA");
-        properties.put("Foo.Bar.B", "foo.bar.NestedTestClassB");
-        properties.put("Foo.Bar.C", "foo.bar.NestedTestClassC");
-
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.A", NESTED_TEST_CLASS_A);
+        properties.put("Foo.Bar.B", NESTED_TEST_CLASS_B);
+        properties.put("Foo.Bar.C", NESTED_TEST_CLASS_C);
+
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("Foo.Bar.A", nestedConfigurationA.name().actual());
         assertEquals("Foo.Bar.A", nestedConfigurationA.name().canonical());
-        assertEquals("foo.bar.NestedTestClassA", nestedConfigurationA.className());
+        assertEquals(NestedTestClassA.class, nestedConfigurationA.valueClass());
         assertEquals(properties, nestedConfigurationA.fullProperties());
 
         assertEquals("Foo.Bar.B", nestedConfigurationB.name().actual());
         assertEquals("Foo.Bar.B", nestedConfigurationB.name().canonical());
-        assertEquals("foo.bar.NestedTestClassB", nestedConfigurationB.className());
+        assertEquals(NestedTestClassB.class, nestedConfigurationB.valueClass());
         assertEquals(properties, nestedConfigurationB.fullProperties());
 
         assertEquals("Foo.Bar.C", nestedConfigurationC.name().actual());
         assertEquals("Foo.Bar.C", nestedConfigurationC.name().canonical());
-        assertEquals("foo.bar.NestedTestClassC", nestedConfigurationC.className());
+        assertEquals(NestedTestClassC.class, nestedConfigurationC.valueClass());
         assertEquals(properties, nestedConfigurationC.fullProperties());
 
     }
 
     @Test
-    public void nestedConfigurationMapWithoutSuffixMovesEntries() {
+    public void nestedMapWithoutSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.A", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.A.Key1", "ValueA1");
         properties.put("Foo.Bar.A.Key2", "ValueA2");
-        properties.put("Foo.Bar.B", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.B", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.B.Key1", "ValueB1");
         properties.put("Foo.Bar.B.Key2", "ValueB2");
-        properties.put("Foo.Bar.C", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.C", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.C.Key1", "ValueC1");
         properties.put("Foo.Bar.C.Key2", "ValueC2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("ValueA1", nestedConfigurationA.properties().get("Key1"));
@@ -406,25 +420,25 @@ public void nestedConfigurationMapWithoutSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithoutSuffixKeepsClassEntries() {
+    public void nestedMapWithoutSuffixKeepsClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.A", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.A.Class", "ClassValue");
         properties.put("Foo.Bar.A.class", "ClassValue");
-        properties.put("Foo.Bar.B", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.B", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.B.Class", "ClassValue");
         properties.put("Foo.Bar.B.class", "ClassValue");
-        properties.put("Foo.Bar.C", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.C", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.C.Class", "ClassValue");
         properties.put("Foo.Bar.C.class", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertFalse(nestedConfigurationA.properties().containsKey(""));
@@ -445,58 +459,58 @@ public void nestedConfigurationMapWithoutSuffixKeepsClassEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithUpperCaseSuffix() {
+    public void nestedMapWithUpperCaseSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A.Class", "foo.bar.NestedTestClassA");
-        properties.put("Foo.Bar.B.Class", "foo.bar.NestedTestClassB");
-        properties.put("Foo.Bar.C.Class", "foo.bar.NestedTestClassC");
-
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.A.Class", NESTED_TEST_CLASS_A);
+        properties.put("Foo.Bar.B.Class", NESTED_TEST_CLASS_B);
+        properties.put("Foo.Bar.C.Class", NESTED_TEST_CLASS_C);
+
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("Foo.Bar.A.Class", nestedConfigurationA.name().actual());
         assertEquals("Foo.Bar.A", nestedConfigurationA.name().canonical());
-        assertEquals("foo.bar.NestedTestClassA", nestedConfigurationA.className());
+        assertEquals(NestedTestClassA.class, nestedConfigurationA.valueClass());
         assertEquals(properties, nestedConfigurationA.fullProperties());
 
         assertEquals("Foo.Bar.B.Class", nestedConfigurationB.name().actual());
         assertEquals("Foo.Bar.B", nestedConfigurationB.name().canonical());
-        assertEquals("foo.bar.NestedTestClassB", nestedConfigurationB.className());
+        assertEquals(NestedTestClassB.class, nestedConfigurationB.valueClass());
         assertEquals(properties, nestedConfigurationB.fullProperties());
 
         assertEquals("Foo.Bar.C.Class", nestedConfigurationC.name().actual());
         assertEquals("Foo.Bar.C", nestedConfigurationC.name().canonical());
-        assertEquals("foo.bar.NestedTestClassC", nestedConfigurationC.className());
+        assertEquals(NestedTestClassC.class, nestedConfigurationC.valueClass());
         assertEquals(properties, nestedConfigurationC.fullProperties());
 
     }
 
     @Test
-    public void nestedConfigurationMapWithUpperCaseSuffixMovesEntries() {
+    public void nestedMapWithUpperCaseSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A.Class", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.A.Class", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.A.Key1", "ValueA1");
         properties.put("Foo.Bar.A.Key2", "ValueA2");
-        properties.put("Foo.Bar.B.Class", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.B.Class", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.B.Key1", "ValueB1");
         properties.put("Foo.Bar.B.Key2", "ValueB2");
-        properties.put("Foo.Bar.C.Class", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.C.Class", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.C.Key1", "ValueC1");
         properties.put("Foo.Bar.C.Key2", "ValueC2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("ValueA1", nestedConfigurationA.properties().get("Key1"));
@@ -514,25 +528,25 @@ public void nestedConfigurationMapWithUpperCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithUpperCaseSuffixRemovesClassEntries() {
+    public void nestedMapWithUpperCaseSuffixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A.Class", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.A.Class", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.A.class", "ClassValue");
         properties.put("Foo.Bar.A", "ClassValue");
-        properties.put("Foo.Bar.B.Class", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.B.Class", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.B.class", "ClassValue");
         properties.put("Foo.Bar.B", "ClassValue");
-        properties.put("Foo.Bar.C.Class", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.C.Class", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.C.class", "ClassValue");
         properties.put("Foo.Bar.C", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertFalse(nestedConfigurationA.properties().containsKey(""));
@@ -553,58 +567,58 @@ public void nestedConfigurationMapWithUpperCaseSuffixRemovesClassEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithLowerCaseSuffix() {
+    public void nestedMapWithLowerCaseSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A.class", "foo.bar.NestedTestClassA");
-        properties.put("Foo.Bar.B.class", "foo.bar.NestedTestClassB");
-        properties.put("Foo.Bar.C.class", "foo.bar.NestedTestClassC");
-
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.A.class", NESTED_TEST_CLASS_A);
+        properties.put("Foo.Bar.B.class", NESTED_TEST_CLASS_B);
+        properties.put("Foo.Bar.C.class", NESTED_TEST_CLASS_C);
+
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("Foo.Bar.A.class", nestedConfigurationA.name().actual());
         assertEquals("Foo.Bar.A", nestedConfigurationA.name().canonical());
-        assertEquals("foo.bar.NestedTestClassA", nestedConfigurationA.className());
+        assertEquals(NestedTestClassA.class, nestedConfigurationA.valueClass());
         assertEquals(properties, nestedConfigurationA.fullProperties());
 
         assertEquals("Foo.Bar.B.class", nestedConfigurationB.name().actual());
         assertEquals("Foo.Bar.B", nestedConfigurationB.name().canonical());
-        assertEquals("foo.bar.NestedTestClassB", nestedConfigurationB.className());
+        assertEquals(NestedTestClassB.class, nestedConfigurationB.valueClass());
         assertEquals(properties, nestedConfigurationB.fullProperties());
 
         assertEquals("Foo.Bar.C.class", nestedConfigurationC.name().actual());
         assertEquals("Foo.Bar.C", nestedConfigurationC.name().canonical());
-        assertEquals("foo.bar.NestedTestClassC", nestedConfigurationC.className());
+        assertEquals(NestedTestClassC.class, nestedConfigurationC.valueClass());
         assertEquals(properties, nestedConfigurationC.fullProperties());
 
     }
 
     @Test
-    public void nestedConfigurationMapWithLowerCaseSuffixMovesEntries() {
+    public void nestedMapWithLowerCaseSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A.class", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.A.class", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.A.Key1", "ValueA1");
         properties.put("Foo.Bar.A.Key2", "ValueA2");
-        properties.put("Foo.Bar.B.class", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.B.class", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.B.Key1", "ValueB1");
         properties.put("Foo.Bar.B.Key2", "ValueB2");
-        properties.put("Foo.Bar.C.class", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.C.class", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.C.Key1", "ValueC1");
         properties.put("Foo.Bar.C.Key2", "ValueC2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("ValueA1", nestedConfigurationA.properties().get("Key1"));
@@ -622,24 +636,24 @@ public void nestedConfigurationMapWithLowerCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithLowerCaseSuffixRemovesClassEntries() {
+    public void nestedMapWithLowerCaseSuffixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.A.class", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.A.class", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.A.Class", "ClassValue");
         properties.put("Foo.Bar.A", "ClassValue");
-        properties.put("Foo.Bar.B.class", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.B.class", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.B.Class", "ClassValue");
         properties.put("Foo.Bar.B", "ClassValue");
-        properties.put("Foo.Bar.C.class", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.C.class", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.C.Class", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA = nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB = nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertFalse(nestedConfigurationA.properties().containsKey(""));
@@ -660,58 +674,70 @@ public void nestedConfigurationMapWithLowerCaseSuffixRemovesClassEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithoutSuffix() {
+    public void nestedMapWithPrefixWithoutSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A", "foo.bar.NestedTestClassA");
-        properties.put("Foo.Bar.Baz.B", "foo.bar.NestedTestClassB");
-        properties.put("Foo.Bar.Baz.C", "foo.bar.NestedTestClassC");
-
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A", NESTED_TEST_CLASS_A);
+        properties.put("Foo.Bar.Baz.B", NESTED_TEST_CLASS_B);
+        properties.put("Foo.Bar.Baz.C", NESTED_TEST_CLASS_C);
+
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("Foo.Bar.Baz.A", nestedConfigurationA.name().actual());
         assertEquals("Foo.Bar.Baz.A", nestedConfigurationA.name().canonical());
-        assertEquals("foo.bar.NestedTestClassA", nestedConfigurationA.className());
+        assertEquals(NestedTestClassA.class, nestedConfigurationA.valueClass());
         assertEquals(properties, nestedConfigurationA.fullProperties());
 
         assertEquals("Foo.Bar.Baz.B", nestedConfigurationB.name().actual());
         assertEquals("Foo.Bar.Baz.B", nestedConfigurationB.name().canonical());
-        assertEquals("foo.bar.NestedTestClassB", nestedConfigurationB.className());
+        assertEquals(NestedTestClassB.class, nestedConfigurationB.valueClass());
         assertEquals(properties, nestedConfigurationB.fullProperties());
 
         assertEquals("Foo.Bar.Baz.C", nestedConfigurationC.name().actual());
         assertEquals("Foo.Bar.Baz.C", nestedConfigurationC.name().canonical());
-        assertEquals("foo.bar.NestedTestClassC", nestedConfigurationC.className());
+        assertEquals(NestedTestClassC.class, nestedConfigurationC.valueClass());
         assertEquals(properties, nestedConfigurationC.fullProperties());
 
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithoutSuffixMovesEntries() {
+    public void nestedMapWithPrefixWithoutSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.Baz.A.Key1", "ValueA1");
         properties.put("Foo.Bar.Baz.A.Key2", "ValueA2");
-        properties.put("Foo.Bar.Baz.B", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.Baz.B", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.Baz.B.Key1", "ValueB1");
         properties.put("Foo.Bar.Baz.B.Key2", "ValueB2");
-        properties.put("Foo.Bar.Baz.C", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.Baz.C", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.Baz.C.Key1", "ValueC1");
         properties.put("Foo.Bar.Baz.C.Key2", "ValueC2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("ValueA1", nestedConfigurationA.properties().get("Key1"));
@@ -729,25 +755,31 @@ public void nestedConfigurationMapWithPrefixWithoutSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithoutSuffixKeepsClassEntries() {
+    public void nestedMapWithPrefixWithoutSuffixKeepsClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.Baz.A.Class", "ClassValue");
         properties.put("Foo.Bar.Baz.A.class", "ClassValue");
-        properties.put("Foo.Bar.Baz.B", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.Baz.B", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.Baz.B.Class", "ClassValue");
         properties.put("Foo.Bar.Baz.B.class", "ClassValue");
-        properties.put("Foo.Bar.Baz.C", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.Baz.C", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.Baz.C.Class", "ClassValue");
         properties.put("Foo.Bar.Baz.C.class", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertFalse(nestedConfigurationA.properties().containsKey(""));
@@ -768,58 +800,70 @@ public void nestedConfigurationMapWithPrefixWithoutSuffixKeepsClassEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithUpperCaseSuffix() {
+    public void nestedMapWithPrefixWithUpperCaseSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A.Class", "foo.bar.NestedTestClassA");
-        properties.put("Foo.Bar.Baz.B.Class", "foo.bar.NestedTestClassB");
-        properties.put("Foo.Bar.Baz.C.Class", "foo.bar.NestedTestClassC");
-
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A.Class", NESTED_TEST_CLASS_A);
+        properties.put("Foo.Bar.Baz.B.Class", NESTED_TEST_CLASS_B);
+        properties.put("Foo.Bar.Baz.C.Class", NESTED_TEST_CLASS_C);
+
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar.Class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("Foo.Bar.Baz.A.Class", nestedConfigurationA.name().actual());
         assertEquals("Foo.Bar.Baz.A", nestedConfigurationA.name().canonical());
-        assertEquals("foo.bar.NestedTestClassA", nestedConfigurationA.className());
+        assertEquals(NestedTestClassA.class, nestedConfigurationA.valueClass());
         assertEquals(properties, nestedConfigurationA.fullProperties());
 
         assertEquals("Foo.Bar.Baz.B.Class", nestedConfigurationB.name().actual());
         assertEquals("Foo.Bar.Baz.B", nestedConfigurationB.name().canonical());
-        assertEquals("foo.bar.NestedTestClassB", nestedConfigurationB.className());
+        assertEquals(NestedTestClassB.class, nestedConfigurationB.valueClass());
         assertEquals(properties, nestedConfigurationB.fullProperties());
 
         assertEquals("Foo.Bar.Baz.C.Class", nestedConfigurationC.name().actual());
         assertEquals("Foo.Bar.Baz.C", nestedConfigurationC.name().canonical());
-        assertEquals("foo.bar.NestedTestClassC", nestedConfigurationC.className());
+        assertEquals(NestedTestClassC.class, nestedConfigurationC.valueClass());
         assertEquals(properties, nestedConfigurationC.fullProperties());
 
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithUpperCaseSuffixMovesEntries() {
+    public void nestedMapWithPrefixWithUpperCaseSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A.Class", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A.Class", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.Baz.A.Key1", "ValueA1");
         properties.put("Foo.Bar.Baz.A.Key2", "ValueA2");
-        properties.put("Foo.Bar.Baz.B.Class", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.Baz.B.Class", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.Baz.B.Key1", "ValueB1");
         properties.put("Foo.Bar.Baz.B.Key2", "ValueB2");
-        properties.put("Foo.Bar.Baz.C.Class", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.Baz.C.Class", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.Baz.C.Key1", "ValueC1");
         properties.put("Foo.Bar.Baz.C.Key2", "ValueC2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar.Class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("ValueA1", nestedConfigurationA.properties().get("Key1"));
@@ -837,25 +881,31 @@ public void nestedConfigurationMapWithPrefixWithUpperCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithUpperCaseSuffixRemovesClassEntries() {
+    public void nestedMapWithPrefixWithUpperCaseSuffixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.Class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A.Class", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar.Class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A.Class", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.Baz.A.class", "ClassValue");
         properties.put("Foo.Bar.Baz.A", "ClassValue");
-        properties.put("Foo.Bar.Baz.B.Class", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.Baz.B.Class", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.Baz.B.class", "ClassValue");
         properties.put("Foo.Bar.Baz.B", "ClassValue");
-        properties.put("Foo.Bar.Baz.C.Class", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.Baz.C.Class", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.Baz.C.class", "ClassValue");
         properties.put("Foo.Bar.Baz.C", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar.Class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertFalse(nestedConfigurationA.properties().containsKey(""));
@@ -876,58 +926,70 @@ public void nestedConfigurationMapWithPrefixWithUpperCaseSuffixRemovesClassEntri
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithLowerCaseSuffix() {
+    public void nestedMapWithPrefixWithLowerCaseSuffix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A.class", "foo.bar.NestedTestClassA");
-        properties.put("Foo.Bar.Baz.B.class", "foo.bar.NestedTestClassB");
-        properties.put("Foo.Bar.Baz.C.class", "foo.bar.NestedTestClassC");
-
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A.class", NESTED_TEST_CLASS_A);
+        properties.put("Foo.Bar.Baz.B.class", NESTED_TEST_CLASS_B);
+        properties.put("Foo.Bar.Baz.C.class", NESTED_TEST_CLASS_C);
+
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar.class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("Foo.Bar.Baz.A.class", nestedConfigurationA.name().actual());
         assertEquals("Foo.Bar.Baz.A", nestedConfigurationA.name().canonical());
-        assertEquals("foo.bar.NestedTestClassA", nestedConfigurationA.className());
+        assertEquals(NestedTestClassA.class, nestedConfigurationA.valueClass());
         assertEquals(properties, nestedConfigurationA.fullProperties());
 
         assertEquals("Foo.Bar.Baz.B.class", nestedConfigurationB.name().actual());
         assertEquals("Foo.Bar.Baz.B", nestedConfigurationB.name().canonical());
-        assertEquals("foo.bar.NestedTestClassB", nestedConfigurationB.className());
+        assertEquals(NestedTestClassB.class, nestedConfigurationB.valueClass());
         assertEquals(properties, nestedConfigurationB.fullProperties());
 
         assertEquals("Foo.Bar.Baz.C.class", nestedConfigurationC.name().actual());
         assertEquals("Foo.Bar.Baz.C", nestedConfigurationC.name().canonical());
-        assertEquals("foo.bar.NestedTestClassC", nestedConfigurationC.className());
+        assertEquals(NestedTestClassC.class, nestedConfigurationC.valueClass());
         assertEquals(properties, nestedConfigurationC.fullProperties());
 
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithLowerCaseSuffixMovesEntries() {
+    public void nestedMapWithPrefixWithLowerCaseSuffixMovesEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A.class", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A.class", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.Baz.A.Key1", "ValueA1");
         properties.put("Foo.Bar.Baz.A.Key2", "ValueA2");
-        properties.put("Foo.Bar.Baz.B.class", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.Baz.B.class", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.Baz.B.Key1", "ValueB1");
         properties.put("Foo.Bar.Baz.B.Key2", "ValueB2");
-        properties.put("Foo.Bar.Baz.C.class", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.Baz.C.class", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.Baz.C.Key1", "ValueC1");
         properties.put("Foo.Bar.Baz.C.Key2", "ValueC2");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar.class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertEquals("ValueA1", nestedConfigurationA.properties().get("Key1"));
@@ -945,25 +1007,31 @@ public void nestedConfigurationMapWithPrefixWithLowerCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedConfigurationMapWithPrefixWithLowerCaseSuffixRemovesClassEntries() {
+    public void nestedMapWithPrefixWithLowerCaseSuffixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Foo.Bar.class", "foo.bar.TestClass");
-        properties.put("Foo.Bar.Baz.A.class", "foo.bar.NestedTestClassA");
+        properties.put("Foo.Bar.class", TEST_CLASS);
+        properties.put("Foo.Bar.Baz.A.class", NESTED_TEST_CLASS_A);
         properties.put("Foo.Bar.Baz.A.Class", "ClassValue");
         properties.put("Foo.Bar.Baz.A", "ClassValue");
-        properties.put("Foo.Bar.Baz.B.class", "foo.bar.NestedTestClassB");
+        properties.put("Foo.Bar.Baz.B.class", NESTED_TEST_CLASS_B);
         properties.put("Foo.Bar.Baz.B.Class", "ClassValue");
         properties.put("Foo.Bar.Baz.B", "ClassValue");
-        properties.put("Foo.Bar.Baz.C.class", "foo.bar.NestedTestClassC");
+        properties.put("Foo.Bar.Baz.C.class", NESTED_TEST_CLASS_C);
         properties.put("Foo.Bar.Baz.C.Class", "ClassValue");
         properties.put("Foo.Bar.Baz.C", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Bar.Class", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        MCRInstanceConfiguration<?> configuration =
+            ofName(Object.class, "Foo.Bar.class", properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
         assertFalse(nestedConfigurationA.properties().containsKey(""));
@@ -988,11 +1056,12 @@ public void directConfiguration() {
 
         Map<String, String> properties = new HashMap<>();
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofClass("foo.bar.TestClass", properties);
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
 
-        assertEquals("Class", configuration.name().actual());
-        assertEquals("", configuration.name().canonical());
-        assertEquals("foo.bar.TestClass", configuration.className());
+        assertEquals("Instance.Class", configuration.name().actual());
+        assertEquals("Instance", configuration.name().canonical());
+        assertEquals(TestClass.class, configuration.valueClass());
         assertEquals(properties, configuration.fullProperties());
 
     }
@@ -1004,7 +1073,8 @@ public void directConfigurationRemovesClassEntries() {
         properties.put("Class", "ClassValue");
         properties.put("class", "ClassValue");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofClass("foo.bar.TestClass", properties);
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
 
         assertFalse(configuration.properties().containsKey(""));
         assertFalse(configuration.properties().containsKey("Class"));
@@ -1017,14 +1087,16 @@ public void directConfigurationRemovesClassEntries() {
     public void nestedDirectConfiguration() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Baz.Class", "foo.bar.NestedTestClass");
+        properties.put("Baz.Class", NESTED_TEST_CLASS);
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofClass("foo.bar.TestClass", properties);
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration("Baz");
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
+        MCRInstanceConfiguration<?> nestedConfiguration =
+            configuration.nested(Object.class, "Baz");
 
-        assertEquals("Baz.Class", nestedConfiguration.name().actual());
-        assertEquals("Baz", nestedConfiguration.name().canonical());
-        assertEquals("foo.bar.NestedTestClass", nestedConfiguration.className());
+        assertEquals("Instance.Baz.Class", nestedConfiguration.name().actual());
+        assertEquals("Instance.Baz", nestedConfiguration.name().canonical());
+        assertEquals(NestedTestClass.class, nestedConfiguration.valueClass());
         assertEquals(properties, nestedConfiguration.fullProperties());
 
     }
@@ -1033,30 +1105,36 @@ public void nestedDirectConfiguration() {
     public void nestedDirectConfigurationMap() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("A.Class", "foo.bar.NestedTestClassA");
-        properties.put("B.Class", "foo.bar.NestedTestClassB");
-        properties.put("C.Class", "foo.bar.NestedTestClassC");
-
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofClass("foo.bar.TestClass", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        properties.put("A.Class", NESTED_TEST_CLASS_A);
+        properties.put("B.Class", NESTED_TEST_CLASS_B);
+        properties.put("C.Class", NESTED_TEST_CLASS_C);
+
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
-        assertEquals("A.Class", nestedConfigurationA.name().actual());
-        assertEquals("A", nestedConfigurationA.name().canonical());
-        assertEquals("foo.bar.NestedTestClassA", nestedConfigurationA.className());
+        assertEquals("Instance.A.Class", nestedConfigurationA.name().actual());
+        assertEquals("Instance.A", nestedConfigurationA.name().canonical());
+        assertEquals(NestedTestClassA.class, nestedConfigurationA.valueClass());
         assertEquals(properties, nestedConfigurationA.fullProperties());
 
-        assertEquals("B.Class", nestedConfigurationB.name().actual());
-        assertEquals("B", nestedConfigurationB.name().canonical());
-        assertEquals("foo.bar.NestedTestClassB", nestedConfigurationB.className());
+        assertEquals("Instance.B.Class", nestedConfigurationB.name().actual());
+        assertEquals("Instance.B", nestedConfigurationB.name().canonical());
+        assertEquals(NestedTestClassB.class, nestedConfigurationB.valueClass());
         assertEquals(properties, nestedConfigurationB.fullProperties());
 
-        assertEquals("C.Class", nestedConfigurationC.name().actual());
-        assertEquals("C", nestedConfigurationC.name().canonical());
-        assertEquals("foo.bar.NestedTestClassC", nestedConfigurationC.className());
+        assertEquals("Instance.C.Class", nestedConfigurationC.name().actual());
+        assertEquals("Instance.C", nestedConfigurationC.name().canonical());
+        assertEquals(NestedTestClassC.class, nestedConfigurationC.valueClass());
         assertEquals(properties, nestedConfigurationC.fullProperties());
 
     }
@@ -1065,21 +1143,27 @@ public void nestedDirectConfigurationMap() {
     public void nestedDirectConfigurationMapRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("A", "foo.bar.NestedTestClassA");
-        properties.put("A.Class", "ClassValue");
+        properties.put("A.Class", NESTED_TEST_CLASS_A);
         properties.put("A.class", "ClassValue");
-        properties.put("B", "foo.bar.NestedTestClassB");
-        properties.put("B.Class", "ClassValue");
+        properties.put("A", "ClassValue");
+        properties.put("B.Class", NESTED_TEST_CLASS_B);
         properties.put("B.class", "ClassValue");
-        properties.put("C", "foo.bar.NestedTestClassC");
-        properties.put("C.Class", "ClassValue");
+        properties.put("B", "ClassValue");
+        properties.put("C.Class", NESTED_TEST_CLASS_C);
         properties.put("C.class", "ClassValue");
+        properties.put("C", "ClassValue");
+
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofClass("foo.bar.TestClass", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap();
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertFalse(nestedConfigurationA.properties().containsKey(""));
@@ -1099,34 +1183,84 @@ public void nestedDirectConfigurationMapRemovesClassEntries() {
 
     }
 
+    @Test
+    public void nestedDirectConfigurationMapKeepsClassEntries() {
+
+        Map<String, String> properties = new HashMap<>();
+        properties.put("A", NESTED_TEST_CLASS_A);
+        properties.put("A.Class", "ClassValue");
+        properties.put("A.class", "ClassValue");
+        properties.put("B", NESTED_TEST_CLASS_B);
+        properties.put("B.Class", "ClassValue");
+        properties.put("B.class", "ClassValue");
+        properties.put("C", NESTED_TEST_CLASS_C);
+        properties.put("C.Class", "ClassValue");
+        properties.put("C.class", "ClassValue");
+
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.NONE, properties, properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class);
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
+        assertEquals(3, nestedConfigurations.size());
+
+        assertFalse(nestedConfigurationA.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get("Class"));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get("class"));
+        assertEquals(2, nestedConfigurationA.properties().size());
+
+        assertFalse(nestedConfigurationB.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get("Class"));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get("class"));
+        assertEquals(2, nestedConfigurationB.properties().size());
+
+        assertFalse(nestedConfigurationC.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get("Class"));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get("class"));
+        assertEquals(2, nestedConfigurationC.properties().size());
+
+    }
+
     @Test
     public void nestedDirectConfigurationMapWithPrefix() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Baz.A.Class", "foo.bar.NestedTestClassA");
-        properties.put("Baz.B.Class", "foo.bar.NestedTestClassB");
-        properties.put("Baz.C.Class", "foo.bar.NestedTestClassC");
-
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofClass("foo.bar.TestClass", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
+        properties.put("Baz.A.Class", NESTED_TEST_CLASS_A);
+        properties.put("Baz.B.Class", NESTED_TEST_CLASS_B);
+        properties.put("Baz.C.Class", NESTED_TEST_CLASS_C);
+
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
         assertEquals(3, nestedConfigurations.size());
 
-        assertEquals("Baz.A.Class", nestedConfigurationA.name().actual());
-        assertEquals("Baz.A", nestedConfigurationA.name().canonical());
-        assertEquals("foo.bar.NestedTestClassA", nestedConfigurationA.className());
+        assertEquals("Instance.Baz.A.Class", nestedConfigurationA.name().actual());
+        assertEquals("Instance.Baz.A", nestedConfigurationA.name().canonical());
+        assertEquals(NestedTestClassA.class, nestedConfigurationA.valueClass());
         assertEquals(properties, nestedConfigurationA.fullProperties());
 
-        assertEquals("Baz.B.Class", nestedConfigurationB.name().actual());
-        assertEquals("Baz.B", nestedConfigurationB.name().canonical());
-        assertEquals("foo.bar.NestedTestClassB", nestedConfigurationB.className());
+        assertEquals("Instance.Baz.B.Class", nestedConfigurationB.name().actual());
+        assertEquals("Instance.Baz.B", nestedConfigurationB.name().canonical());
+        assertEquals(NestedTestClassB.class, nestedConfigurationB.valueClass());
         assertEquals(properties, nestedConfigurationB.fullProperties());
 
-        assertEquals("Baz.C.Class", nestedConfigurationC.name().actual());
-        assertEquals("Baz.C", nestedConfigurationC.name().canonical());
-        assertEquals("foo.bar.NestedTestClassC", nestedConfigurationC.className());
+        assertEquals("Instance.Baz.C.Class", nestedConfigurationC.name().actual());
+        assertEquals("Instance.Baz.C", nestedConfigurationC.name().canonical());
+        assertEquals(NestedTestClassC.class, nestedConfigurationC.valueClass());
         assertEquals(properties, nestedConfigurationC.fullProperties());
 
     }
@@ -1135,21 +1269,27 @@ public void nestedDirectConfigurationMapWithPrefix() {
     public void nestedDirectConfigurationMapWithPrefixRemovesClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
-        properties.put("Baz.A", "foo.bar.NestedTestClassA");
-        properties.put("Baz.A.Class", "ClassValue");
+        properties.put("Baz.A.Class", NESTED_TEST_CLASS_A);
         properties.put("Baz.A.class", "ClassValue");
-        properties.put("Baz.B", "foo.bar.NestedTestClassB");
-        properties.put("Baz.B.Class", "ClassValue");
+        properties.put("Baz.A", "ClassValue");
+        properties.put("Baz.B.Class", NESTED_TEST_CLASS_B);
         properties.put("Baz.B.class", "ClassValue");
-        properties.put("Baz.C", "foo.bar.NestedTestClassC");
-        properties.put("Baz.C.Class", "ClassValue");
+        properties.put("Baz.B", "ClassValue");
+        properties.put("Baz.C.Class", NESTED_TEST_CLASS_C);
         properties.put("Baz.C.class", "ClassValue");
+        properties.put("Baz.C", "ClassValue");
+
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofClass("foo.bar.TestClass", properties);
-        Map<String, MCRInstanceConfiguration> nestedConfigurations = configuration.nestedConfigurationMap("Baz");
-        MCRInstanceConfiguration nestedConfigurationA = nestedConfigurations.get("A");
-        MCRInstanceConfiguration nestedConfigurationB = nestedConfigurations.get("B");
-        MCRInstanceConfiguration nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
         assertFalse(nestedConfigurationA.properties().containsKey(""));
@@ -1169,4 +1309,68 @@ public void nestedDirectConfigurationMapWithPrefixRemovesClassEntries() {
 
     }
 
+    @Test
+    public void nestedDirectConfigurationMapWithPrefixKeepsClassEntries() {
+
+        Map<String, String> properties = new HashMap<>();
+        properties.put("Baz.A", NESTED_TEST_CLASS_A);
+        properties.put("Baz.A.Class", "ClassValue");
+        properties.put("Baz.A.class", "ClassValue");
+        properties.put("Baz.B", NESTED_TEST_CLASS_B);
+        properties.put("Baz.B.Class", "ClassValue");
+        properties.put("Baz.B.class", "ClassValue");
+        properties.put("Baz.C", NESTED_TEST_CLASS_C);
+        properties.put("Baz.C.Class", "ClassValue");
+        properties.put("Baz.C.class", "ClassValue");
+
+        MCRInstanceConfiguration<?> configuration =
+            ofClass(Object.class, TestClass.class, "Instance", Suffix.NONE, properties, properties);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations =
+            configuration.nestedMap(Object.class, "Baz");
+        MCRInstanceConfiguration<?> nestedConfigurationA =
+            nestedConfigurations.get("A");
+        MCRInstanceConfiguration<?> nestedConfigurationB =
+            nestedConfigurations.get("B");
+        MCRInstanceConfiguration<?> nestedConfigurationC =
+            nestedConfigurations.get("C");
+
+        assertEquals(3, nestedConfigurations.size());
+
+        assertFalse(nestedConfigurationA.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get("Class"));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get("class"));
+        assertEquals(2, nestedConfigurationA.properties().size());
+
+        assertFalse(nestedConfigurationB.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get("Class"));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get("class"));
+        assertEquals(2, nestedConfigurationB.properties().size());
+
+        assertFalse(nestedConfigurationC.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get("Class"));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get("class"));
+        assertEquals(2, nestedConfigurationC.properties().size());
+
+    }
+
+    public static class TestClass {
+
+    }
+
+    public static class NestedTestClass {
+
+    }
+
+    public static class NestedTestClassA {
+
+    }
+
+    public static class NestedTestClassB {
+
+    }
+
+    public static class NestedTestClassC {
+
+    }
+
 }
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRInstanceNameTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstanceNameTest.java
index 6273bf1aeb..46e1cc5f00 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRInstanceNameTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstanceNameTest.java
@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
+import org.mycore.common.config.instantiator.MCRInstanceName;
 import org.mycore.test.MyCoReTest;
 
 @MyCoReTest
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperBasicTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorBasicTest.java
similarity index 71%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperBasicTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorBasicTest.java
index e6ca3927ce..70eedd690b 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperBasicTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorBasicTest.java
@@ -20,6 +20,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
 
 import java.util.function.Supplier;
 
@@ -28,10 +29,11 @@
 import org.mycore.common.MCRTestProperty;
 import org.mycore.common.config.annotation.MCRConfigurationProxy;
 import org.mycore.common.config.annotation.MCRFactory;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 @MyCoReTest
-public class MCRConfigurableInstanceHelperBasicTest {
+public class MCRInstantiatorBasicTest {
 
     @Test
     @MCRTestConfiguration(
@@ -40,9 +42,7 @@ public class MCRConfigurableInstanceHelperBasicTest {
         })
     public void singletonFactory() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithSingletonFactory instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithSingletonFactory.class, configuration);
+        TestClassWithSingletonFactory instance = ofName(TestClassWithSingletonFactory.class, "Foo").instantiate();
 
         assertNotNull(instance);
 
@@ -55,9 +55,7 @@ public void singletonFactory() {
         })
     public void annotatedFactory() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWitAnnotatedFactory instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWitAnnotatedFactory.class, configuration);
+        TestClassWitAnnotatedFactory instance = ofName(TestClassWitAnnotatedFactory.class, "Foo").instantiate();
 
         assertNotNull(instance);
 
@@ -70,12 +68,8 @@ public void annotatedFactory() {
         })
     public void annotatedFactories() {
 
-        assertThrows(
-            MCRConfigurationException.class,
-            () -> {
-                MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-                MCRConfigurableInstanceHelper.getInstance(TestClassWitAnnotatedFactories.class, configuration);
-            });
+        assertThrows(MCRConfigurationException.class,
+            () -> ofName(TestClassWitAnnotatedFactories.class, "Foo").instantiate());
 
     }
 
@@ -86,9 +80,7 @@ public void annotatedFactories() {
         })
     public void constructorFactory() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithConstructor instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithConstructor.class, configuration);
+        TestClassWithConstructor instance = ofName(TestClassWithConstructor.class, "Foo").instantiate();
 
         assertNotNull(instance);
 
@@ -101,12 +93,8 @@ public void constructorFactory() {
         })
     public void noConstructorOrFactory() {
 
-        assertThrows(
-            MCRConfigurationException.class,
-            () -> {
-                MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-                MCRConfigurableInstanceHelper.getInstance(Object.class, configuration);
-            });
+        assertThrows(MCRConfigurationException.class,
+            () -> ofName(TestClassWithoutConstructorOrFactory.class, "Foo").instantiate());
 
     }
 
@@ -117,12 +105,8 @@ public void noConstructorOrFactory() {
         })
     public void multipleFactories() {
 
-        assertThrows(
-            MCRConfigurationException.class,
-            () -> {
-                MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-                MCRConfigurableInstanceHelper.getInstance(Object.class, configuration);
-            });
+        assertThrows(MCRConfigurationException.class,
+            () -> ofName(TestClassWithMultipleFactories.class, "Foo").instantiate());
 
     }
 
@@ -133,9 +117,8 @@ public void multipleFactories() {
         })
     public void configurationImplicit() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        ImplicitTestClass instance = MCRConfigurableInstanceHelper.getInstance(ImplicitTestClass.class, configuration,
-            MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES);
+        ImplicitTestClass instance = ofName(ImplicitTestClass.class, "Foo",
+            MCRInstanceConfiguration.Options.IMPLICIT).instantiate();
 
         assertNotNull(instance);
 
@@ -149,9 +132,7 @@ public void configurationImplicit() {
         })
     public void configurationProxy() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithConfigurationProxy instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithConfigurationProxy.class, configuration);
+        TestClassWithConfigurationProxy instance = ofName(TestClassWithConfigurationProxy.class, "Foo").instantiate();
 
         assertNotNull(instance);
 
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperCollectionTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorCollectionTest.java
similarity index 75%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperCollectionTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorCollectionTest.java
index b01e9f07ec..11e0e7366e 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperCollectionTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorCollectionTest.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
 
 import java.util.List;
 import java.util.Map;
@@ -32,10 +33,12 @@
 import org.mycore.common.config.annotation.MCRPropertyList;
 import org.mycore.common.config.annotation.MCRPropertyMap;
 import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration.Options;
 import org.mycore.test.MyCoReTest;
 
 @MyCoReTest
-public class MCRConfigurableInstanceHelperCollectionTest {
+public class MCRInstantiatorCollectionTest {
 
     @Test
     @MCRTestConfiguration(
@@ -46,9 +49,7 @@ public class MCRConfigurableInstanceHelperCollectionTest {
         })
     public void map() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithMap instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMap.class, configuration);
+        TestClassWithMap instance = ofName(TestClassWithMap.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -71,12 +72,8 @@ public void map() {
         })
     public void mapNotPresent() {
 
-        assertThrows(
-            MCRConfigurationException.class,
-            () -> {
-                MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-                MCRConfigurableInstanceHelper.getInstance(Object.class, configuration);
-            });
+        assertThrows(MCRConfigurationException.class,
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
 
     }
 
@@ -89,9 +86,7 @@ public void mapNotPresent() {
         })
     public void optionalMap() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalMap instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalMap.class, configuration);
+        TestClassWithOptionalMap instance = ofName(TestClassWithOptionalMap.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -114,9 +109,7 @@ public void optionalMap() {
         })
     public void optionalMapNotPresent() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalMap instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalMap.class, configuration);
+        TestClassWithOptionalMap instance = ofName(TestClassWithOptionalMap.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -136,9 +129,7 @@ public void optionalMapNotPresent() {
         })
     public void mapWithSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithMapWithSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMapWithSentinel.class, configuration);
+        TestClassWithMapWithSentinel instance = ofName(TestClassWithMapWithSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -161,9 +152,7 @@ public void mapWithSentinel() {
         })
     public void mapWithPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithMapsWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMapsWithPrefix.class, configuration);
+        TestClassWithMapsWithPrefix instance = ofName(TestClassWithMapsWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map1);
@@ -189,9 +178,7 @@ public void mapWithPrefix() {
         })
     public void shortFormMapWithPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithMapWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMapWithPrefix.class, configuration);
+        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -217,9 +204,7 @@ public void shortFormMapWithPrefix() {
         })
     public void mixedFormMapWithPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithMapWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMapWithPrefix.class, configuration);
+        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -250,10 +235,8 @@ public void mixedFormMapWithPrefix() {
         })
     public void shortFormMapWithoutPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Class");
-        TestClassWithMapWithoutPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMapWithoutPrefix.class, configuration,
-                MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES);
+        TestClassWithMapWithoutPrefix instance = ofName(TestClassWithMapWithoutPrefix.class, "Foo.Class",
+            Options.IMPLICIT).instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -279,9 +262,7 @@ public void shortFormMapWithoutPrefix() {
         })
     public void mapWithEmptyMapValues() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithMapWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMapWithPrefix.class, configuration);
+        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -309,9 +290,8 @@ public void mapWithEmptyMapValues() {
         })
     public void mapWithPrefixAndSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithMapWithPrefixAndSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMapWithPrefixAndSentinel.class, configuration);
+        TestClassWithMapWithPrefixAndSentinel instance =
+            ofName(TestClassWithMapWithPrefixAndSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -334,9 +314,7 @@ public void mapWithPrefixAndSentinel() {
         })
     public void list() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithList instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithList.class, configuration);
+        TestClassWithList instance = ofName(TestClassWithList.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -359,12 +337,8 @@ public void list() {
         })
     public void listNotPresent() {
 
-        assertThrows(
-            MCRConfigurationException.class,
-            () -> {
-                MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-                MCRConfigurableInstanceHelper.getInstance(Object.class, configuration);
-            });
+        assertThrows(MCRConfigurationException.class,
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
 
     }
 
@@ -377,9 +351,7 @@ public void listNotPresent() {
         })
     public void optionalList() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalList instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalList.class, configuration);
+        TestClassWithOptionalList instance = ofName(TestClassWithOptionalList.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -402,9 +374,7 @@ public void optionalList() {
         })
     public void optionalListNotPresent() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalList instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalList.class, configuration);
+        TestClassWithOptionalList instance = ofName(TestClassWithOptionalList.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -425,9 +395,7 @@ public void optionalListNotPresent() {
         })
     public void listWithSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithListAndSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithListAndSentinel.class, configuration);
+        TestClassWithListAndSentinel instance = ofName(TestClassWithListAndSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -447,9 +415,7 @@ public void listWithSentinel() {
         })
     public void listWithPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithListsWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithListsWithPrefix.class, configuration);
+        TestClassWithListsWithPrefix instance = ofName(TestClassWithListsWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list1);
@@ -475,9 +441,7 @@ public void listWithPrefix() {
         })
     public void shortFormListWithPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithListWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithListWithPrefix.class, configuration);
+        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -503,9 +467,7 @@ public void shortFormListWithPrefix() {
         })
     public void mixedFormListWithPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithListWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithListWithPrefix.class, configuration);
+        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -536,10 +498,8 @@ public void mixedFormListWithPrefix() {
         })
     public void shortFormListWithoutPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Class");
-        TestClassWithListWithoutPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithListWithoutPrefix.class, configuration,
-                MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES);
+        TestClassWithListWithoutPrefix instance = ofName(TestClassWithListWithoutPrefix.class, "Foo.Class",
+            Options.IMPLICIT).instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -565,9 +525,7 @@ public void shortFormListWithoutPrefix() {
         })
     public void listWithEmptyValues() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithListWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithListWithPrefix.class, configuration);
+        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -595,9 +553,8 @@ public void listWithEmptyValues() {
         })
     public void listWithPrefixAndSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithListWithPrefixAndSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithListWithPrefixAndSentinel.class, configuration);
+        TestClassWithListWithPrefixAndSentinel instance =
+            ofName(TestClassWithListWithPrefixAndSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -624,7 +581,8 @@ public static class TestClassWithOptionalMap {
 
     public static class TestClassWithMapWithSentinel {
 
-        @MCRPropertyMap(sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRPropertyMap
         public Map<String, String> map;
 
     }
@@ -648,7 +606,8 @@ public static class TestClassWithMapWithPrefix {
 
     public static class TestClassWithMapWithPrefixAndSentinel {
 
-        @MCRPropertyMap(name = "Map", sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRPropertyMap(name = "Map")
         public Map<String, String> map;
 
     }
@@ -676,7 +635,8 @@ public static class TestClassWithOptionalList {
 
     public static class TestClassWithListAndSentinel {
 
-        @MCRPropertyList(sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRPropertyList
         public List<String> list;
 
     }
@@ -700,7 +660,8 @@ public static class TestClassWithListWithPrefix {
 
     public static class TestClassWithListWithPrefixAndSentinel {
 
-        @MCRPropertyList(name = "List", sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRPropertyList(name = "List")
         public List<String> list;
 
     }
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperConfigTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorConfigTest.java
similarity index 97%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperConfigTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorConfigTest.java
index 3117acf40f..1a688c9398 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperConfigTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorConfigTest.java
@@ -19,14 +19,15 @@
 package org.mycore.common.config;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.stream.Stream;
 
@@ -38,7 +39,7 @@
 import org.mycore.test.MyCoReTest;
 
 @MyCoReTest
-public class MCRConfigurableInstanceHelperConfigTest {
+public class MCRInstantiatorConfigTest {
 
     public static final String INSTANCE_NAME_PREFIX = "MCR.CIH.";
 
@@ -162,13 +163,12 @@ private void testInstance(String instanceName, boolean withClassSuffix) {
         List<String> list = MCRConfiguration2.getInstantiatablePropertyKeys(fullInstanceName).toList();
         assertTrue(list.contains(fullInstanceName), "Properties should contain " + instanceName);
 
-        Optional<ConfigurableTestInstance> instance = MCRConfigurableInstanceHelper
-            .getInstance(ConfigurableTestInstance.class, fullInstanceName);
-        assertTrue(instance.isPresent(), "Test " + fullInstanceName + " should be present");
+        ConfigurableTestInstance instance = ofName(ConfigurableTestInstance.class, fullInstanceName).instantiate();
+        assertNotNull(instance, "Test " + fullInstanceName + " should be present");
 
-        validateFields(instance.get());
-        validateMethods(instance.get());
-        validatePostConstruction(instance.get(), fullInstanceName);
+        validateFields(instance);
+        validateMethods(instance);
+        validatePostConstruction(instance, fullInstanceName);
 
     }
 
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperDefaultTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorDefaultTest.java
similarity index 84%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperDefaultTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorDefaultTest.java
index 59c822b96e..61485f4d58 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperDefaultTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorDefaultTest.java
@@ -20,6 +20,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
 
 import java.util.List;
 import java.util.Map;
@@ -41,7 +42,7 @@
         @MCRTestProperty(key = "Default.OneProperty", string = "OneValue"),
         @MCRTestProperty(key = "Default.OtherProperty", string = "OtherValue")
     })
-public class MCRConfigurableInstanceHelperDefaultTest {
+public class MCRInstantiatorDefaultTest {
 
     @Test
     @MCRTestConfiguration(
@@ -51,9 +52,7 @@ public class MCRConfigurableInstanceHelperDefaultTest {
         })
     public void nested() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedClass instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedClass.class, configuration);
+        TestClassWithNestedClass instance = ofName(TestClassWithNestedClass.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -69,9 +68,7 @@ public void nested() {
         })
     public void nestedImplicit() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithImplicitNestedClass instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithImplicitNestedClass.class, configuration);
+        TestClassWithImplicitNestedClass instance = ofName(TestClassWithImplicitNestedClass.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -89,9 +86,7 @@ public void nestedImplicit() {
         })
     public void nestedNested() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedNestedClass instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedNestedClass.class, configuration);
+        TestClassWithNestedNestedClass instance = ofName(TestClassWithNestedNestedClass.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -110,9 +105,7 @@ public void nestedNested() {
         })
     public void nestedMap() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedMap instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedMap.class, configuration);
+        TestClassWithNestedMap instance = ofName(TestClassWithNestedMap.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -139,9 +132,8 @@ public void nestedMap() {
         })
     public void nestedMapImplicit() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedMapOfImplicitEntries instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedMapOfImplicitEntries.class, configuration);
+        TestClassWithNestedMapOfImplicitEntries instance =
+            ofName(TestClassWithNestedMapOfImplicitEntries.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -170,9 +162,7 @@ public void nestedMapImplicit() {
         })
     public void nestedList() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedList instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedList.class, configuration);
+        TestClassWithNestedList instance = ofName(TestClassWithNestedList.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -199,9 +189,8 @@ public void nestedList() {
         })
     public void nestedListImplicit() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedListOfImplicitEntries instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedListOfImplicitEntries.class, configuration);
+        TestClassWithNestedListOfImplicitEntries instance =
+            ofName(TestClassWithNestedListOfImplicitEntries.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitListTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitListTest.java
similarity index 96%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitListTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitListTest.java
index 66839cfc12..b24a82aa97 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitListTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitListTest.java
@@ -38,6 +38,7 @@
 import org.mycore.common.config.annotation.MCRInstanceList;
 import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -148,7 +149,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstanceHelperImplicitListTest {
+public class MCRInstantiatorImplicitListTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -240,8 +241,7 @@ void test(boolean required, ClassProperty classProperty, Sentinel sentinel, Valu
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
@@ -357,7 +357,8 @@ public List<Nested> nestedList() {
 
     public static class NotRequiredEnablingSentinel implements Configurable {
 
-        @MCRInstanceList(name = "Nested", valueClass = Nested.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = "Nested", valueClass = Nested.class, required = false)
         public List<Nested> nestedList;
 
         @Override
@@ -369,8 +370,8 @@ public List<Nested> nestedList() {
 
     public static class NotRequiredDisablingSentinel implements Configurable {
 
-        @MCRInstanceList(name = "Nested", valueClass = Nested.class, required = false,
-            sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstanceList(name = "Nested", valueClass = Nested.class, required = false)
         public List<Nested> nestedList;
 
         @Override
@@ -394,7 +395,8 @@ public List<Nested> nestedList() {
 
     public static class RequiredEnablingSentinel implements Configurable {
 
-        @MCRInstanceList(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = "Nested", valueClass = Nested.class)
         public List<Nested> nestedList;
 
         @Override
@@ -406,7 +408,8 @@ public List<Nested> nestedList() {
 
     public static class RequiredDisablingSentinel implements Configurable {
 
-        @MCRInstanceList(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstanceList(name = "Nested", valueClass = Nested.class)
         public List<Nested> nestedList;
 
         @Override
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitMapTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitMapTest.java
similarity index 96%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitMapTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitMapTest.java
index cd61858590..8298b62402 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitMapTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitMapTest.java
@@ -38,6 +38,7 @@
 import org.mycore.common.config.annotation.MCRInstanceMap;
 import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -148,7 +149,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstanceHelperImplicitMapTest {
+public class MCRInstantiatorImplicitMapTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -240,8 +241,7 @@ void test(boolean required, ClassProperty classProperty, Sentinel sentinel, Valu
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
@@ -357,7 +357,8 @@ public Map<String, Nested> nestedMap() {
 
     public static class NotRequiredEnablingSentinel implements Configurable {
 
-        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, required = false)
         public Map<String, Nested> nestedMap;
 
         @Override
@@ -369,8 +370,8 @@ public Map<String, Nested> nestedMap() {
 
     public static class NotRequiredDisablingSentinel implements Configurable {
 
-        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, required = false,
-            sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, required = false)
         public Map<String, Nested> nestedMap;
 
         @Override
@@ -394,7 +395,8 @@ public Map<String, Nested> nestedMap() {
 
     public static class RequiredEnablingSentinel implements Configurable {
 
-        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = "Nested", valueClass = Nested.class)
         public Map<String, Nested> nestedMap;
 
         @Override
@@ -406,8 +408,8 @@ public Map<String, Nested> nestedMap() {
 
     public static class RequiredDisablingSentinel implements Configurable {
 
-        @MCRInstanceMap(name = "Nested", valueClass = Nested.class,
-            sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstanceMap(name = "Nested", valueClass = Nested.class)
         public Map<String, Nested> nestedMap;
 
         @Override
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitTest.java
similarity index 96%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitTest.java
index 3b4ae119a5..82fa825a4b 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperImplicitTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorImplicitTest.java
@@ -37,6 +37,7 @@
 import org.mycore.common.config.annotation.MCRInstance;
 import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -147,7 +148,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstanceHelperImplicitTest {
+public class MCRInstantiatorImplicitTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -239,8 +240,7 @@ void test(boolean required, ClassProperty classProperty, Sentinel sentinel, Valu
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
@@ -355,7 +355,8 @@ public Nested nested() {
 
     public static class NotRequiredEnablingSentinel implements Configurable {
 
-        @MCRInstance(name = "Nested", valueClass = Nested.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstance(name = "Nested", valueClass = Nested.class, required = false)
         public Nested nested;
 
         @Override
@@ -367,8 +368,8 @@ public Nested nested() {
 
     public static class NotRequiredDisablingSentinel implements Configurable {
 
-        @MCRInstance(name = "Nested", valueClass = Nested.class, required = false,
-            sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstance(name = "Nested", valueClass = Nested.class, required = false)
         public Nested nested;
 
         @Override
@@ -392,7 +393,8 @@ public Nested nested() {
 
     public static class RequiredEnablingSentinel implements Configurable {
 
-        @MCRInstance(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstance(name = "Nested", valueClass = Nested.class)
         public Nested nested;
 
         @Override
@@ -404,7 +406,8 @@ public Nested nested() {
 
     public static class RequiredDisablingSentinel implements Configurable {
 
-        @MCRInstance(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstance(name = "Nested", valueClass = Nested.class)
         public Nested nested;
 
         @Override
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNestedTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNestedTest.java
similarity index 78%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNestedTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNestedTest.java
index 46eacec371..8674c9028a 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNestedTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNestedTest.java
@@ -22,6 +22,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
 
 import java.util.List;
 import java.util.Map;
@@ -34,10 +35,11 @@
 import org.mycore.common.config.annotation.MCRInstanceMap;
 import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 @MyCoReTest
-public class MCRConfigurableInstanceHelperNestedTest {
+public class MCRInstantiatorNestedTest {
 
     @Test
     @MCRTestConfiguration(
@@ -49,9 +51,7 @@ public class MCRConfigurableInstanceHelperNestedTest {
         })
     public void nested() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedClass instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedClass.class, configuration);
+        TestClassWithNestedClass instance = ofName(TestClassWithNestedClass.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -67,12 +67,8 @@ public void nested() {
         })
     public void nestedNotPresent() {
 
-        assertThrows(
-            MCRConfigurationException.class,
-            () -> {
-                MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-                MCRConfigurableInstanceHelper.getInstance(Object.class, configuration);
-            });
+        assertThrows(MCRConfigurationException.class,
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
 
     }
 
@@ -85,9 +81,7 @@ public void nestedNotPresent() {
         })
     public void nestedImplicit() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithImplicitNestedClass instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithImplicitNestedClass.class, configuration);
+        TestClassWithImplicitNestedClass instance = ofName(TestClassWithImplicitNestedClass.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -106,9 +100,7 @@ public void nestedImplicit() {
         })
     public void nestedOptional() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalNestedClass instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalNestedClass.class, configuration);
+        TestClassWithOptionalNestedClass instance = ofName(TestClassWithOptionalNestedClass.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -124,9 +116,7 @@ public void nestedOptional() {
         })
     public void nestedOptionalNotPresent() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalNestedClass instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalNestedClass.class, configuration);
+        TestClassWithOptionalNestedClass instance = ofName(TestClassWithOptionalNestedClass.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNull(instance.nested);
@@ -144,9 +134,7 @@ public void nestedOptionalNotPresent() {
         })
     public void nestedNested() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedNestedClass instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedNestedClass.class, configuration);
+        TestClassWithNestedNestedClass instance = ofName(TestClassWithNestedNestedClass.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -167,9 +155,8 @@ public void nestedNested() {
         })
     public void nestedOptionalAndSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalNestedClassAndSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalNestedClassAndSentinel.class, configuration);
+        TestClassWithOptionalNestedClassAndSentinel instance =
+            ofName(TestClassWithOptionalNestedClassAndSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -189,9 +176,8 @@ public void nestedOptionalAndSentinel() {
         })
     public void nestedOptionalAndSentinelNotPresent() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalNestedClassAndSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalNestedClassAndSentinel.class, configuration);
+        TestClassWithOptionalNestedClassAndSentinel instance =
+            ofName(TestClassWithOptionalNestedClassAndSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNull(instance.nested);
@@ -209,9 +195,7 @@ public void nestedOptionalAndSentinelNotPresent() {
         })
     public void nestedMap() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedMap instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedMap.class, configuration);
+        TestClassWithNestedMap instance = ofName(TestClassWithNestedMap.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -236,12 +220,8 @@ public void nestedMap() {
         })
     public void nestedMapNotPresent() {
 
-        assertThrows(
-            MCRConfigurationException.class,
-            () -> {
-                MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-                MCRConfigurableInstanceHelper.getInstance(Object.class, configuration);
-            });
+        assertThrows(MCRConfigurationException.class,
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
 
     }
 
@@ -254,9 +234,8 @@ public void nestedMapNotPresent() {
         })
     public void nestedMapImplicit() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedMapOfImplicitEntries instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedMapOfImplicitEntries.class, configuration);
+        TestClassWithNestedMapOfImplicitEntries instance =
+            ofName(TestClassWithNestedMapOfImplicitEntries.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -285,9 +264,7 @@ public void nestedMapImplicit() {
         })
     public void nestedOptionalMap() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalNestedMap instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalNestedMap.class, configuration);
+        TestClassWithOptionalNestedMap instance = ofName(TestClassWithOptionalNestedMap.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -312,9 +289,7 @@ public void nestedOptionalMap() {
         })
     public void nestedOptionalMapNotPresent() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalNestedMap instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalNestedMap.class, configuration);
+        TestClassWithOptionalNestedMap instance = ofName(TestClassWithOptionalNestedMap.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -338,9 +313,8 @@ public void nestedOptionalMapNotPresent() {
         })
     public void nestedMapWithSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedMapWithSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedMapWithSentinel.class, configuration);
+        TestClassWithNestedMapWithSentinel instance =
+            ofName(TestClassWithNestedMapWithSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -365,9 +339,8 @@ public void nestedMapWithSentinel() {
         })
     public void nestedMapWithPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedMapsWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedMapsWithPrefix.class, configuration);
+        TestClassWithNestedMapsWithPrefix instance =
+            ofName(TestClassWithNestedMapsWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map1);
@@ -403,9 +376,8 @@ public void nestedMapWithPrefix() {
         })
     public void nestedMapWithPrefixAndSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedMapWithPrefixAndSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedMapWithPrefixAndSentinel.class, configuration);
+        TestClassWithNestedMapWithPrefixAndSentinel instance =
+            ofName(TestClassWithNestedMapWithPrefixAndSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -430,9 +402,7 @@ public void nestedMapWithPrefixAndSentinel() {
         })
     public void nestedList() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedList instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedList.class, configuration);
+        TestClassWithNestedList instance = ofName(TestClassWithNestedList.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -457,12 +427,8 @@ public void nestedList() {
         })
     public void nestedListNotPresent() {
 
-        assertThrows(
-            MCRConfigurationException.class,
-            () -> {
-                MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-                MCRConfigurableInstanceHelper.getInstance(Object.class, configuration);
-            });
+        assertThrows(MCRConfigurationException.class,
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
 
     }
 
@@ -475,9 +441,8 @@ public void nestedListNotPresent() {
         })
     public void nestedListImplicit() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedListOfImplicitEntries instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedListOfImplicitEntries.class, configuration);
+        TestClassWithNestedListOfImplicitEntries instance =
+            ofName(TestClassWithNestedListOfImplicitEntries.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -506,9 +471,7 @@ public void nestedListImplicit() {
         })
     public void nestedOptionalList() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalNestedList instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalNestedList.class, configuration);
+        TestClassWithOptionalNestedList instance = ofName(TestClassWithOptionalNestedList.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -533,9 +496,7 @@ public void nestedOptionalList() {
         })
     public void nestedOptionalListNotPresent() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithOptionalNestedList instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithOptionalNestedList.class, configuration);
+        TestClassWithOptionalNestedList instance = ofName(TestClassWithOptionalNestedList.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -559,9 +520,8 @@ public void nestedOptionalListNotPresent() {
         })
     public void nestedListWithSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedListAndSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedListAndSentinel.class, configuration);
+        TestClassWithNestedListAndSentinel instance =
+            ofName(TestClassWithNestedListAndSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -583,9 +543,8 @@ public void nestedListWithSentinel() {
         })
     public void nestedListWithPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedListsWithPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedListsWithPrefix.class, configuration);
+        TestClassWithNestedListsWithPrefix instance =
+            ofName(TestClassWithNestedListsWithPrefix.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list1);
@@ -620,9 +579,8 @@ public void nestedListWithPrefix() {
         })
     public void nestedListWithPrefixAndSentinel() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithNestedListWithPrefixAndSentinel instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithNestedListWithPrefixAndSentinel.class, configuration);
+        TestClassWithNestedListWithPrefixAndSentinel instance =
+            ofName(TestClassWithNestedListWithPrefixAndSentinel.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -683,8 +641,8 @@ public static class TestClassWithNestedNestedClass {
 
     public static class TestClassWithOptionalNestedClassAndSentinel {
 
-        @MCRInstance(name = "Nested", valueClass = NestedClass.class, required = false,
-            sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRInstance(name = "Nested", valueClass = NestedClass.class, required = false)
         public NestedClass nested;
 
     }
@@ -756,7 +714,8 @@ public static class TestClassWithOptionalNestedMap {
 
     public static class TestClassWithNestedMapWithSentinel {
 
-        @MCRInstanceMap(valueClass = SimpleEntry.class, sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRInstanceMap(valueClass = SimpleEntry.class)
         public Map<String, SimpleEntry> map;
 
     }
@@ -773,7 +732,8 @@ public static class TestClassWithNestedMapsWithPrefix {
 
     public static class TestClassWithNestedMapWithPrefixAndSentinel {
 
-        @MCRInstanceMap(name = "Map", valueClass = SimpleEntry.class, sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRInstanceMap(name = "Map", valueClass = SimpleEntry.class)
         public Map<String, SimpleEntry> map;
 
     }
@@ -801,7 +761,8 @@ public static class TestClassWithOptionalNestedList {
 
     public static class TestClassWithNestedListAndSentinel {
 
-        @MCRInstanceList(valueClass = SimpleEntry.class, sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRInstanceList(valueClass = SimpleEntry.class)
         public List<SimpleEntry> list;
 
     }
@@ -818,7 +779,8 @@ public static class TestClassWithNestedListsWithPrefix {
 
     public static class TestClassWithNestedListWithPrefixAndSentinel {
 
-        @MCRInstanceList(name = "List", valueClass = SimpleEntry.class, sentinel = @MCRSentinel(name = "Sentinel"))
+        @MCRSentinel(name = "Sentinel")
+        @MCRInstanceList(name = "List", valueClass = SimpleEntry.class)
         public List<SimpleEntry> list;
 
     }
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitListTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitListTest.java
similarity index 96%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitListTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitListTest.java
index 551b9e5d7b..697cbdf0c1 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitListTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitListTest.java
@@ -38,6 +38,7 @@
 import org.mycore.common.config.annotation.MCRInstanceList;
 import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -148,7 +149,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstanceHelperNonImplicitListTest {
+public class MCRInstantiatorNonImplicitListTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -240,8 +241,7 @@ void test(boolean required, ClassProperty classProperty, Sentinel sentinel, Valu
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
@@ -351,7 +351,8 @@ public List<Nested> nestedList() {
 
     public static class NotRequiredEnablingSentinel implements Configurable {
 
-        @MCRInstanceList(name = "Nested", valueClass = Nested.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = "Nested", valueClass = Nested.class, required = false)
         public List<Nested> nestedList;
 
         @Override
@@ -363,8 +364,8 @@ public List<Nested> nestedList() {
 
     public static class NotRequiredDisablingSentinel implements Configurable {
 
-        @MCRInstanceList(name = "Nested", valueClass = Nested.class, required = false,
-            sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstanceList(name = "Nested", valueClass = Nested.class, required = false)
         public List<Nested> nestedList;
 
         @Override
@@ -388,7 +389,8 @@ public List<Nested> nestedList() {
 
     public static class RequiredEnablingSentinel implements Configurable {
 
-        @MCRInstanceList(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceList(name = "Nested", valueClass = Nested.class)
         public List<Nested> nestedList;
 
         @Override
@@ -400,7 +402,8 @@ public List<Nested> nestedList() {
 
     public static class RequiredDisablingSentinel implements Configurable {
 
-        @MCRInstanceList(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstanceList(name = "Nested", valueClass = Nested.class)
         public List<Nested> nestedList;
 
         @Override
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitMapTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitMapTest.java
similarity index 96%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitMapTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitMapTest.java
index d80311854d..2635d9ae9b 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitMapTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitMapTest.java
@@ -38,6 +38,7 @@
 import org.mycore.common.config.annotation.MCRInstanceMap;
 import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -148,7 +149,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstanceHelperNonImplicitMapTest {
+public class MCRInstantiatorNonImplicitMapTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -240,8 +241,7 @@ void test(boolean required, ClassProperty classProperty, Sentinel sentinel, Valu
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
@@ -351,7 +351,8 @@ public Map<String, Nested> nestedMap() {
 
     public static class NotRequiredEnablingSentinel implements Configurable {
 
-        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, required = false)
         public Map<String, Nested> nestedMap;
 
         @Override
@@ -363,8 +364,8 @@ public Map<String, Nested> nestedMap() {
 
     public static class NotRequiredDisablingSentinel implements Configurable {
 
-        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, required = false,
-            sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, required = false)
         public Map<String, Nested> nestedMap;
 
         @Override
@@ -388,7 +389,8 @@ public Map<String, Nested> nestedMap() {
 
     public static class RequiredEnablingSentinel implements Configurable {
 
-        @MCRInstanceMap(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = "Nested", valueClass = Nested.class)
         public Map<String, Nested> nestedMap;
 
         @Override
@@ -400,8 +402,8 @@ public Map<String, Nested> nestedMap() {
 
     public static class RequiredDisablingSentinel implements Configurable {
 
-        @MCRInstanceMap(name = "Nested", valueClass = Nested.class,
-            sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstanceMap(name = "Nested", valueClass = Nested.class)
         public Map<String, Nested> nestedMap;
 
         @Override
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitTest.java
similarity index 95%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitTest.java
index 18a6bb7100..621c5e3c9a 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperNonImplicitTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNonImplicitTest.java
@@ -37,6 +37,7 @@
 import org.mycore.common.config.annotation.MCRInstance;
 import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -147,7 +148,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstanceHelperNonImplicitTest {
+public class MCRInstantiatorNonImplicitTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -239,8 +240,7 @@ void test(boolean required, ClassProperty classProperty, Sentinel sentinel, Valu
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
@@ -347,7 +347,8 @@ public Nested nested() {
 
     public static class NotRequiredEnablingSentinel implements Configurable {
 
-        @MCRInstance(name = "Nested", valueClass = Nested.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstance(name = "Nested", valueClass = Nested.class, required = false)
         public Nested nested;
 
         @Override
@@ -359,8 +360,8 @@ public Nested nested() {
 
     public static class NotRequiredDisablingSentinel implements Configurable {
 
-        @MCRInstance(name = "Nested", valueClass = Nested.class, required = false,
-            sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstance(name = "Nested", valueClass = Nested.class, required = false)
         public Nested nested;
 
         @Override
@@ -384,7 +385,8 @@ public Nested nested() {
 
     public static class RequiredEnablingSentinel implements Configurable {
 
-        @MCRInstance(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstance(name = "Nested", valueClass = Nested.class)
         public Nested nested;
 
         @Override
@@ -396,7 +398,8 @@ public Nested nested() {
 
     public static class RequiredDisablingSentinel implements Configurable {
 
-        @MCRInstance(name = "Nested", valueClass = Nested.class, sentinel = @MCRSentinel(defaultValue = false))
+        @MCRSentinel(defaultValue = false)
+        @MCRInstance(name = "Nested", valueClass = Nested.class)
         public Nested nested;
 
         @Override
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyListTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyListTest.java
similarity index 98%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyListTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyListTest.java
index 3cfe2a442b..472ada098f 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyListTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyListTest.java
@@ -36,6 +36,7 @@
 import org.mycore.common.MCRTestConfiguration;
 import org.mycore.common.MCRTestProperty;
 import org.mycore.common.config.annotation.MCRPropertyList;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -116,7 +117,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstancePropertyListTest {
+public class MCRInstantiatorPropertyListTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -249,8 +250,7 @@ void test(boolean required, ValueProperty valueProperty, boolean defaultValue, D
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyMapTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyMapTest.java
similarity index 98%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyMapTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyMapTest.java
index 67fbc43ab6..2df0e07860 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyMapTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyMapTest.java
@@ -36,6 +36,7 @@
 import org.mycore.common.MCRTestConfiguration;
 import org.mycore.common.MCRTestProperty;
 import org.mycore.common.config.annotation.MCRPropertyMap;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -116,7 +117,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstancePropertyMapTest {
+public class MCRInstantiatorPropertyMapTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -252,8 +253,7 @@ void test(boolean required, ValueProperty valueProperty,
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyTest.java
similarity index 97%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyTest.java
index 18ac1f78dc..d7dd488aa7 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorPropertyTest.java
@@ -35,6 +35,7 @@
 import org.mycore.common.MCRTestConfiguration;
 import org.mycore.common.MCRTestProperty;
 import org.mycore.common.config.annotation.MCRProperty;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.test.MyCoReTest;
 
 /**
@@ -99,7 +100,7 @@
  * </table>
  */
 @MyCoReTest
-public class MCRConfigurableInstancePropertyTest {
+public class MCRInstantiatorPropertyTest {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
@@ -187,8 +188,7 @@ void test(boolean required, ValueProperty valueProperty,
         Configurable instance = null;
         MCRConfigurationException exception = null;
         try {
-            MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName(CONFIGURED_CLASS_PROPERTY);
-            instance = MCRConfigurableInstanceHelper.getInstance(Configurable.class, configuration);
+            instance = MCRInstanceConfiguration.ofName(Configurable.class, CONFIGURED_CLASS_PROPERTY).instantiate();
         } catch (MCRConfigurationException e) {
             exception = e;
         }
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperProxyTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorProxyTest.java
similarity index 89%
rename from mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperProxyTest.java
rename to mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorProxyTest.java
index 6e8ae2d9aa..9e744784bb 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperProxyTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorProxyTest.java
@@ -20,6 +20,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
 
 import java.util.function.Supplier;
 
@@ -31,7 +32,7 @@
 import org.mycore.test.MyCoReTest;
 
 @MyCoReTest
-public class MCRConfigurableInstanceHelperProxyTest {
+public class MCRInstantiatorProxyTest {
 
     @Test
     @MCRTestConfiguration(
@@ -42,9 +43,7 @@ public class MCRConfigurableInstanceHelperProxyTest {
         })
     public void annotated() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        TestClassWithConfigurationProxy instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithConfigurationProxy.class, configuration);
+        TestClassWithConfigurationProxy instance = ofName(TestClassWithConfigurationProxy.class, "Foo").instantiate();
 
         assertNotNull(instance);
         assertEquals("Value1-Value2", instance.value());
diff --git a/mycore-base/src/test/java/org/mycore/common/events/MCREventManagerTest.java b/mycore-base/src/test/java/org/mycore/common/events/MCREventManagerTest.java
index 0dcf2c3a2c..05cd9d004c 100644
--- a/mycore-base/src/test/java/org/mycore/common/events/MCREventManagerTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/events/MCREventManagerTest.java
@@ -43,7 +43,7 @@ public void instance() {
         try {
             assertNull(MCREventManager.obtainTestInstance(), "Instance should be null before initialization");
         } catch (MCRConfigurationException e) {
-            assertEquals("Missing class (class.that.does.not.Exist) configured in property: " +
+            assertEquals("Missing class (class.that.does.not.Exist) configured in: " +
                 "MCR.EventHandler.MCRObject.4.Class", e.getMessage());
         }
     }
diff --git a/mycore-jobqueue/src/main/java/org/mycore/services/queuedjob/MCRJobQueueCleaner.java b/mycore-jobqueue/src/main/java/org/mycore/services/queuedjob/MCRJobQueueCleaner.java
index 1d2a17a1a8..d82bede373 100644
--- a/mycore-jobqueue/src/main/java/org/mycore/services/queuedjob/MCRJobQueueCleaner.java
+++ b/mycore-jobqueue/src/main/java/org/mycore/services/queuedjob/MCRJobQueueCleaner.java
@@ -183,7 +183,8 @@ private int doClean(EntityManager manager, String name, MCRJobSelector selector)
 
     public static class Factory implements Supplier<MCRJobQueueCleaner> {
 
-        @MCRInstanceMap(name = SELECTORS_KEY, valueClass = MCRJobSelector.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = SELECTORS_KEY, valueClass = MCRJobSelector.class)
         public Map<String, MCRJobSelector> selectors;
 
         @MCRProperty(name = ENABLED_KEY)
diff --git a/mycore-jobqueue/src/main/java/org/mycore/services/queuedjob/MCRSimpleJobSelector.java b/mycore-jobqueue/src/main/java/org/mycore/services/queuedjob/MCRSimpleJobSelector.java
index 1c79b4b966..64f0649ed5 100644
--- a/mycore-jobqueue/src/main/java/org/mycore/services/queuedjob/MCRSimpleJobSelector.java
+++ b/mycore-jobqueue/src/main/java/org/mycore/services/queuedjob/MCRSimpleJobSelector.java
@@ -195,7 +195,7 @@ private Class<? extends MCRJobAction> toActionJobClass(String action) {
             try {
                 return MCRClassTools.forName(action);
             } catch (ClassNotFoundException e) {
-                throw new MCRConfigurationException("Missing class (" + action + ") configured in property: " +
+                throw new MCRConfigurationException("Missing class (" + action + ") configured in: " +
                     property + "." + ACTIONS_KEY, e);
             }
         }
diff --git a/mycore-mods/src/main/java/org/mycore/mods/MCRMODSExpander.java b/mycore-mods/src/main/java/org/mycore/mods/MCRMODSExpander.java
index ecd87481c0..80a9360689 100644
--- a/mycore-mods/src/main/java/org/mycore/mods/MCRMODSExpander.java
+++ b/mycore-mods/src/main/java/org/mycore/mods/MCRMODSExpander.java
@@ -144,8 +144,8 @@ protected boolean isClearableRelatedItem(Element relatedItem) {
 
     public static class Factory implements Supplier<MCRMODSExpander> {
 
-        @MCRInstance(name = CLASSIFICATION_MAPPER_KEY, valueClass = MCRClassificationMapper.class, required = false,
-            sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstance(name = CLASSIFICATION_MAPPER_KEY, valueClass = MCRClassificationMapper.class, required = false)
         public MCRClassificationMapper classificationMapper;
 
         @Override
diff --git a/mycore-mods/src/main/java/org/mycore/mods/classification/mapping/MCRMODSGeneratorClassificationMapper.java b/mycore-mods/src/main/java/org/mycore/mods/classification/mapping/MCRMODSGeneratorClassificationMapper.java
index f1bda310b1..c673165171 100644
--- a/mycore-mods/src/main/java/org/mycore/mods/classification/mapping/MCRMODSGeneratorClassificationMapper.java
+++ b/mycore-mods/src/main/java/org/mycore/mods/classification/mapping/MCRMODSGeneratorClassificationMapper.java
@@ -95,7 +95,8 @@ protected void insertNewMappings(MCRObject object, Set<Mapping> mappings) {
 
     public static class Factory implements Supplier<MCRMODSGeneratorClassificationMapper> {
 
-        @MCRInstanceMap(name = GENERATORS_KEY, valueClass = Generator.class, required = false, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = GENERATORS_KEY, valueClass = Generator.class, required = false)
         public Map<String, Generator> generators;
 
         @Override
diff --git a/mycore-mods/src/main/java/org/mycore/mods/classification/mapping/MCRMODSXMappingClassificationGenerator.java b/mycore-mods/src/main/java/org/mycore/mods/classification/mapping/MCRMODSXMappingClassificationGenerator.java
index d03aca842c..b07fb28850 100644
--- a/mycore-mods/src/main/java/org/mycore/mods/classification/mapping/MCRMODSXMappingClassificationGenerator.java
+++ b/mycore-mods/src/main/java/org/mycore/mods/classification/mapping/MCRMODSXMappingClassificationGenerator.java
@@ -96,8 +96,8 @@ protected Stream<MCRCategory> getCategories(MCRCategoryDAO dao, MCRObject object
 
     public static class Factory implements Supplier<MCRMODSXMappingClassificationGenerator> {
 
-        @MCRInstance(name = EVALUATOR_KEY, valueClass = Evaluator.class, required = false,
-            sentinel = @MCRSentinel(name = MCRSentinel.DEFAULT_KEY, rejectionValue = true, defaultValue = false))
+        @MCRSentinel(name = MCRSentinel.DEFAULT_KEY, rejectionValue = true, defaultValue = false)
+        @MCRInstance(name = EVALUATOR_KEY, valueClass = Evaluator.class, required = false)
         public Evaluator evaluator;
 
         @MCRProperty(name = ON_MISSING_MAPPED_CATEGORY_KEY)
diff --git a/mycore-user2/src/main/java/org/mycore/user2/hash/MCRPasswordCheckManager.java b/mycore-user2/src/main/java/org/mycore/user2/hash/MCRPasswordCheckManager.java
index 6a62b42808..abfe59d180 100644
--- a/mycore-user2/src/main/java/org/mycore/user2/hash/MCRPasswordCheckManager.java
+++ b/mycore-user2/src/main/java/org/mycore/user2/hash/MCRPasswordCheckManager.java
@@ -173,7 +173,8 @@ private MCRPasswordCheckStrategy getStrategy(String type) {
 
     public static class Factory implements Supplier<MCRPasswordCheckManager> {
 
-        @MCRInstanceMap(name = STRATEGIES_KEY, valueClass = MCRPasswordCheckStrategy.class, sentinel = @MCRSentinel)
+        @MCRSentinel
+        @MCRInstanceMap(name = STRATEGIES_KEY, valueClass = MCRPasswordCheckStrategy.class)
         public Map<String, MCRPasswordCheckStrategy> strategies;
 
         @MCRProperty(name = SELECTED_STRATEGY_KEY)
diff --git a/mycore-user2/src/main/resources/components/user2/config/mycore.properties b/mycore-user2/src/main/resources/components/user2/config/mycore.properties
index bd6df4746a..2cca031758 100644
--- a/mycore-user2/src/main/resources/components/user2/config/mycore.properties
+++ b/mycore-user2/src/main/resources/components/user2/config/mycore.properties
@@ -36,7 +36,7 @@ MCR.user2.LDAP.ReadTimeout=1000
 ##############################################################################
 # Password check configuration
 ##############################################################################
-MCR.User.PasswordCheck.Class=org.mycore.user2.hash.MCRPasswordCheckManager
+
 MCR.User.PasswordCheck.ConfigurationChecks=OUTDATED_STRATEGY,INCOMPATIBLE_CHANGE
 
 # Crypt: was used in the old MyCoRe user system
diff --git a/mycore-user2/src/test/java/org/mycore/user2/hash/MCRPasswordCheckManagerTest.java b/mycore-user2/src/test/java/org/mycore/user2/hash/MCRPasswordCheckManagerTest.java
index 2d72997bf3..ca759dd29f 100644
--- a/mycore-user2/src/test/java/org/mycore/user2/hash/MCRPasswordCheckManagerTest.java
+++ b/mycore-user2/src/test/java/org/mycore/user2/hash/MCRPasswordCheckManagerTest.java
@@ -218,6 +218,10 @@ public final void testIncompatibleChangeCheck() {
         }
 
         assertInstanceOf(MCRConfigurationException.class, e);
+        
+        System.out.println(" --- " + e.getMessage());
+        e.printStackTrace(System.out);
+        
         assertTrue(e.getMessage().contains("Detected incompatible value change"));
 
     }