From e2b6841f2229a43a72951c0b41d2525b77642410 Mon Sep 17 00:00:00 2001
From: Torsten Krause <krause.torsten@ub.uni-kiel.de>
Date: Mon, 16 Mar 2026 15:32:15 +0100
Subject: [PATCH 1/4] MCR-3650 refactor MCRConfigurableInstanceHelper into
 multiple classes

---
 .../config/MCRConfigurableInstanceHelper.java | 1746 +----------------
 .../common/config/MCRConfiguration2.java      |   14 +-
 .../config/MCRConfigurationException.java     |    4 +-
 .../config/MCRInstanceConfiguration.java      |   28 +
 .../common/config/annotation/MCRProperty.java |    2 +-
 .../config/annotation/MCRPropertyList.java    |    2 +-
 .../config/annotation/MCRRawProperties.java   |    4 +-
 .../config/instantiator/MCRInstantiator.java  |  394 ++++
 .../instantiator/MCRInstantiatorUtils.java    |  224 +++
 .../injectable/MCRFieldInjectable.java        |   49 +
 .../injectable/MCRInjectable.java             |   39 +
 .../injectable/MCRMethodInjectable.java       |   49 +
 .../source/MCRInstanceListSource.java         |  115 ++
 .../source/MCRInstanceMapSource.java          |  110 ++
 .../source/MCRInstanceSource.java             |  103 +
 .../source/MCRPostConstructionSource.java     |   71 +
 .../source/MCRPropertyListSource.java         |  199 ++
 .../source/MCRPropertyMapSource.java          |  190 ++
 .../source/MCRPropertySource.java             |  141 ++
 .../source/MCRRawPropertiesSource.java        |  108 +
 .../config/instantiator/source/MCRSource.java |  138 ++
 .../instantiator/target/MCRFieldTarget.java   |   66 +
 .../instantiator/target/MCRMethodTarget.java  |   79 +
 .../config/instantiator/target/MCRTarget.java |   68 +
 ...CRConfigurableInstanceHelperBasicTest.java |    3 +-
 ...figurableInstanceHelperCollectionTest.java |    5 +-
 .../common/events/MCREventManagerTest.java    |    2 +-
 .../queuedjob/MCRSimpleJobSelector.java       |    2 +-
 28 files changed, 2207 insertions(+), 1748 deletions(-)
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiator.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiatorUtils.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRFieldInjectable.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRInjectable.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/injectable/MCRMethodInjectable.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceListSource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceMapSource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceSource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPostConstructionSource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyListSource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyMapSource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertySource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRRawPropertiesSource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRSource.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRFieldTarget.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRMethodTarget.java
 create mode 100644 mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRTarget.java

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
index bba78b98f0..e49448ac33 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurableInstanceHelper.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurableInstanceHelper.java
@@ -18,47 +18,15 @@
 
 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 org.mycore.common.config.MCRInstanceConfiguration.Option;
+import org.mycore.common.config.MCRInstanceConfiguration.Options;
+import org.mycore.common.config.instantiator.MCRInstantiator;
+import org.mycore.common.config.instantiator.MCRInstantiatorUtils;
 
 import jakarta.inject.Singleton;
 
@@ -67,21 +35,11 @@
  *
  * @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<>();
+@SuppressWarnings({ "PMD.MCR.Singleton.ClassModifiers", "PMD.MCR.Singleton.PrivateConstructor",
+    "PMD.MCR.Singleton.NonPrivateConstructors", "PMD.MCR.Singleton.MethodModifiers",
+    "PMD.MCR.Singleton.MethodReturnType", "PMD.SingletonClassReturningNewInstance",
+    "PMD.SingleMethodSingleton" })
+public class MCRConfigurableInstanceHelper {
 
     private static final ConcurrentMap<String, MCRInstanceConfiguration> CONFIG_CACHE = new ConcurrentHashMap<>();
 
@@ -99,7 +57,7 @@ class MCRConfigurableInstanceHelper {
      */
     public static boolean isSingleton(String property) {
         return MCRConfiguration2.getString(property).stream()
-            .anyMatch(propertyVal -> isSingleton(getClass(property, propertyVal)));
+            .anyMatch(propertyVal -> isSingleton(MCRInstantiatorUtils.getClass(property, propertyVal)));
     }
 
     /**
@@ -116,7 +74,7 @@ public static boolean isSingleton(Class<?> targetClass) {
      * 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);
+        return getInstance(superClass, name, Options.NONE);
     }
 
     /**
@@ -132,10 +90,10 @@ public static <S> Optional<S> getInstance(Class<S> superClass, String name, Set<
         throws MCRConfigurationException {
         MCRInstanceConfiguration configuration = CONFIG_CACHE.computeIfAbsent(name, MCRInstanceConfiguration::ofName);
         String className = configuration.className();
-        if (isAbsent(className) && !options.contains(Option.ADD_IMPLICIT_CLASS_PROPERTIES)) {
+        if (isAbsent(className) && !options.contains(Option.IMPLICIT)) {
             return Optional.empty();
         }
-        return Optional.of(getInstance(superClass, configuration, name, options));
+        return Optional.of(getInstance(superClass, configuration, options));
     }
 
     private static boolean isAbsent(String className) {
@@ -147,7 +105,7 @@ private static boolean isAbsent(String className) {
      */
     public static <S> S getInstance(Class<S> superClass, MCRInstanceConfiguration configuration)
         throws MCRConfigurationException {
-        return getInstance(superClass, configuration, NO_OPTIONS);
+        return getInstance(superClass, configuration, Options.NONE);
     }
 
     /**
@@ -161,1685 +119,11 @@ public static <S> S getInstance(Class<S> superClass, MCRInstanceConfiguration co
      */
     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());
-
+        return MCRInstantiator.getInstance(superClass, configuration, options);
     }
 
     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..60179d24a0 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
@@ -32,6 +32,8 @@
 import java.util.stream.Stream;
 
 import org.mycore.common.MCRClassTools;
+import org.mycore.common.config.MCRInstanceConfiguration.Option;
+import org.mycore.common.config.MCRInstanceConfiguration.Options;
 import org.mycore.common.function.MCRTriConsumer;
 
 /**
@@ -131,11 +133,11 @@ 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);
+        return getInstanceOf(superClass, name, Options.NONE);
     }
 
     private static <S> Optional<S> getInstanceOf(Class<S> superClass, String name,
-        Set<MCRConfigurableInstanceHelper.Option> options) {
+        Set<Option> options) {
         if (MCRConfigurableInstanceHelper.isSingleton(superClass)) {
             return getSingleInstanceOf(superClass, name, options);
         } else {
@@ -153,7 +155,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,11 +169,11 @@ 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);
+        return getSingleInstanceOf(superClass, name, Options.NONE);
     }
 
     private static <S> Optional<S> getSingleInstanceOf(Class<S> superClass, String name,
-        Set<MCRConfigurableInstanceHelper.Option> options) {
+        Set<Option> options) {
         return getString(name)
             .map(className -> new ConfigSingletonKey(name, className))
             .map(key -> (S) instanceHolder.computeIfAbsent(key,
@@ -189,7 +191,7 @@ 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));
     }
 
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/MCRInstanceConfiguration.java b/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java
index f10d9c66ac..d9ed733b44 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/MCRInstanceConfiguration.java
@@ -22,6 +22,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Represents an extract of properties (typically {@link MCRConfiguration2#getPropertiesMap()}) used to
@@ -389,6 +390,9 @@ public Map<String, MCRInstanceConfiguration> nestedConfigurationMap() {
      * @return the nested configuration map
      */
     public Map<String, MCRInstanceConfiguration> nestedConfigurationMap(String commonPrefix) {
+        if (commonPrefix.isEmpty()) {
+            return nestedConfigurationMap();
+        }
         String commonSuffixWithDelimiter = commonPrefix + ".";
         Map<String, MCRInstanceConfiguration> nestedConfigurationMap = new HashMap<>();
         for (Map.Entry<String, String> entry : properties().entrySet()) {
@@ -444,4 +448,28 @@ public String toString() {
             "#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/annotation/MCRProperty.java b/mycore-base/src/main/java/org/mycore/common/config/annotation/MCRProperty.java
index b83716774f..cefb8e1faa 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
@@ -67,7 +67,7 @@
      * @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..18ff6893e9 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,7 +61,7 @@
      * The default property must be absolute, e.g. <code>MCR.Foo.Bar</code>.
      */
     String defaultName() default "";
-    
+
     /**
      * @return The {@link MCRSentinel} for the configured properties.
      */
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/instantiator/MCRInstantiator.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiator.java
new file mode 100644
index 0000000000..683c8adfbc
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiator.java
@@ -0,0 +1,394 @@
+/*
+ * 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.Set;
+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.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.MCRInstanceConfiguration;
+import org.mycore.common.config.MCRInstanceConfiguration.Option;
+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" })
+public final class MCRInstantiator {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private static final ConcurrentMap<Class<?>, MCRClassInfo<?>> INFOS = new ConcurrentHashMap<>();
+
+    public static <S> S getInstance(Class<S> superClass, MCRInstanceConfiguration configuration, Set<Option> options)
+        throws MCRConfigurationException {
+
+        String className = configuration.className();
+        if (className == null) {
+            boolean classIsImplicit = Modifier.isFinal(superClass.getModifiers());
+            boolean useImplicitClass = options.contains(Option.IMPLICIT);
+            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()
+                + ", configured in " + configuration.name().actual() + ", is incompatible with" +
+                " intended super class " + superClass.getName());
+        }
+
+    }
+
+    @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, 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> MCRClassInfo<T> getInfo(Class<T> targetClass) {
+        return (MCRClassInfo<T>) INFOS.computeIfAbsent(targetClass, MCRClassInfo::new);
+    }
+
+    /**
+     * A {@link MCRClassInfo} 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 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 target class
+     * only needs to be gathered once.
+     */
+    private static final class MCRClassInfo<T> {
+
+        private final Class<T> targetClass;
+
+        private final Supplier<T> factory;
+
+        private final List<Injector> injectors;
+
+        private MCRClassInfo(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 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> findInjectors(Class<T> targetClass) {
+            List<Injector> injectors = new LinkedList<>();
+            for (Field field : targetClass.getFields()) {
+                findInjector(new MCRFieldInjectable(field)).ifPresent(injectors::add);
+            }
+            for (Method method : targetClass.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 " + targetClass.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 " + 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(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..d8d749d3cf
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstantiatorUtils.java
@@ -0,0 +1,224 @@
+/*
+ * 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.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+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.MCRInstanceConfiguration;
+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(String property, MCRTarget target, Class<?> valueClass,
+        MCRInstanceConfiguration nestedConfiguration, MCRSentinel sentinel, String description) {
+
+        Set<MCRInstanceConfiguration.Option> options = options(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 sub-properties", description, property);
+                }
+                return null;
+            }
+        }
+
+        String className = nestedConfiguration.className();
+        if (className == null && !implicitValueClass) {
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sub-properties (no class name)",
+                    description, property);
+            }
+            return null;
+        } else if (className != null && className.isBlank()) {
+            if (LOGGER.isInfoEnabled()) {
+                LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sub-properties (empty class name)",
+                    description, property);
+            }
+            return null;
+        }
+
+        Object instance = MCRInstantiator.getInstance(valueClass, nestedConfiguration, options);
+        if (!valueClass.isAssignableFrom(instance.getClass())) {
+            throw incompatibilityException(property, target, valueClass, instance);
+        }
+
+        return instance;
+
+    }
+
+    private static Set<MCRInstanceConfiguration.Option> options(Class<?> valueClass) {
+        if (Modifier.isFinal(valueClass.getModifiers())) {
+            return MCRInstanceConfiguration.Options.IMPLICIT;
+        } else {
+            return MCRInstanceConfiguration.Options.NONE;
+        }
+    }
+
+    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/MCRInstanceListSource.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceListSource.java
new file mode 100644
index 0000000000..2694c4be87
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceListSource.java
@@ -0,0 +1,115 @@
+/*
+ * 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 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.MCRInstanceConfiguration;
+import org.mycore.common.config.annotation.MCRInstanceList;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstantiatorUtils;
+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;
+
+    MCRInstanceListSource(MCRInstanceList annotation) {
+        this.annotation = annotation;
+    }
+
+    @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) {
+
+        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(MCRTarget target, MCRInstanceConfiguration configuration) {
+
+        Map<String, MCRInstanceConfiguration> nestedConfigurationMap =
+            configuration.nestedConfigurationMap(annotation.name());
+
+        Class<?> valueClass = annotation.valueClass();
+        MCRSentinel sentinel = annotation.sentinel();
+
+        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);
+            String property = nestedConfiguration.name().canonical();
+
+            Object instance = MCRInstantiatorUtils.createInstance(property, target, valueClass,
+                nestedConfiguration, sentinel, "instance list element");
+
+            if (instance != null) {
+                instanceList.add(instance);
+            }
+
+        }
+
+        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..e8b538488d
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceMapSource.java
@@ -0,0 +1,110 @@
+/*
+ * 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.property;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.mycore.common.config.MCRInstanceConfiguration;
+import org.mycore.common.config.annotation.MCRInstanceMap;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstantiatorUtils;
+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;
+
+    MCRInstanceMapSource(MCRInstanceMap annotation) {
+        this.annotation = annotation;
+    }
+
+    @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, 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(MCRTarget target, MCRInstanceConfiguration configuration) {
+
+        Map<String, MCRInstanceConfiguration> nestedConfigurationMap =
+            configuration.nestedConfigurationMap(annotation.name());
+
+        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 = MCRInstantiatorUtils.createInstance(property, target, valueClass,
+                nestedConfiguration, sentinel, "instance map entry");
+
+            if (instance != null) {
+                instanceMap.put(key, instance);
+            }
+
+        }
+
+        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..6030fcf01c
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRInstanceSource.java
@@ -0,0 +1,103 @@
+/*
+ * 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 static org.mycore.common.config.instantiator.MCRInstantiatorUtils.property;
+
+import java.util.Set;
+
+import org.mycore.common.config.MCRInstanceConfiguration;
+import org.mycore.common.config.annotation.MCRInstance;
+import org.mycore.common.config.annotation.MCRSentinel;
+import org.mycore.common.config.instantiator.MCRInstantiatorUtils;
+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;
+
+    MCRInstanceSource(MCRInstance annotation) {
+        this.annotation = annotation;
+    }
+
+    @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);
+        }
+
+        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, MCRTarget target, String name) {
+
+        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration(name);
+        String property = nestedConfiguration.name().canonical();
+
+        Class<?> valueClass = annotation.valueClass();
+        MCRSentinel sentinel = annotation.sentinel();
+
+        return MCRInstantiatorUtils.createInstance(property, target, valueClass,
+            nestedConfiguration, sentinel, "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..05f051648c
--- /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.MCRInstanceConfiguration;
+import org.mycore.common.config.annotation.MCRPostConstruction;
+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) {
+        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..87ad24130d
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyListSource.java
@@ -0,0 +1,199 @@
+/*
+ * 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.MCRInstanceConfiguration;
+import org.mycore.common.config.MCRInstanceName;
+import org.mycore.common.config.annotation.MCRPropertyList;
+import org.mycore.common.config.annotation.MCRSentinel;
+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;
+
+    MCRPropertyListSource(MCRPropertyList annotation) {
+        this.annotation = annotation;
+    }
+
+    @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) {
+
+        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,
+        MCRTarget 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 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..a206a06ecc
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRPropertyMapSource.java
@@ -0,0 +1,190 @@
+/*
+ * 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.MCRInstanceConfiguration;
+import org.mycore.common.config.MCRInstanceName;
+import org.mycore.common.config.annotation.MCRPropertyMap;
+import org.mycore.common.config.annotation.MCRSentinel;
+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;
+
+    MCRPropertyMapSource(MCRPropertyMap annotation) {
+        this.annotation = annotation;
+    }
+
+    @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) {
+
+        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 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.enabled()) {
+                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..059ceae8c2
--- /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.MCRInstanceConfiguration;
+import org.mycore.common.config.annotation.MCRProperty;
+import org.mycore.common.config.annotation.MCRSentinel;
+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;
+
+    MCRPropertySource(MCRProperty annotation) {
+        this.annotation = annotation;
+    }
+
+    @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);
+        }
+
+        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 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..3adaaeb5db
--- /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.MCRInstanceConfiguration;
+import org.mycore.common.config.annotation.MCRRawProperties;
+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) {
+        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..f7d19b10f3
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/source/MCRSource.java
@@ -0,0 +1,138 @@
+/*
+ * 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.Function;
+
+import org.mycore.common.config.MCRInstanceConfiguration;
+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.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(AnnotationProvider annotationProvider) {
+            return mapper.toSource(annotationProvider);
+        }
+
+        public interface AnnotationProvider {
+
+            <A extends Annotation> A get(Class<A> annotationClass);
+
+        }
+
+        private enum Group {
+
+            VALUE_INJECTION,
+
+            POST_CONSTRUCTION
+
+        }
+
+        private record Mapper<A extends Annotation>(Class<A> annotationClass, Function<A, MCRSource> factory)
+            implements Serializable {
+
+            @Serial
+            private static final long serialVersionUID = 1L;
+
+            private Optional<MCRSource> toSource(AnnotationProvider annotationProvider) {
+                return Optional.ofNullable(annotationProvider.get(annotationClass())).map(factory);
+            }
+
+        }
+
+    }
+
+}
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..8888397cb8
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRFieldTarget.java
@@ -0,0 +1,66 @@
+/*
+ * 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);
+        }
+    }
+
+}
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..03a97965f6
--- /dev/null
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/target/MCRMethodTarget.java
@@ -0,0 +1,79 @@
+/*
+ * 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);
+        }
+    }
+}
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/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperBasicTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperBasicTest.java
index e6ca3927ce..4f7fdaa243 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperBasicTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperBasicTest.java
@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 import org.mycore.common.MCRTestConfiguration;
 import org.mycore.common.MCRTestProperty;
+import org.mycore.common.config.MCRInstanceConfiguration.Options;
 import org.mycore.common.config.annotation.MCRConfigurationProxy;
 import org.mycore.common.config.annotation.MCRFactory;
 import org.mycore.test.MyCoReTest;
@@ -135,7 +136,7 @@ public void configurationImplicit() {
 
         MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
         ImplicitTestClass instance = MCRConfigurableInstanceHelper.getInstance(ImplicitTestClass.class, configuration,
-            MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES);
+            Options.IMPLICIT);
 
         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/MCRConfigurableInstanceHelperCollectionTest.java
index b01e9f07ec..0438cac905 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperCollectionTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstanceHelperCollectionTest.java
@@ -29,6 +29,7 @@
 import org.junit.jupiter.api.Test;
 import org.mycore.common.MCRTestConfiguration;
 import org.mycore.common.MCRTestProperty;
+import org.mycore.common.config.MCRInstanceConfiguration.Options;
 import org.mycore.common.config.annotation.MCRPropertyList;
 import org.mycore.common.config.annotation.MCRPropertyMap;
 import org.mycore.common.config.annotation.MCRSentinel;
@@ -253,7 +254,7 @@ public void shortFormMapWithoutPrefix() {
         MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Class");
         TestClassWithMapWithoutPrefix instance = MCRConfigurableInstanceHelper
             .getInstance(TestClassWithMapWithoutPrefix.class, configuration,
-                MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES);
+                Options.IMPLICIT);
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -539,7 +540,7 @@ public void shortFormListWithoutPrefix() {
         MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Class");
         TestClassWithListWithoutPrefix instance = MCRConfigurableInstanceHelper
             .getInstance(TestClassWithListWithoutPrefix.class, configuration,
-                MCRConfigurableInstanceHelper.ADD_IMPLICIT_CLASS_PROPERTIES);
+                Options.IMPLICIT);
 
         assertNotNull(instance);
         assertNotNull(instance.list);
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/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);
             }
         }

From 5e1d7d198fc2b243621cde9c1e75cf99b2f94dc7 Mon Sep 17 00:00:00 2001
From: Torsten Krause <krause.torsten@ub.uni-kiel.de>
Date: Tue, 7 Apr 2026 15:44:24 +0200
Subject: [PATCH 2/4] MCR-3668 remove MCRConfigurableInstanceHelper, move
 value-class determination into MCRInstanceConfiguration

---
 .../backend/jpa/MCRJPAConfigurationCheck.java |   2 +-
 .../java/org/mycore/common/MCRClassTools.java |  12 +-
 .../config/MCRConfigurableInstanceHelper.java | 129 ---
 .../common/config/MCRConfiguration2.java      |  78 +-
 .../common/config/MCRConfigurationBase.java   |   5 -
 .../MCRInstanceConfiguration.java             | 327 ++++---
 .../{ => instantiator}/MCRInstanceName.java   |  15 +-
 .../config/instantiator/MCRInstantiator.java  | 134 ++-
 .../instantiator/MCRInstantiatorUtils.java    |  45 +-
 .../source/MCRInstanceListSource.java         |  39 +-
 .../source/MCRInstanceMapSource.java          |  35 +-
 .../source/MCRInstanceSource.java             |  24 +-
 .../source/MCRPostConstructionSource.java     |   4 +-
 .../source/MCRPropertyListSource.java         |  15 +-
 .../source/MCRPropertyMapSource.java          |  16 +-
 .../source/MCRPropertySource.java             |  15 +-
 .../source/MCRRawPropertiesSource.java        |   4 +-
 .../config/instantiator/source/MCRSource.java |   4 +-
 .../instantiator/target/MCRFieldTarget.java   |   5 +
 .../instantiator/target/MCRMethodTarget.java  |   6 +
 .../config/MCRInstanceConfigurationTest.java  | 870 +++++++++++-------
 .../common/config/MCRInstanceNameTest.java    |   1 +
 ...est.java => MCRInstantiatorBasicTest.java} |  50 +-
 ...ava => MCRInstantiatorCollectionTest.java} | 108 +--
 ...st.java => MCRInstantiatorConfigTest.java} |  16 +-
 ...t.java => MCRInstantiatorDefaultTest.java} |  33 +-
 ...a => MCRInstantiatorImplicitListTest.java} |   6 +-
 ...va => MCRInstantiatorImplicitMapTest.java} |   6 +-
 ....java => MCRInstantiatorImplicitTest.java} |   6 +-
 ...st.java => MCRInstantiatorNestedTest.java} | 122 +--
 ...> MCRInstantiatorNonImplicitListTest.java} |   6 +-
 ...=> MCRInstantiatorNonImplicitMapTest.java} |   6 +-
 ...va => MCRInstantiatorNonImplicitTest.java} |   6 +-
 ...a => MCRInstantiatorPropertyListTest.java} |   6 +-
 ...va => MCRInstantiatorPropertyMapTest.java} |   6 +-
 ....java => MCRInstantiatorPropertyTest.java} |   6 +-
 ...est.java => MCRInstantiatorProxyTest.java} |   7 +-
 .../components/user2/config/mycore.properties |   2 +-
 .../hash/MCRPasswordCheckManagerTest.java     |   4 +
 39 files changed, 1058 insertions(+), 1123 deletions(-)
 delete mode 100644 mycore-base/src/main/java/org/mycore/common/config/MCRConfigurableInstanceHelper.java
 rename mycore-base/src/main/java/org/mycore/common/config/{ => instantiator}/MCRInstanceConfiguration.java (61%)
 rename mycore-base/src/main/java/org/mycore/common/config/{ => instantiator}/MCRInstanceName.java (94%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperBasicTest.java => MCRInstantiatorBasicTest.java} (71%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperCollectionTest.java => MCRInstantiatorCollectionTest.java} (77%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperConfigTest.java => MCRInstantiatorConfigTest.java} (97%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperDefaultTest.java => MCRInstantiatorDefaultTest.java} (84%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperImplicitListTest.java => MCRInstantiatorImplicitListTest.java} (98%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperImplicitMapTest.java => MCRInstantiatorImplicitMapTest.java} (98%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperImplicitTest.java => MCRInstantiatorImplicitTest.java} (98%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperNestedTest.java => MCRInstantiatorNestedTest.java} (79%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperNonImplicitListTest.java => MCRInstantiatorNonImplicitListTest.java} (98%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperNonImplicitMapTest.java => MCRInstantiatorNonImplicitMapTest.java} (98%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperNonImplicitTest.java => MCRInstantiatorNonImplicitTest.java} (98%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstancePropertyListTest.java => MCRInstantiatorPropertyListTest.java} (98%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstancePropertyMapTest.java => MCRInstantiatorPropertyMapTest.java} (98%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstancePropertyTest.java => MCRInstantiatorPropertyTest.java} (97%)
 rename mycore-base/src/test/java/org/mycore/common/config/{MCRConfigurableInstanceHelperProxyTest.java => MCRInstantiatorProxyTest.java} (89%)

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/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/config/MCRConfigurableInstanceHelper.java b/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurableInstanceHelper.java
deleted file mode 100644
index e49448ac33..0000000000
--- a/mycore-base/src/main/java/org/mycore/common/config/MCRConfigurableInstanceHelper.java
+++ /dev/null
@@ -1,129 +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.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.mycore.common.config.MCRInstanceConfiguration.Option;
-import org.mycore.common.config.MCRInstanceConfiguration.Options;
-import org.mycore.common.config.instantiator.MCRInstantiator;
-import org.mycore.common.config.instantiator.MCRInstantiatorUtils;
-
-import jakarta.inject.Singleton;
-
-/**
- * Creates Objects which are configured with properties.
- *
- * @author Sebastian Hofmann
- */
-@SuppressWarnings({ "PMD.MCR.Singleton.ClassModifiers", "PMD.MCR.Singleton.PrivateConstructor",
-    "PMD.MCR.Singleton.NonPrivateConstructors", "PMD.MCR.Singleton.MethodModifiers",
-    "PMD.MCR.Singleton.MethodReturnType", "PMD.SingletonClassReturningNewInstance",
-    "PMD.SingleMethodSingleton" })
-public class MCRConfigurableInstanceHelper {
-
-    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(MCRInstantiatorUtils.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, Options.NONE);
-    }
-
-    /**
-     * 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.IMPLICIT)) {
-            return Optional.empty();
-        }
-        return Optional.of(getInstance(superClass, configuration, 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, Options.NONE);
-    }
-
-    /**
-     * 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 MCRInstantiator.getInstance(superClass, configuration, options);
-    }
-
-    public static void clearCache() {
-        CONFIG_CACHE.clear();
-    }
-
-}
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 60179d24a0..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,10 +35,15 @@
 import java.util.stream.Stream;
 
 import org.mycore.common.MCRClassTools;
-import org.mycore.common.config.MCRInstanceConfiguration.Option;
-import org.mycore.common.config.MCRInstanceConfiguration.Options;
+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}.
@@ -83,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<>();
@@ -136,15 +144,6 @@ public static <S> Optional<S> getInstanceOf(Class<S> superClass, String name) th
         return getInstanceOf(superClass, name, Options.NONE);
     }
 
-    private static <S> Optional<S> getInstanceOf(Class<S> superClass, String name,
-        Set<Option> options) {
-        if (MCRConfigurableInstanceHelper.isSingleton(superClass)) {
-            return getSingleInstanceOf(superClass, name, options);
-        } else {
-            return MCRConfigurableInstanceHelper.getInstance(superClass, name, options);
-        }
-    }
-
     /**
      * Returns a new instance of the class specified in the configuration property with the given name.
      *
@@ -172,14 +171,6 @@ public static <S> Optional<S> getSingleInstanceOf(Class<S> superClass, String na
         return getSingleInstanceOf(superClass, name, Options.NONE);
     }
 
-    private static <S> Optional<S> getSingleInstanceOf(Class<S> superClass, String name,
-        Set<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)));
-    }
-
     /**
      * Returns an instance of the class specified in the configuration property with the given name. If the class was
      * previously instantiated by this method, that instance is returned.
@@ -195,13 +186,47 @@ public static <S> S getSingleInstanceOfOrThrow(Class<S> superClass, String name)
             .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);
@@ -427,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) {
@@ -447,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/MCRInstanceConfiguration.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
similarity index 61%
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 d9ed733b44..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,20 +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
@@ -38,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 String className;
+    private final Class<S> superClass;
+
+    private final Class<? extends S> valueClass;
+
+    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 MCRInstanceConfiguration ofName(MCRInstanceName name) {
-        return ofName(name, MCRConfiguration2.getPropertiesMap());
+    public static <T> MCRInstanceConfiguration<T> ofName(Class<T> superClass, String name,
+        Map<String, String> properties) {
+        return ofName(superClass, MCRInstanceName.of(name), properties, Options.NONE);
     }
 
     /**
-     * Creates a new configuration based on the given properties.
+     * 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 <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 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>
@@ -98,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>
@@ -109,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>
@@ -118,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,
@@ -151,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());
-    }
-
-    /**
-     * 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);
+    public Class<S> superClass() {
+        return superClass;
     }
 
-    /**
-     * 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;
     }
@@ -240,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>
@@ -259,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);
     }
 
     /**
@@ -284,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>
@@ -296,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>
@@ -319,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;
@@ -353,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>
@@ -365,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>
@@ -386,64 +434,37 @@ 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) {
-        if (commonPrefix.isEmpty()) {
-            return nestedConfigurationMap();
+    public <N> Map<String, MCRInstanceConfiguration<N>> nestedMap(Class<N> superClass, String prefix) {
+        if (prefix.isEmpty()) {
+            return nestedMap(superClass);
         }
-        String commonSuffixWithDelimiter = commonPrefix + ".";
-        Map<String, MCRInstanceConfiguration> nestedConfigurationMap = new HashMap<>();
+        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() + "}";
     }
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
index 683c8adfbc..06d9120b2a 100644
--- 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
@@ -32,19 +32,13 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 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.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.MCRInstanceConfiguration;
-import org.mycore.common.config.MCRInstanceConfiguration.Option;
 import org.mycore.common.config.annotation.MCRConfigurationProxy;
 import org.mycore.common.config.annotation.MCRFactory;
 import org.mycore.common.config.annotation.MCRInstance;
@@ -67,85 +61,66 @@
 @SuppressWarnings({ "PMD.MCR.Singleton.ClassModifiers", "PMD.MCR.Singleton.PrivateConstructor",
     "PMD.MCR.Singleton.NonPrivateConstructors", "PMD.MCR.Singleton.MethodModifiers",
     "PMD.MCR.Singleton.MethodReturnType", "PMD.SingletonClassReturningNewInstance" })
-public final class MCRInstantiator {
-
-    private static final Logger LOGGER = LogManager.getLogger();
+final class MCRInstantiator {
 
     private static final ConcurrentMap<Class<?>, MCRClassInfo<?>> INFOS = new ConcurrentHashMap<>();
 
-    public static <S> S getInstance(Class<S> superClass, MCRInstanceConfiguration configuration, Set<Option> options)
-        throws MCRConfigurationException {
-
-        String className = configuration.className();
-        if (className == null) {
-            boolean classIsImplicit = Modifier.isFinal(superClass.getModifiers());
-            boolean useImplicitClass = options.contains(Option.IMPLICIT);
-            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)");
+    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)");
         }
 
-        Class<S> targetClass = getClass(configuration.name().actual(), configuration.className());
-        Object instance = createInstanceDirectOrViaProxy(targetClass, configuration);
+        Object instance = createInstanceDirectOrViaProxy(configuration);
 
-        if (superClass.isAssignableFrom(instance.getClass())) {
-            return superClass.cast(instance);
-        } else {
+        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 <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);
-        }
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> T createInstanceDirectOrViaProxy(Class<T> targetClass, MCRInstanceConfiguration configuration) {
-        MCRConfigurationProxy productAnnotation = targetClass.getDeclaredAnnotation(MCRConfigurationProxy.class);
+    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<T>> proxyClass = (Class<Supplier<T>>) productAnnotation.proxyClass();
+            Class<Supplier<? extends S>> proxyClass = (Class<Supplier<? extends S>>) productAnnotation.proxyClass();
             return getInfo(proxyClass).createInstance(configuration).get();
         } else {
-            return getInfo(targetClass).createInstance(configuration);
+            return getInfo(valaueClass).createInstance(configuration);
         }
+
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> MCRClassInfo<T> getInfo(Class<T> targetClass) {
-        return (MCRClassInfo<T>) INFOS.computeIfAbsent(targetClass, MCRClassInfo::new);
+    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 target class.
+     * 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 target class:
+     * This class gathers the following information about the value class:
      * <ul>
      *   <li>
-     *     A {@link Supplier} as a factory for creating instances of the target class.
+     *     A {@link Supplier} as a factory for creating instances of the value class.
      *     That factory is
      *     <ol>
      *       <li>
-     *         preferably the target classes parameterless public constructor or
+     *         preferably the value classes parameterless public constructor or
      *       </li>
      *       <li>
      *         a parameterless public static factory method whose name case-insensitively contains
@@ -156,7 +131,7 @@ private static <T> MCRClassInfo<T> getInfo(Class<T> targetClass) {
      *     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.
+     *     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.
@@ -203,47 +178,47 @@ private static <T> MCRClassInfo<T> getInfo(Class<T> targetClass) {
      *   </li>
      * </ul>
      * <p>
-     * It is intended that instances of this class are cached, such that the information about the target class
+     * 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> targetClass;
+        private final Class<T> valueClass;
 
         private final Supplier<T> factory;
 
         private final List<Injector> injectors;
 
-        private MCRClassInfo(Class<T> targetClass) {
-            this.targetClass = targetClass;
-            this.factory = getFactory(targetClass);
-            this.injectors = findInjectors(targetClass);
+        private MCRClassInfo(Class<T> valueClass) {
+            this.valueClass = valueClass;
+            this.factory = getFactory(valueClass);
+            this.injectors = findInjectors(valueClass);
         }
 
-        private Supplier<T> getFactory(Class<T> targetClass) {
+        private Supplier<T> getFactory(Class<T> valueClass) {
 
-            List<Method> declaredFactoryMethods = findFactoryMethods(targetClass, targetClass.getDeclaredMethods());
+            List<Method> declaredFactoryMethods = findFactoryMethods(valueClass, valueClass.getDeclaredMethods());
             Optional<Supplier<T>> factory = Stream.<Supplier<Optional<Supplier<T>>>>of(
                 () -> findSingletonFactoryMethod(declaredFactoryMethods),
                 () -> findAnnotatedFactoryMethod(declaredFactoryMethods),
-                () -> findDefaultConstructor(targetClass))
+                () -> findDefaultConstructor(valueClass))
                 .map(Supplier::get)
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .findFirst();
 
-            return factory.orElseThrow(() -> new MCRConfigurationException("Class " + targetClass.getName()
+            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> targetClass, Method[] declaredMethods) {
+        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(targetClass))
+                .filter(method -> method.getReturnType().isAssignableFrom(valueClass))
                 .filter(method -> method.getParameterTypes().length == 0)
                 .filter(method -> !method.isVarArgs())
                 .toList();
@@ -256,7 +231,7 @@ private Optional<Supplier<T>> findSingletonFactoryMethod(List<Method> factoryMet
                 .toList();
 
             if (singletonFactoryMethods.size() > 1) {
-                throw new MCRConfigurationException("Class " + targetClass.getName()
+                throw new MCRConfigurationException("Class " + valueClass.getName()
                     + " has multiple singleton factory methods (public, static, matching return type, parameterless,"
                     + " name equals 'getInstance'): " + methodNames(singletonFactoryMethods));
             }
@@ -272,7 +247,7 @@ private Optional<Supplier<T>> findAnnotatedFactoryMethod(List<Method> factoryMet
                 .toList();
 
             if (annotatedFactoryMethods.size() > 1) {
-                throw new MCRConfigurationException("Class " + targetClass.getName()
+                throw new MCRConfigurationException("Class " + valueClass.getName()
                     + " has multiple annotated factory methods (public, static, matching return type, parameterless,"
                     + " annotated with @MCRFactory): " + methodNames(annotatedFactoryMethods));
             }
@@ -281,9 +256,9 @@ private Optional<Supplier<T>> findAnnotatedFactoryMethod(List<Method> factoryMet
 
         }
 
-        private Optional<Supplier<T>> findDefaultConstructor(Class<T> targetClass) {
+        private Optional<Supplier<T>> findDefaultConstructor(Class<T> valueClass) {
             try {
-                return Optional.of(createConstructorFactory(targetClass.getConstructor()));
+                return Optional.of(createConstructorFactory(valueClass.getConstructor()));
             } catch (NoSuchMethodException e) {
                 return Optional.empty();
             }
@@ -312,12 +287,12 @@ private Supplier<T> createConstructorFactory(Constructor<T> constructor) {
             };
         }
 
-        private List<Injector> findInjectors(Class<T> targetClass) {
+        private List<Injector> findInjectors(Class<T> valueClass) {
             List<Injector> injectors = new LinkedList<>();
-            for (Field field : targetClass.getFields()) {
+            for (Field field : valueClass.getFields()) {
                 findInjector(new MCRFieldInjectable(field)).ifPresent(injectors::add);
             }
-            for (Method method : targetClass.getMethods()) {
+            for (Method method : valueClass.getMethods()) {
                 findInjector(new MCRMethodInjectable(method)).ifPresent(injectors::add);
             }
             Collections.sort(injectors);
@@ -339,7 +314,7 @@ private Optional<Injector> findInjector(MCRInjectable injectable) {
             if (sources.size() != 1) {
                 throw new MCRConfigurationException("Target " + targetTypeName(target) + " '"
                     + target.name() + "' has multiple annotations (" + annotationClassNames(sources)
-                    + ") in configured class " + targetClass.getName());
+                    + ") in configured class " + valueClass.getName());
             }
 
             MCRSource source = sources.getFirst();
@@ -347,20 +322,20 @@ private Optional<Injector> findInjector(MCRInjectable injectable) {
             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());
+                    + ") 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 " + targetClass.getName());
+                    + ") in configured class " + valueClass.getName());
             }
 
             return Optional.of(new Injector(source, target));
 
         }
 
-        public T createInstance(MCRInstanceConfiguration configuration) {
+        public T createInstance(MCRInstanceConfiguration<?> configuration) {
             T instance = factory.get();
             for (Injector injector : injectors) {
                 injector.inject(instance, configuration);
@@ -377,11 +352,12 @@ private record Injector(MCRSource source, MCRTarget target) implements Comparabl
             .thenComparingInt(injector -> injector.source.type().order())
             .thenComparingInt(injector -> injector.source.order());
 
-        private void inject(Object instance, MCRInstanceConfiguration configuration) {
+        private void inject(Object instance, MCRInstanceConfiguration<?> configuration) {
             Object value = source.get(configuration, target);
             if (value != null) {
                 target.set(instance, value);
             }
+
         }
 
         @Override
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
index d8d749d3cf..66b2af37b8 100644
--- 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
@@ -19,13 +19,11 @@
 package org.mycore.common.config.instantiator;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
@@ -34,7 +32,6 @@
 import org.apache.logging.log4j.Logger;
 import org.mycore.common.MCRClassTools;
 import org.mycore.common.config.MCRConfigurationException;
-import org.mycore.common.config.MCRInstanceConfiguration;
 import org.mycore.common.config.annotation.MCRSentinel;
 import org.mycore.common.config.instantiator.source.MCRSource;
 import org.mycore.common.config.instantiator.target.MCRTarget;
@@ -59,15 +56,14 @@ public static <T> Class<T> getClass(String property, String className) {
         }
     }
 
-    public static Object createInstance(String property, MCRTarget target, Class<?> valueClass,
-        MCRInstanceConfiguration nestedConfiguration, MCRSentinel sentinel, String description) {
+    public static Object createInstance(MCRTarget target, MCRInstanceConfiguration<?> configuration,
+        MCRSentinel sentinel, String description) {
 
-        Set<MCRInstanceConfiguration.Option> options = options(valueClass);
-        boolean implicitValueClass = Modifier.isFinal(valueClass.getModifiers());
+        String property = configuration.name().canonical();
 
         if (sentinel.enabled()) {
             boolean sentinelValue = sentinel.defaultValue();
-            String configuredSentinelValue = nestedConfiguration.properties().remove(sentinel.name());
+            String configuredSentinelValue = configuration.properties().remove(sentinel.name());
             if (configuredSentinelValue != null) {
                 sentinelValue = Boolean.parseBoolean(configuredSentinelValue);
             }
@@ -79,38 +75,29 @@ public static Object createInstance(String property, MCRTarget target, Class<?>
             }
         }
 
-        String className = nestedConfiguration.className();
-        if (className == null && !implicitValueClass) {
+        Class<?> className = configuration.valueClass();
+        if (className == null) {
             if (LOGGER.isInfoEnabled()) {
-                LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sub-properties (no class name)",
-                    description, property);
+                LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sub-properties (no or empty class name)", description,
+                    property);
             }
             return null;
-        } else if (className != null && className.isBlank()) {
-            if (LOGGER.isInfoEnabled()) {
-                LOGGER.info("[CLEAN-UP] Ignoring {} {} and all sub-properties (empty class name)",
-                    description, property);
-            }
+        }
+
+        if (!configuration.instantiatable()) {
             return null;
         }
 
-        Object instance = MCRInstantiator.getInstance(valueClass, nestedConfiguration, options);
-        if (!valueClass.isAssignableFrom(instance.getClass())) {
-            throw incompatibilityException(property, target, valueClass, instance);
+        Object instance = configuration.instantiate();
+
+        if (!configuration.valueClass().isAssignableFrom(instance.getClass())) {
+            throw incompatibilityException(property, target, configuration.valueClass(), instance);
         }
 
         return instance;
 
     }
 
-    private static Set<MCRInstanceConfiguration.Option> options(Class<?> valueClass) {
-        if (Modifier.isFinal(valueClass.getModifiers())) {
-            return MCRInstanceConfiguration.Options.IMPLICIT;
-        } else {
-            return MCRInstanceConfiguration.Options.NONE;
-        }
-    }
-
     public static String methodNames(List<Method> methods) {
         return methods.stream()
             .map(Method::getName)
@@ -131,7 +118,7 @@ public static String annotationClassName(MCRSource source) {
         return source.annotationClass().getName();
     }
 
-    public static String property(MCRInstanceConfiguration configuration, String annotationName) {
+    public static String property(MCRInstanceConfiguration<?> configuration, String annotationName) {
         if (Objects.equals("", annotationName)) {
             return configuration.name().canonical();
         } else {
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
index 2694c4be87..ad5afeccba 100644
--- 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
@@ -18,6 +18,7 @@
 
 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;
@@ -27,10 +28,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.mycore.common.config.MCRInstanceConfiguration;
 import org.mycore.common.config.annotation.MCRInstanceList;
 import org.mycore.common.config.annotation.MCRSentinel;
-import org.mycore.common.config.instantiator.MCRInstantiatorUtils;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.common.config.instantiator.target.MCRTarget;
 
 /**
@@ -70,42 +70,27 @@ public Class<?> valueClass() {
     }
 
     @Override
-    public List<Object> get(MCRInstanceConfiguration configuration, MCRTarget target) {
+    public List<Object> get(MCRInstanceConfiguration<?> configuration, MCRTarget 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(MCRTarget target, MCRInstanceConfiguration configuration) {
-
-        Map<String, MCRInstanceConfiguration> nestedConfigurationMap =
-            configuration.nestedConfigurationMap(annotation.name());
-
-        Class<?> valueClass = annotation.valueClass();
-        MCRSentinel sentinel = annotation.sentinel();
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurationMap =
+            configuration.nestedMap(annotation.valueClass(), annotation.name());
 
         List<String> keyList = orderedKeys(property(configuration, annotation.name()), target,
             nestedConfigurationMap, "instance list");
 
+        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 = MCRInstantiatorUtils.createInstance(property, target, valueClass,
-                nestedConfiguration, sentinel, "instance list element");
-
+            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
index e8b538488d..40733add81 100644
--- 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
@@ -18,6 +18,7 @@
 
 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;
 
@@ -25,10 +26,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.mycore.common.config.MCRInstanceConfiguration;
 import org.mycore.common.config.annotation.MCRInstanceMap;
 import org.mycore.common.config.annotation.MCRSentinel;
-import org.mycore.common.config.instantiator.MCRInstantiatorUtils;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.common.config.instantiator.target.MCRTarget;
 
 /**
@@ -68,39 +68,24 @@ public Class<?> valueClass() {
     }
 
     @Override
-    public Map<String, Object> get(MCRInstanceConfiguration configuration, MCRTarget target) {
+    public Map<String, Object> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
 
-        Map<String, Object> instanceMap = getInstanceMap(target, configuration);
+        Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurationMap =
+            configuration.nestedMap(annotation.valueClass(), annotation.name());
 
-        if (instanceMap.isEmpty() && annotation.required()) {
-            throw emptyException(property(configuration, annotation.name()), target, "instance map");
-        }
-
-        return instanceMap;
-
-    }
-
-    private Map<String, Object> getInstanceMap(MCRTarget target, MCRInstanceConfiguration configuration) {
-
-        Map<String, MCRInstanceConfiguration> nestedConfigurationMap =
-            configuration.nestedConfigurationMap(annotation.name());
-
-        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 = MCRInstantiatorUtils.createInstance(property, target, valueClass,
-                nestedConfiguration, sentinel, "instance map entry");
-
+            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
index 6030fcf01c..f597f31d14 100644
--- 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
@@ -18,16 +18,16 @@
 
 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.MCRInstanceConfiguration;
 import org.mycore.common.config.annotation.MCRInstance;
 import org.mycore.common.config.annotation.MCRSentinel;
-import org.mycore.common.config.instantiator.MCRInstantiatorUtils;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.common.config.instantiator.target.MCRTarget;
 
 /**
@@ -70,14 +70,17 @@ public Class<?> valueClass() {
     }
 
     @Override
-    public Object get(MCRInstanceConfiguration configuration, MCRTarget target) {
+    public Object get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
 
         String name = annotation.name();
         if (name.isEmpty()) {
             throw emptyNameException(target);
         }
 
-        Object instance = getInstance(configuration, target, name);
+        MCRSentinel sentinel = annotation.sentinel();
+
+        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");
@@ -87,17 +90,4 @@ public Object get(MCRInstanceConfiguration configuration, MCRTarget target) {
 
     }
 
-    private Object getInstance(MCRInstanceConfiguration configuration, MCRTarget target, String name) {
-
-        MCRInstanceConfiguration nestedConfiguration = configuration.nestedConfiguration(name);
-        String property = nestedConfiguration.name().canonical();
-
-        Class<?> valueClass = annotation.valueClass();
-        MCRSentinel sentinel = annotation.sentinel();
-
-        return MCRInstantiatorUtils.createInstance(property, target, valueClass,
-            nestedConfiguration, sentinel, "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
index 05f051648c..aa068a04bb 100644
--- 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
@@ -20,8 +20,8 @@
 
 import java.util.Set;
 
-import org.mycore.common.config.MCRInstanceConfiguration;
 import org.mycore.common.config.annotation.MCRPostConstruction;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.common.config.instantiator.target.MCRTarget;
 
 /**
@@ -61,7 +61,7 @@ public Class<?> valueClass() {
     }
 
     @Override
-    public String get(MCRInstanceConfiguration configuration, MCRTarget target) {
+    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
index 87ad24130d..8f87dc6b4b 100644
--- 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
@@ -31,10 +31,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.mycore.common.config.MCRConfiguration2;
-import org.mycore.common.config.MCRInstanceConfiguration;
-import org.mycore.common.config.MCRInstanceName;
 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;
 
 /**
@@ -76,7 +76,9 @@ public Class<?> valueClass() {
     }
 
     @Override
-    public List<String> get(MCRInstanceConfiguration configuration, MCRTarget target) {
+    public List<String> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        Map<String, String> fullProperties = configuration.fullProperties();
 
         String property;
         String description;
@@ -84,7 +86,7 @@ public List<String> get(MCRInstanceConfiguration configuration, MCRTarget target
         if (annotation.absolute()) {
             property = annotation.name();
             description = "absolute property list";
-            Map<String, String> properties = configuration.fullProperties();
+            Map<String, String> properties = fullProperties;
             propertyList = getPropertyList(property, annotation.name(), ".", target, properties, description);
         } else {
             Map<String, String> properties = configuration.properties();
@@ -93,7 +95,7 @@ public List<String> get(MCRInstanceConfiguration configuration, MCRTarget target
                 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));
+                    properties.put("", fullProperties.get(property));
                 }
                 propertyList = getPropertyList(property, "", "", target, properties, description);
             } else {
@@ -108,8 +110,7 @@ public List<String> get(MCRInstanceConfiguration configuration, MCRTarget target
 
             property = defaultName;
             description = "default property list";
-            propertyList = getPropertyList(defaultName, defaultName, ".",
-                target, configuration.fullProperties(), description);
+            propertyList = getPropertyList(defaultName, defaultName, ".", target, fullProperties, description);
 
             if (propertyList == null || (propertyList.isEmpty() && annotation.required())) {
                 throw emptyException(property, target, description);
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
index a206a06ecc..b59bc01be0 100644
--- 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
@@ -29,10 +29,10 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.mycore.common.config.MCRConfiguration2;
-import org.mycore.common.config.MCRInstanceConfiguration;
-import org.mycore.common.config.MCRInstanceName;
 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;
 
 /**
@@ -74,7 +74,9 @@ public Class<?> valueClass() {
     }
 
     @Override
-    public Map<String, String> get(MCRInstanceConfiguration configuration, MCRTarget target) {
+    public Map<String, String> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
+
+        Map<String, String> fullProperties = configuration.fullProperties();
 
         String property;
         String description;
@@ -82,7 +84,7 @@ public Map<String, String> get(MCRInstanceConfiguration configuration, MCRTarget
         if (annotation.absolute()) {
             property = annotation.name();
             description = "absolute property map";
-            Map<String, String> properties = configuration.fullProperties();
+            Map<String, String> properties = fullProperties;
             propertyMap = getPropertyMap(property, annotation.name(), ".", properties, description);
         } else {
             Map<String, String> properties = configuration.properties();
@@ -91,9 +93,8 @@ public Map<String, String> get(MCRInstanceConfiguration configuration, MCRTarget
                 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));
+                    properties.put("", fullProperties.get(property));
                 }
-
                 propertyMap = getPropertyMap(property, "", "", properties, description);
             } else {
                 property = configuration.name().canonical() + "." + annotation.name();
@@ -107,8 +108,7 @@ public Map<String, String> get(MCRInstanceConfiguration configuration, MCRTarget
 
             property = defaultName;
             description = "default property map";
-            propertyMap = getPropertyMap(defaultName, defaultName, ".",
-                configuration.fullProperties(), description);
+            propertyMap = getPropertyMap(defaultName, defaultName, ".", fullProperties, description);
 
             if (propertyMap == null || (propertyMap.isEmpty() && annotation.required())) {
                 throw emptyException(property, target, description);
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
index 059ceae8c2..d8fd79c255 100644
--- 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
@@ -26,9 +26,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.mycore.common.config.MCRInstanceConfiguration;
 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;
 
 /**
@@ -70,26 +70,26 @@ public Class<?> valueClass() {
     }
 
     @Override
-    public String get(MCRInstanceConfiguration configuration, MCRTarget target) {
+    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(),
-                configuration.fullProperties(), description);
+            propertyValue = getPropertyValue(property, annotation.name(), fullProperties, description);
         } else {
             property = configuration.name().canonical() + "." + annotation.name();
             description = "property";
-            propertyValue = getPropertyValue(property, annotation.name(),
-                configuration.properties(), description);
+            propertyValue = getPropertyValue(property, annotation.name(), configuration.properties(), description);
         }
 
         String defaultName = annotation.defaultName();
@@ -97,8 +97,7 @@ public String get(MCRInstanceConfiguration configuration, MCRTarget target) {
 
             property = defaultName;
             description = "default property";
-            propertyValue = getPropertyValue(defaultName, defaultName,
-                configuration.fullProperties(), description);
+            propertyValue = getPropertyValue(defaultName, defaultName, fullProperties, description);
 
             if (propertyValue == null) {
                 throw missingException(property, target, description);
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
index 3adaaeb5db..a082764865 100644
--- 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
@@ -25,8 +25,8 @@
 import java.util.Set;
 
 import org.mycore.common.config.MCRConfigurationException;
-import org.mycore.common.config.MCRInstanceConfiguration;
 import org.mycore.common.config.annotation.MCRRawProperties;
+import org.mycore.common.config.instantiator.MCRInstanceConfiguration;
 import org.mycore.common.config.instantiator.target.MCRTarget;
 
 /**
@@ -76,7 +76,7 @@ public Class<?> valueClass() {
     }
 
     @Override
-    public Map<String, String> get(MCRInstanceConfiguration configuration, MCRTarget target) {
+    public Map<String, String> get(MCRInstanceConfiguration<?> configuration, MCRTarget target) {
 
         Map<String, String> properties =
             annotation.absolute() ? configuration.fullProperties() : configuration.properties();
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
index f7d19b10f3..4f46ff70ad 100644
--- 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
@@ -27,7 +27,6 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import org.mycore.common.config.MCRInstanceConfiguration;
 import org.mycore.common.config.annotation.MCRInstance;
 import org.mycore.common.config.annotation.MCRInstanceList;
 import org.mycore.common.config.annotation.MCRInstanceMap;
@@ -36,6 +35,7 @@
 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;
 
 /**
@@ -55,7 +55,7 @@ public sealed interface MCRSource permits MCRInstanceListSource, MCRInstanceMapS
 
     Class<?> valueClass();
 
-    Object get(MCRInstanceConfiguration configuration, MCRTarget target);
+    Object get(MCRInstanceConfiguration<?> configuration, MCRTarget target);
 
     enum Type {
 
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
index 8888397cb8..b4eae9f3c2 100644
--- 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
@@ -63,4 +63,9 @@ public void set(Object instance, Object value) {
         }
     }
 
+    @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
index 03a97965f6..c4460a9390 100644
--- 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
@@ -76,4 +76,10 @@ public void set(Object instance, Object value) {
                 + method.getDeclaringClass().getName(), e);
         }
     }
+
+    @Override
+    public String toString() {
+        return method.getDeclaringClass().getSimpleName() + "#" + method.getName() + "()";
+    }
+
 }
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 4f7fdaa243..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,19 +20,20 @@
 
 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;
 
 import org.junit.jupiter.api.Test;
 import org.mycore.common.MCRTestConfiguration;
 import org.mycore.common.MCRTestProperty;
-import org.mycore.common.config.MCRInstanceConfiguration.Options;
 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(
@@ -41,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);
 
@@ -56,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);
 
@@ -71,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());
 
     }
 
@@ -87,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);
 
@@ -102,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());
 
     }
 
@@ -118,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());
 
     }
 
@@ -134,9 +117,8 @@ public void multipleFactories() {
         })
     public void configurationImplicit() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo");
-        ImplicitTestClass instance = MCRConfigurableInstanceHelper.getInstance(ImplicitTestClass.class, configuration,
-            Options.IMPLICIT);
+        ImplicitTestClass instance = ofName(ImplicitTestClass.class, "Foo",
+            MCRInstanceConfiguration.Options.IMPLICIT).instantiate();
 
         assertNotNull(instance);
 
@@ -150,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 77%
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 0438cac905..35e9306a6e 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;
@@ -29,14 +30,15 @@
 import org.junit.jupiter.api.Test;
 import org.mycore.common.MCRTestConfiguration;
 import org.mycore.common.MCRTestProperty;
-import org.mycore.common.config.MCRInstanceConfiguration.Options;
 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(
@@ -47,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);
@@ -72,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());
 
     }
 
@@ -90,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);
@@ -115,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);
@@ -137,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);
@@ -162,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);
@@ -190,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);
@@ -218,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);
@@ -251,10 +235,8 @@ public void mixedFormMapWithPrefix() {
         })
     public void shortFormMapWithoutPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Class");
-        TestClassWithMapWithoutPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithMapWithoutPrefix.class, configuration,
-                Options.IMPLICIT);
+        TestClassWithMapWithoutPrefix instance = ofName(TestClassWithMapWithoutPrefix.class, "Foo.Class",
+            Options.IMPLICIT).instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -280,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);
@@ -310,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);
@@ -335,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);
@@ -360,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());
 
     }
 
@@ -378,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);
@@ -403,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);
@@ -426,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);
@@ -448,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);
@@ -476,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);
@@ -504,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);
@@ -537,10 +498,8 @@ public void mixedFormListWithPrefix() {
         })
     public void shortFormListWithoutPrefix() {
 
-        MCRInstanceConfiguration configuration = MCRInstanceConfiguration.ofName("Foo.Class");
-        TestClassWithListWithoutPrefix instance = MCRConfigurableInstanceHelper
-            .getInstance(TestClassWithListWithoutPrefix.class, configuration,
-                Options.IMPLICIT);
+        TestClassWithListWithoutPrefix instance = ofName(TestClassWithListWithoutPrefix.class, "Foo.Class",
+            Options.IMPLICIT).instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -566,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);
@@ -596,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);
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 98%
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..e0dffde868 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;
         }
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 98%
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..5ad287e569 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;
         }
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 98%
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..d9ca393691 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;
         }
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 79%
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..b923c4d02e 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);
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 98%
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..d8ba01b289 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;
         }
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 98%
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..88837c2a5b 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;
         }
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 98%
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..c4b171b108 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;
         }
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-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"));
 
     }

From 9ddd33dfcc2a73cdddd98c02645b359c7fee2c98 Mon Sep 17 00:00:00 2001
From: Torsten Krause <krause.torsten@ub.uni-kiel.de>
Date: Wed, 1 Apr 2026 12:48:28 +0200
Subject: [PATCH 3/4] MCR-3669 do not remove empty names when non-empty suffix
 is used

---
 .../MCRInstanceConfiguration.java             |  18 +--
 .../config/instantiator/MCRInstanceName.java  |   7 +-
 .../source/MCRPropertyListSource.java         |   8 +-
 .../source/MCRPropertyMapSource.java          |   8 +-
 .../config/MCRInstanceConfigurationTest.java  | 122 +++++++++---------
 5 files changed, 80 insertions(+), 83 deletions(-)

diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
index 2036fb0557..469e03656c 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
@@ -233,22 +233,24 @@ private static <S> Class<? extends S> getValueClass(Class<S> superClass, MCRInst
     private static Map<String, String> reduceProperties(MCRInstanceName name, String prefix,
         Map<String, String> properties) {
 
-        final String prefixWithDot = prefix + '.';
-        final int prefixWithDotLength = prefixWithDot.length();
+        final String prefixWithDelimiter = prefix + '.';
+        final int prefixWithDelimiterLength = prefixWithDelimiter.length();
         final List<String> ignoredKeys = name.ignoredKeys();
 
         Map<String, String> reducedProperties = new HashMap<>();
         for (Map.Entry<String, String> entry : properties.entrySet()) {
             String key = entry.getKey();
-            if (!key.startsWith(prefixWithDot)) {
+            if (!key.startsWith(prefixWithDelimiter)) {
                 continue;
             }
-            String reducedKey = key.substring(prefixWithDotLength);
-            if (!ignoredKeys.contains(reducedKey)) {
-                reducedProperties.put(reducedKey, entry.getValue());
-            }
+            String reducedKey = key.substring(prefixWithDelimiterLength);
+            reducedProperties.put(reducedKey, entry.getValue());
         }
-
+        String directProperty = properties.get(prefix);
+        if (directProperty != null) {
+            reducedProperties.put("", directProperty);
+        }
+        name.ignoredKeys().forEach(reducedProperties::remove);
         return reducedProperties;
     }
 
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceName.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceName.java
index 2e85025acb..783c331c70 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceName.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceName.java
@@ -19,7 +19,6 @@
 package org.mycore.common.config.instantiator;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -107,11 +106,11 @@ public String toString() {
 
     public enum Suffix {
 
-        NONE(null, Collections.emptyList()),
+        NONE(null, List.of("")),
 
-        UPPER_CASE("Class", Arrays.asList("Class", "class")),
+        UPPER_CASE("Class", List.of("Class", "class")),
 
-        LOWER_CASE("class", Arrays.asList("Class", "class"));
+        LOWER_CASE("class", List.of("Class", "class"));
 
         private static final Suffix[] REPRESENTED_VALUES = Arrays.stream(values())
             .filter(suffix -> suffix.representation != null)
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
index 8f87dc6b4b..1402a7d7c4 100644
--- 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
@@ -34,7 +34,6 @@
 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;
 
 /**
@@ -89,18 +88,15 @@ public List<String> get(MCRInstanceConfiguration<?> configuration, MCRTarget tar
             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));
-                }
+                Map<String, String> properties = configuration.properties();
                 propertyList = getPropertyList(property, "", "", target, properties, description);
             } else {
                 property = configuration.name().canonical() + "." + annotation.name();
                 description = "property list";
+                Map<String, String> properties = configuration.properties();
                 propertyList = getPropertyList(property, annotation.name(), ".", target, properties, description);
             }
         }
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
index b59bc01be0..106aefb8ce 100644
--- 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
@@ -32,7 +32,6 @@
 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;
 
 /**
@@ -87,18 +86,15 @@ public Map<String, String> get(MCRInstanceConfiguration<?> configuration, MCRTar
             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));
-                }
+                Map<String, String> properties = configuration.properties();
                 propertyMap = getPropertyMap(property, "", "", properties, description);
             } else {
                 property = configuration.name().canonical() + "." + annotation.name();
                 description = "property map";
+                Map<String, String> properties = configuration.properties();
                 propertyMap = getPropertyMap(property, annotation.name(), ".", properties, description);
             }
         }
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 14c36feebe..e48fe2343a 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
@@ -124,7 +124,7 @@ public void configurationWithUpperCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void configurationWithUpperCaseSuffixRemovesClassEntries() {
+    public void configurationWithUpperCaseSuffixRemovesLowerCaseClassEntry() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Foo.Bar.Class", TEST_CLASS);
@@ -133,10 +133,10 @@ public void configurationWithUpperCaseSuffixRemovesClassEntries() {
 
         MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
 
-        assertFalse(configuration.properties().containsKey(""));
+        assertEquals("ClassValue", configuration.properties().get(""));
         assertFalse(configuration.properties().containsKey("Class"));
         assertFalse(configuration.properties().containsKey("class"));
-        assertEquals(0, configuration.properties().size());
+        assertEquals(1, configuration.properties().size());
 
     }
 
@@ -172,7 +172,7 @@ public void configurationWithLowerCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void configurationWithLowerCaseSuffixRemovesClassEntries() {
+    public void configurationWithLowerCaseSuffixRemovesUpperCaseClassEntry() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Foo.Bar.class", TEST_CLASS);
@@ -181,10 +181,10 @@ public void configurationWithLowerCaseSuffixRemovesClassEntries() {
 
         MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
 
-        assertFalse(configuration.properties().containsKey(""));
+        assertEquals("ClassValue", configuration.properties().get(""));
         assertFalse(configuration.properties().containsKey("Class"));
         assertFalse(configuration.properties().containsKey("class"));
-        assertEquals(0, configuration.properties().size());
+        assertEquals(1, configuration.properties().size());
 
     }
 
@@ -278,7 +278,7 @@ public void nestedConfigurationWithUpperCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedConfigurationWithUpperCaseSuffixRemovesClassEntries() {
+    public void nestedConfigurationWithUpperCaseSuffixRemovesLowerCaseClassEntry() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Foo.Bar.Class", TEST_CLASS);
@@ -289,10 +289,10 @@ public void nestedConfigurationWithUpperCaseSuffixRemovesClassEntries() {
         MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.Class", properties);
         MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
-        assertFalse(nestedConfiguration.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfiguration.properties().get(""));
         assertFalse(nestedConfiguration.properties().containsKey("Class"));
         assertFalse(nestedConfiguration.properties().containsKey("class"));
-        assertEquals(0, nestedConfiguration.properties().size());
+        assertEquals(1, nestedConfiguration.properties().size());
 
     }
 
@@ -332,7 +332,7 @@ public void nestedConfigurationWithLowerCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedConfigurationWithLowerCaseSuffixRemovesClassEntries() {
+    public void nestedConfigurationWithLowerCaseSuffixRemovesUpperCaseClassEntry() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Foo.Bar.class", TEST_CLASS);
@@ -343,10 +343,10 @@ public void nestedConfigurationWithLowerCaseSuffixRemovesClassEntries() {
         MCRInstanceConfiguration<?> configuration = ofName(Object.class, "Foo.Bar.class", properties);
         MCRInstanceConfiguration<?> nestedConfiguration = configuration.nested(Object.class, "Baz");
 
-        assertFalse(nestedConfiguration.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfiguration.properties().get(""));
         assertFalse(nestedConfiguration.properties().containsKey("Class"));
         assertFalse(nestedConfiguration.properties().containsKey("class"));
-        assertEquals(0, nestedConfiguration.properties().size());
+        assertEquals(1, nestedConfiguration.properties().size());
 
     }
 
@@ -528,7 +528,7 @@ public void nestedMapWithUpperCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedMapWithUpperCaseSuffixRemovesClassEntries() {
+    public void nestedMapWithUpperCaseSuffixRemovesLowerCaseClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Foo.Bar.Class", TEST_CLASS);
@@ -549,20 +549,20 @@ public void nestedMapWithUpperCaseSuffixRemovesClassEntries() {
         MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
-        assertFalse(nestedConfigurationA.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get(""));
         assertFalse(nestedConfigurationA.properties().containsKey("Class"));
         assertFalse(nestedConfigurationA.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationA.properties().size());
+        assertEquals(1, nestedConfigurationA.properties().size());
 
-        assertFalse(nestedConfigurationB.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get(""));
         assertFalse(nestedConfigurationB.properties().containsKey("Class"));
         assertFalse(nestedConfigurationB.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationB.properties().size());
+        assertEquals(1, nestedConfigurationB.properties().size());
 
-        assertFalse(nestedConfigurationC.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get(""));
         assertFalse(nestedConfigurationC.properties().containsKey("Class"));
         assertFalse(nestedConfigurationC.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationC.properties().size());
+        assertEquals(1, nestedConfigurationC.properties().size());
 
     }
 
@@ -636,7 +636,7 @@ public void nestedMapWithLowerCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedMapWithLowerCaseSuffixRemovesClassEntries() {
+    public void nestedMapWithLowerCaseSuffixRemovesUpperCaseClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Foo.Bar.class", TEST_CLASS);
@@ -648,6 +648,7 @@ public void nestedMapWithLowerCaseSuffixRemovesClassEntries() {
         properties.put("Foo.Bar.B", "ClassValue");
         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 = ofName(Object.class, "Foo.Bar.class", properties);
         Map<String, ? extends MCRInstanceConfiguration<?>> nestedConfigurations = configuration.nestedMap(Object.class);
@@ -656,20 +657,20 @@ public void nestedMapWithLowerCaseSuffixRemovesClassEntries() {
         MCRInstanceConfiguration<?> nestedConfigurationC = nestedConfigurations.get("C");
         assertEquals(3, nestedConfigurations.size());
 
-        assertFalse(nestedConfigurationA.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get(""));
         assertFalse(nestedConfigurationA.properties().containsKey("Class"));
         assertFalse(nestedConfigurationA.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationA.properties().size());
+        assertEquals(1, nestedConfigurationA.properties().size());
 
-        assertFalse(nestedConfigurationB.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get(""));
         assertFalse(nestedConfigurationB.properties().containsKey("Class"));
         assertFalse(nestedConfigurationB.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationB.properties().size());
+        assertEquals(1, nestedConfigurationB.properties().size());
 
-        assertFalse(nestedConfigurationC.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get(""));
         assertFalse(nestedConfigurationC.properties().containsKey("Class"));
         assertFalse(nestedConfigurationC.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationC.properties().size());
+        assertEquals(1, nestedConfigurationC.properties().size());
 
     }
 
@@ -881,7 +882,7 @@ public void nestedMapWithPrefixWithUpperCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedMapWithPrefixWithUpperCaseSuffixRemovesClassEntries() {
+    public void nestedMapWithPrefixWithUpperCaseSuffixRemovesLowerCaseClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Foo.Bar.Class", TEST_CLASS);
@@ -908,20 +909,20 @@ public void nestedMapWithPrefixWithUpperCaseSuffixRemovesClassEntries() {
 
         assertEquals(3, nestedConfigurations.size());
 
-        assertFalse(nestedConfigurationA.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get(""));
         assertFalse(nestedConfigurationA.properties().containsKey("Class"));
         assertFalse(nestedConfigurationA.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationA.properties().size());
+        assertEquals(1, nestedConfigurationA.properties().size());
 
-        assertFalse(nestedConfigurationB.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get(""));
         assertFalse(nestedConfigurationB.properties().containsKey("Class"));
         assertFalse(nestedConfigurationB.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationB.properties().size());
+        assertEquals(1, nestedConfigurationB.properties().size());
 
-        assertFalse(nestedConfigurationC.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get(""));
         assertFalse(nestedConfigurationC.properties().containsKey("Class"));
         assertFalse(nestedConfigurationC.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationC.properties().size());
+        assertEquals(1, nestedConfigurationC.properties().size());
 
     }
 
@@ -1007,7 +1008,7 @@ public void nestedMapWithPrefixWithLowerCaseSuffixMovesEntries() {
     }
 
     @Test
-    public void nestedMapWithPrefixWithLowerCaseSuffixRemovesClassEntries() {
+    public void nestedMapWithPrefixWithLowerCaseSuffixRemovesUpperCaseClassEntry() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Foo.Bar.class", TEST_CLASS);
@@ -1034,20 +1035,20 @@ public void nestedMapWithPrefixWithLowerCaseSuffixRemovesClassEntries() {
 
         assertEquals(3, nestedConfigurations.size());
 
-        assertFalse(nestedConfigurationA.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get(""));
         assertFalse(nestedConfigurationA.properties().containsKey("Class"));
         assertFalse(nestedConfigurationA.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationA.properties().size());
+        assertEquals(1, nestedConfigurationA.properties().size());
 
-        assertFalse(nestedConfigurationB.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get(""));
         assertFalse(nestedConfigurationB.properties().containsKey("Class"));
         assertFalse(nestedConfigurationB.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationB.properties().size());
+        assertEquals(1, nestedConfigurationB.properties().size());
 
-        assertFalse(nestedConfigurationC.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get(""));
         assertFalse(nestedConfigurationC.properties().containsKey("Class"));
         assertFalse(nestedConfigurationC.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationC.properties().size());
+        assertEquals(1, nestedConfigurationC.properties().size());
 
     }
 
@@ -1067,19 +1068,22 @@ public void directConfiguration() {
     }
 
     @Test
-    public void directConfigurationRemovesClassEntries() {
+    public void directConfigurationWithUpperCaseSuffixRemovesLowerCaseClassEntry() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Class", "ClassValue");
         properties.put("class", "ClassValue");
+        properties.put("", "ClassValue");
 
         MCRInstanceConfiguration<?> configuration =
             ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
 
-        assertFalse(configuration.properties().containsKey(""));
+        System.out.println(" ---- " + configuration.properties());
+        
+        assertEquals("ClassValue", configuration.properties().get(""));
         assertFalse(configuration.properties().containsKey("Class"));
         assertFalse(configuration.properties().containsKey("class"));
-        assertEquals(0, configuration.properties().size());
+        assertEquals(1, configuration.properties().size());
 
     }
 
@@ -1140,7 +1144,7 @@ public void nestedDirectConfigurationMap() {
     }
 
     @Test
-    public void nestedDirectConfigurationMapRemovesClassEntries() {
+    public void nestedDirectConfigurationMapWithUpperCaseSuffixRemovesLowerCaseClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("A.Class", NESTED_TEST_CLASS_A);
@@ -1166,25 +1170,25 @@ public void nestedDirectConfigurationMapRemovesClassEntries() {
 
         assertEquals(3, nestedConfigurations.size());
 
-        assertFalse(nestedConfigurationA.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get(""));
         assertFalse(nestedConfigurationA.properties().containsKey("Class"));
         assertFalse(nestedConfigurationA.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationA.properties().size());
+        assertEquals(1, nestedConfigurationA.properties().size());
 
-        assertFalse(nestedConfigurationB.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get(""));
         assertFalse(nestedConfigurationB.properties().containsKey("Class"));
         assertFalse(nestedConfigurationB.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationB.properties().size());
+        assertEquals(1, nestedConfigurationB.properties().size());
 
-        assertFalse(nestedConfigurationC.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get(""));
         assertFalse(nestedConfigurationC.properties().containsKey("Class"));
         assertFalse(nestedConfigurationC.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationC.properties().size());
+        assertEquals(1, nestedConfigurationC.properties().size());
 
     }
 
     @Test
-    public void nestedDirectConfigurationMapKeepsClassEntries() {
+    public void nestedDirectConfigurationMapWithoutSuffixKeepsClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("A", NESTED_TEST_CLASS_A);
@@ -1266,7 +1270,7 @@ public void nestedDirectConfigurationMapWithPrefix() {
     }
 
     @Test
-    public void nestedDirectConfigurationMapWithPrefixRemovesClassEntries() {
+    public void nestedDirectConfigurationMapWithUpperCasePrefixRemovesLowerCaseClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Baz.A.Class", NESTED_TEST_CLASS_A);
@@ -1292,25 +1296,25 @@ public void nestedDirectConfigurationMapWithPrefixRemovesClassEntries() {
 
         assertEquals(3, nestedConfigurations.size());
 
-        assertFalse(nestedConfigurationA.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationA.properties().get(""));
         assertFalse(nestedConfigurationA.properties().containsKey("Class"));
         assertFalse(nestedConfigurationA.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationA.properties().size());
+        assertEquals(1, nestedConfigurationA.properties().size());
 
-        assertFalse(nestedConfigurationB.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationB.properties().get(""));
         assertFalse(nestedConfigurationB.properties().containsKey("Class"));
         assertFalse(nestedConfigurationB.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationB.properties().size());
+        assertEquals(1, nestedConfigurationB.properties().size());
 
-        assertFalse(nestedConfigurationC.properties().containsKey(""));
+        assertEquals("ClassValue", nestedConfigurationC.properties().get(""));
         assertFalse(nestedConfigurationC.properties().containsKey("Class"));
         assertFalse(nestedConfigurationC.properties().containsKey("class"));
-        assertEquals(0, nestedConfigurationC.properties().size());
+        assertEquals(1, nestedConfigurationC.properties().size());
 
     }
 
     @Test
-    public void nestedDirectConfigurationMapWithPrefixKeepsClassEntries() {
+    public void nestedDirectConfigurationMapWithoutPrefixKeepsLowerCaseClassEntries() {
 
         Map<String, String> properties = new HashMap<>();
         properties.put("Baz.A", NESTED_TEST_CLASS_A);

From a2468d53a3e56dc2411fe0d54635de462795e2f0 Mon Sep 17 00:00:00 2001
From: Torsten Krause <krause.torsten@ub.uni-kiel.de>
Date: Wed, 1 Apr 2026 16:48:16 +0200
Subject: [PATCH 4/4] MCR-3670 depcreate instance name suffixes other than
 UPPER_CASE

---
 .../acl/config/deprecated.properties          |   1 +
 .../components/acl/config/mycore.properties   |   2 +-
 .../facts/MCRFactsAccessSystemHelper.java     |   3 +-
 .../access/facts/model/MCRCondition.java      |   4 +-
 .../mycore/access/mcrimpl/MCRRuleParser.java  |   2 +-
 .../MCRInstanceConfiguration.java             |   7 +
 .../mycore/common/xml/MCRLayoutService.java   |   2 +-
 .../org/mycore/common/xml/MCRURIResolver.java |   2 +-
 .../org/mycore/crypt/MCRCipherManager.java    |   4 +-
 .../classifications2/MCRCategLinkService.java |   3 +-
 .../MCRCategLinkServiceFactory.java           |   3 +-
 .../classifications2/MCRCategoryDAO.java      |   2 +-
 .../MCRCategoryDAOFactory.java                |   2 +-
 .../jersey/MCRJerseyResourceConfig.java       |   4 +-
 .../resources/config/deprecated.properties    |   9 +
 .../main/resources/config/mycore.properties   |  46 ++---
 .../common/config/MCRConfigurationTest.java   |   3 +
 .../config/MCRInstanceConfigurationTest.java  |   2 -
 .../config/MCRInstantiatorBasicTest.java      |  36 ++--
 .../config/MCRInstantiatorCollectionTest.java | 100 ++++++----
 .../config/MCRInstantiatorConfigTest.java     |  91 +++++----
 .../config/MCRInstantiatorDefaultTest.java    |  51 ++---
 .../config/MCRInstantiatorNestedTest.java     | 186 ++++++++++--------
 .../config/MCRInstantiatorProxyTest.java      |   5 +-
 .../servlets/MCRClassificationBrowser2.java   |   2 +-
 .../json/GsonSerializationTest.java           |   2 +-
 .../classeditor/json/MCRCategoryJsonTest.java |   2 +-
 .../MCRClassificationEditorResourceTest.java  |   4 +-
 .../cronjob/config/deprecated.properties      |   1 +
 .../org/mycore/csl/MCRCSLTransformer.java     |   2 +-
 .../csl/config/deprecated.properties          |   1 +
 .../components/csl/config/mycore.properties   |   4 +-
 .../fo/common/fo/MCRFoFormatterHelper.java    |   4 +-
 .../fo/config/deprecated.properties           |   1 +
 .../components/fo/config/mycore.properties    |   4 +-
 .../iiif/image/impl/MCRIIIFImageImpl.java     |   2 +-
 .../iview2/frontend/MCRTileServlet.java       |   2 +-
 .../mycore/iview2/services/MCRImageTiler.java |   2 +-
 .../iview2/services/MCRTilingAction.java      |   2 +-
 .../iview2/config/deprecated.properties       |   4 +
 .../iview2/config/mycore.properties           |   8 +-
 .../jobqueue/config/mycore.properties         |   4 +-
 .../jsessions/config/mycore.properties        |   2 +-
 .../mets/model/MCRMETSGeneratorFactory.java   |  35 +---
 .../mets/config/deprecated.properties         |   2 +
 .../components/mets/config/mycore.properties  |   4 +-
 .../model/MCRMETSGeneratorFactoryTest.java    |   4 +-
 .../migration/cli/MCRMigrationCommands.java   |   2 +-
 ...CRMODSXMappingClassificationGenerator.java |   2 +-
 .../mycore/mods/merger/MCRMergerFactory.java  |   8 +-
 .../mods/config/deprecated.properties         |   2 +
 .../components/mods/config/mycore.properties  |  82 ++++----
 .../src/test/resources/mycore.properties      |   2 +-
 .../neo4jparser/MCRNeo4JMetaXMLParser.java    |   2 +-
 .../metadata/neo4jparser/MCRNeo4JParser.java  |   4 +-
 .../metadata/neo4jutil/MCRNeo4JUtil.java      |   8 +-
 .../neo4j/config/deprecated.properties        |   2 +
 .../components/neo4j/config/mycore.properties |  18 +-
 .../mcr/neo4j/parser/MCRNeo4JParserTest.java  |   6 +-
 .../java/org/mycore/oai/MCROAIAdapter.java    |   4 +-
 .../org/mycore/oai/MCROAIDataProvider.java    |   4 +-
 .../org/mycore/oai/MCROAISearchManager.java   |   4 +-
 .../oai/config/deprecated.properties          |   6 +
 .../components/oai/config/mycore.properties   |  12 +-
 .../ocfl-s3/config/mycore.properties          |   2 +-
 .../MCROCFLClassificationTransaction.java     |   2 +-
 .../mycore/ocfl/commands/MCROCFLCommands.java |   6 +-
 .../ocfl/niofs/MCROCFLFileSystemProvider.java |   6 +-
 .../MCROCFLDefaultRemoteTemporaryStorage.java |   2 +-
 .../repository/MCROCFLRepositoryProvider.java |   2 +-
 .../ocfl/config/deprecated.properties         |   7 +
 .../components/ocfl/config/mycore.properties  |  20 +-
 .../ocfl/test/MCROCFLSetupExtension.java      |  11 +-
 .../src/test/resources/mycore.properties      |   2 +-
 .../org/mycore/pi/MCRGenericPIGenerator.java  |   2 +-
 .../java/org/mycore/pi/MCRPIGenerator.java    |   2 +-
 .../main/java/org/mycore/pi/MCRPIService.java |  20 +-
 .../org/mycore/pi/MCRPIServiceManager.java    |  12 +-
 .../MCRPIOtherPICreatedPredicate.java         |   4 +-
 .../MCRPIOtherPIRegisteredPredicate.java      |   4 +-
 .../pi/config/deprecated.properties           |   9 +-
 .../components/pi/config/mycore.properties    |  18 +-
 .../java/org/mycore/pi/MCRPIManagerTest.java  |  10 +-
 .../pi/condition/MCRPIAndPredicateTest.java   |  12 +-
 .../pi/condition/MCRPIOrPredicateTest.java    |  12 +-
 .../pi/condition/MCRPIXPathPredicateTest.java |   6 +-
 .../doi/MCRMapObjectIDDOIGeneratorTest.java   |   4 +-
 .../pi/purl/MCRIDPURLGeneratorTest.java       |   8 +-
 .../mycore/pi/urn/MCRDNBURNGeneratorTest.java |   4 +-
 .../rest/MCRURNGranularRESTServiceTest.java   |   3 +-
 .../org/mycore/restapi/v2/MCRRestV2App.java   | 117 +++++------
 .../restapi/config/deprecated.properties      |   1 +
 .../restapi/config/mycore.properties          |   2 +-
 .../document/MCRSolrInputDocumentFactory.java |   2 +-
 .../file/MCRSolrPathDocumentFactory.java      |   2 +-
 .../handlers/MCRSolrIndexHandlerFactory.java  |   2 +-
 .../strategy/MCRSolrIndexStrategyManager.java |   2 +-
 .../solr/config/deprecated.properties         |   4 +
 .../components/solr/config/mycore.properties  |  10 +-
 .../viewer/resources/MCRViewerResource.java   |   4 +-
 .../viewer/config/deprecated.properties       |   2 +
 .../viewer/config/mycore.properties           |   4 +-
 .../webtools/upload/MCRUploadResource.java    |   2 +-
 .../webtools/config/deprecated.properties     |   1 +
 .../webtools/config/mycore.properties         |   2 +-
 .../frontend/xeditor/MCREditorSession.java    |   3 +-
 .../xeditor/config/deprecated.properties      |   1 +
 .../xeditor/config/mycore.properties          |   2 +-
 108 files changed, 655 insertions(+), 534 deletions(-)
 create mode 100644 mycore-cronjob/src/main/resources/components/cronjob/config/deprecated.properties
 create mode 100644 mycore-csl/src/main/resources/components/csl/config/deprecated.properties
 create mode 100644 mycore-fo/src/main/resources/components/fo/config/deprecated.properties
 create mode 100644 mycore-mets/src/main/resources/components/mets/config/deprecated.properties
 create mode 100644 mycore-neo4j/src/main/resources/components/neo4j/config/deprecated.properties
 create mode 100644 mycore-ocfl/src/main/resources/components/ocfl/config/deprecated.properties
 create mode 100644 mycore-restapi/src/main/resources/components/restapi/config/deprecated.properties
 create mode 100644 mycore-webtools/src/main/resources/components/webtools/config/deprecated.properties

diff --git a/mycore-acl/src/main/resources/components/acl/config/deprecated.properties b/mycore-acl/src/main/resources/components/acl/config/deprecated.properties
index 9cf5a8beb0..578e703231 100644
--- a/mycore-acl/src/main/resources/components/acl/config/deprecated.properties
+++ b/mycore-acl/src/main/resources/components/acl/config/deprecated.properties
@@ -2,3 +2,4 @@ MCR.ACL.AccessKey.Secret.Hashing=MCR.ACL.AccessKey.Secret.Storage.Mode
 MCR.ACL.AccessKey.Secret.Hashing.Iterations=MCR.ACL.AccessKey.Secret.Storage.Mode.Hash.Iterations
 MCR.ACL.AccessKey.Secret.Storage.Mode=MCR.ACL.AccessKey.Service.SecretProcessor.Class
 MCR.ACL.AccessKey.Secret.Storage.Mode.Hash.Iterations=MCR.ACL.AccessKey.SecretProcessor.Hash.HashIterations
+MCR.Crypt.Cipher.(\S+).class=MCR.Crypt.Cipher.$1.Class
diff --git a/mycore-acl/src/main/resources/components/acl/config/mycore.properties b/mycore-acl/src/main/resources/components/acl/config/mycore.properties
index 3423596d8e..5e64355201 100644
--- a/mycore-acl/src/main/resources/components/acl/config/mycore.properties
+++ b/mycore-acl/src/main/resources/components/acl/config/mycore.properties
@@ -50,6 +50,6 @@ MCR.ACL.AccessKey.Service.SecretProcessor.Class=org.mycore.mcr.acl.accesskey.ser
 # Hash settings
 MCR.ACL.AccessKey.SecretProcessor.Hash.HashIterations=1000
 # Crypt settings
-MCR.Crypt.Cipher.accesskey.class=org.mycore.crypt.MCRAESCipher
+MCR.Crypt.Cipher.accesskey.Class=org.mycore.crypt.MCRAESCipher
 MCR.Crypt.Cipher.accesskey.EnableACL=false
 # MCR.Crypt.Cipher.accesskey.KeyFile=
diff --git a/mycore-base/src/main/java/org/mycore/access/facts/MCRFactsAccessSystemHelper.java b/mycore-base/src/main/java/org/mycore/access/facts/MCRFactsAccessSystemHelper.java
index 0787ca8550..8532b9cf3d 100644
--- a/mycore-base/src/main/java/org/mycore/access/facts/MCRFactsAccessSystemHelper.java
+++ b/mycore-base/src/main/java/org/mycore/access/facts/MCRFactsAccessSystemHelper.java
@@ -45,7 +45,8 @@ public static MCRCondition parse(Element xml) {
     }
 
     static MCRCondition build(String type) {
-        MCRCondition condition = MCRConfiguration2.getInstanceOfOrThrow(MCRCondition.class, CONDITION_PREFIX + type);
+        MCRCondition condition = MCRConfiguration2.getInstanceOfOrThrow(MCRCondition.class,
+            CONDITION_PREFIX + type + ".Class");
         if (LOGGER.isDebugEnabled() && condition instanceof MCRCombinedCondition combCond) {
             combCond.setDebug(true);
         }
diff --git a/mycore-base/src/main/java/org/mycore/access/facts/model/MCRCondition.java b/mycore-base/src/main/java/org/mycore/access/facts/model/MCRCondition.java
index 54eb51de0a..eb55c1ad98 100644
--- a/mycore-base/src/main/java/org/mycore/access/facts/model/MCRCondition.java
+++ b/mycore-base/src/main/java/org/mycore/access/facts/model/MCRCondition.java
@@ -29,8 +29,8 @@
  * 
  * New rules need to be registered in mycore.properties as follows:
  * 
- * MCR.Access.Facts.Condition.{type}={class}
- * e.g. MCR.Access.Facts.Condition.ip=org.mycore.access.facts.condition.fact.MCRIPCondition
+ * MCR.Access.Facts.Condition.{type}.Class={class}
+ * e.g. MCR.Access.Facts.Condition.ip.Class=org.mycore.access.facts.condition.fact.MCRIPCondition
  * 
  * @author Robert Stephan
  *
diff --git a/mycore-base/src/main/java/org/mycore/access/mcrimpl/MCRRuleParser.java b/mycore-base/src/main/java/org/mycore/access/mcrimpl/MCRRuleParser.java
index 70a65992a6..48dad9bf0f 100644
--- a/mycore-base/src/main/java/org/mycore/access/mcrimpl/MCRRuleParser.java
+++ b/mycore-base/src/main/java/org/mycore/access/mcrimpl/MCRRuleParser.java
@@ -107,7 +107,7 @@ protected MCRCondition<?> parseElement(Element e) {
     }
 
     private MCRCondition<MCRAccessData> getIPClause(String value) {
-        MCRIPCondition ipCond = MCRConfiguration2.getInstanceOfOrThrow(MCRIPCondition.class, "MCR.RuleParser.ip");
+        MCRIPCondition ipCond = MCRConfiguration2.getInstanceOfOrThrow(MCRIPCondition.class, "MCR.RuleParser.ip.Class");
         ipCond.set(value);
         return ipCond;
     }
diff --git a/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
index 469e03656c..2a9b289702 100644
--- a/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
+++ b/mycore-base/src/main/java/org/mycore/common/config/instantiator/MCRInstanceConfiguration.java
@@ -67,6 +67,13 @@ private MCRInstanceConfiguration(Class<S> superClass, Class<? extends S> valueCl
         this.name = name;
         this.properties = properties;
         this.fullProperties = fullProperties;
+        if (name.suffix() != Suffix.UPPER_CASE) {
+            if (LOGGER.isWarnEnabled()) {
+                LOGGER.warn("Using instance configuration for actual instance name {}, " +
+                    "which doesn't have suffix '.Class'. Support for such names is deprecated" +
+                    "and support will be removed in a future release of MyCoRe", name::actual);
+            }
+        }
     }
 
     public boolean instantiatable() {
diff --git a/mycore-base/src/main/java/org/mycore/common/xml/MCRLayoutService.java b/mycore-base/src/main/java/org/mycore/common/xml/MCRLayoutService.java
index a86b5f0401..ad8ae0fe19 100644
--- a/mycore-base/src/main/java/org/mycore/common/xml/MCRLayoutService.java
+++ b/mycore-base/src/main/java/org/mycore/common/xml/MCRLayoutService.java
@@ -60,7 +60,7 @@ public class MCRLayoutService {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
-    private static final String TRANSFORMER_FACTORY_PROPERTY = "MCR.Layout.Transformer.Factory";
+    private static final String TRANSFORMER_FACTORY_PROPERTY = "MCR.Layout.Transformer.Factory.Class";
 
     @MCRFactory
     public static MCRLayoutService obtainInstance() {
diff --git a/mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java b/mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java
index 3240be44cb..c6d16eb2a3 100644
--- a/mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java
+++ b/mycore-base/src/main/java/org/mycore/common/xml/MCRURIResolver.java
@@ -1177,7 +1177,7 @@ private record Flavor(Class<? extends TransformerFactory> transformerFactory, St
      */
     static class MCRLayoutTransformerResolver implements URIResolver {
 
-        private static final String TRANSFORMER_FACTORY_PROPERTY = "MCR.Layout.Transformer.Factory";
+        private static final String TRANSFORMER_FACTORY_PROPERTY = "MCR.Layout.Transformer.Factory.Class";
 
         @Override
         public Source resolve(String href, String base) throws TransformerException {
diff --git a/mycore-base/src/main/java/org/mycore/crypt/MCRCipherManager.java b/mycore-base/src/main/java/org/mycore/crypt/MCRCipherManager.java
index 6fd31dae55..cc362e73af 100644
--- a/mycore-base/src/main/java/org/mycore/crypt/MCRCipherManager.java
+++ b/mycore-base/src/main/java/org/mycore/crypt/MCRCipherManager.java
@@ -47,7 +47,7 @@ public class MCRCipherManager {
 
     public static MCRCipher getCipher(String id) throws MCRCryptKeyFileNotFoundException {
         LOGGER.debug("getCipher for id {} .", id);
-        String property = "MCR.Crypt.Cipher." + id + ".class";
+        String property = "MCR.Crypt.Cipher." + id + ".Class";
         MCRCipher cipher = MCRConfiguration2.getSingleInstanceOfOrThrow(MCRCipher.class, property);
         if (!cipher.isInitialised()) {
             LOGGER.debug("init Cipher for id {} .", id);
@@ -71,7 +71,7 @@ public static MCRCipher getCipher(String id) throws MCRCryptKeyFileNotFoundExcep
 
     public static MCRCipher getUnIntitialisedCipher(String id) {
         LOGGER.debug("getCipher for id {} .", id);
-        String property = "MCR.Crypt.Cipher." + id + ".class";
+        String property = "MCR.Crypt.Cipher." + id + ".Class";
         MCRCipher cipher = MCRConfiguration2.getSingleInstanceOfOrThrow(MCRCipher.class, property);
         cipher.reset();
         return cipher;
diff --git a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategLinkService.java b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategLinkService.java
index 3048768021..f055d18236 100644
--- a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategLinkService.java
+++ b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategLinkService.java
@@ -160,7 +160,8 @@ public interface MCRCategLinkService {
     void setLinks(MCRCategLinkReference objectReference, Collection<MCRCategoryID> categories);
 
     static MCRCategLinkService obtainInstance() {
-        return MCRConfiguration2.getSingleInstanceOfOrThrow(MCRCategLinkService.class, "MCR.Category.LinkService");
+        return MCRConfiguration2.getSingleInstanceOfOrThrow(MCRCategLinkService.class,
+            "MCR.Category.LinkService.Class");
     }
     
 }
diff --git a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategLinkServiceFactory.java b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategLinkServiceFactory.java
index 25876b7e4c..b43d651cb9 100644
--- a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategLinkServiceFactory.java
+++ b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategLinkServiceFactory.java
@@ -36,7 +36,8 @@ public class MCRCategLinkServiceFactory {
      */
     @Deprecated(forRemoval = true)
     public static MCRCategLinkService obtainInstance() {
-        return MCRConfiguration2.getSingleInstanceOfOrThrow(MCRCategLinkService.class, "MCR.Category.LinkService");
+        return MCRConfiguration2.getSingleInstanceOfOrThrow(MCRCategLinkService.class,
+            "MCR.Category.LinkService.Class");
     }
 
 }
diff --git a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategoryDAO.java b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategoryDAO.java
index addcc1e696..34507a0718 100644
--- a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategoryDAO.java
+++ b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategoryDAO.java
@@ -284,7 +284,7 @@ Collection<? extends MCRCategory> replaceCategory(MCRCategory newCategory)
     long getLastModified(String root);
 
     static MCRCategoryDAO obtainInstance() {
-        return MCRConfiguration2.getSingleInstanceOfOrThrow(MCRCategoryDAO.class, "MCR.Category.DAO");
+        return MCRConfiguration2.getSingleInstanceOfOrThrow(MCRCategoryDAO.class, "MCR.Category.DAO.Class");
     }
 
 }
diff --git a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategoryDAOFactory.java b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategoryDAOFactory.java
index 25cf1dc193..d7eaf46547 100644
--- a/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategoryDAOFactory.java
+++ b/mycore-base/src/main/java/org/mycore/datamodel/classifications2/MCRCategoryDAOFactory.java
@@ -56,7 +56,7 @@ public static synchronized void set(Class<? extends MCRCategoryDAO> daoClass) th
     // this is known as "Bill Pugh singleton"
     private static final class MCRCategoryDAOHolder {
         private static MCRCategoryDAO instance = MCRConfiguration2.getInstanceOfOrThrow(
-            MCRCategoryDAO.class, "MCR.Category.DAO");
+            MCRCategoryDAO.class, "MCR.Category.DAO.Class");
     }
 
 }
diff --git a/mycore-base/src/main/java/org/mycore/frontend/jersey/MCRJerseyResourceConfig.java b/mycore-base/src/main/java/org/mycore/frontend/jersey/MCRJerseyResourceConfig.java
index f649432996..fb4078d6a9 100644
--- a/mycore-base/src/main/java/org/mycore/frontend/jersey/MCRJerseyResourceConfig.java
+++ b/mycore-base/src/main/java/org/mycore/frontend/jersey/MCRJerseyResourceConfig.java
@@ -24,7 +24,7 @@
 
 /**
  * Entry point for mycore jersey configuration. Loads the {@link MCRJerseyConfiguration} defined in
- * 'MCR.Jersey.Configuration' or the default {@link MCRJerseyDefaultConfiguration}.
+ * 'MCR.Jersey.Configuration.Class' or the default {@link MCRJerseyDefaultConfiguration}.
  * 
  * @author Matthias Eichner
  */
@@ -34,7 +34,7 @@ public MCRJerseyResourceConfig() {
         super();
         LogManager.getLogger().info("Loading jersey resource config...");
         MCRJerseyConfiguration configuration = MCRConfiguration2.getInstanceOfOrThrow(
-            MCRJerseyDefaultConfiguration.class, "MCR.Jersey.Configuration");
+            MCRJerseyDefaultConfiguration.class, "MCR.Jersey.Configuration.Class");
         try {
             configuration.configure(this);
         } catch (Exception exc) {
diff --git a/mycore-base/src/main/resources/config/deprecated.properties b/mycore-base/src/main/resources/config/deprecated.properties
index 28bf153dd8..340209cb8f 100644
--- a/mycore-base/src/main/resources/config/deprecated.properties
+++ b/mycore-base/src/main/resources/config/deprecated.properties
@@ -17,3 +17,12 @@ MCR.Resource.Resolver.Provider=MCR.Resource.Resolver.SelectedProvider
 MCR.Metadata.Manager=MCR.Metadata.Manager.Class
 
 MCR.Persistence.Rule.Store_Class=MCR.Persistence.Rule.Store.Class
+
+MCR.Category.DAO=MCR.Category.DAO.Class
+MCR.Category.LinkService=MCR.Category.LinkService.Class
+MCR.Jersey.Configuration=MCR.Jersey.Configuration.Class
+MCR.Layout.Transformer.Factory=MCR.Layout.Transformer.Factory.Class
+MCR.Metadata.Normalizer.(\S+).(\S+)=MCR.Metadata.Normalizer.$1.$2.Class
+MCR.Metadata.Validator.(\S+).(\S+)=MCR.Metadata.Validator.$1.$2.Class
+MCR.Access.Facts.Condition.(\S+)=MCR.Access.Facts.Condition.$1.Class
+MCR.RuleParser.(\S+)=MCR.RuleParser.$1.Class
diff --git a/mycore-base/src/main/resources/config/mycore.properties b/mycore-base/src/main/resources/config/mycore.properties
index 5bf6831580..08e5fe9bf5 100644
--- a/mycore-base/src/main/resources/config/mycore.properties
+++ b/mycore-base/src/main/resources/config/mycore.properties
@@ -125,10 +125,10 @@ MCR.ObjectExpander.Cache.Path=%MCR.datadir%/expandedObjects
 ##############################################################################
 # Normalizer configuration
 ##############################################################################
-MCR.Metadata.Normalizer.Default.BaseId=org.mycore.datamodel.metadata.normalization.MCRObjectIDNormalizer
-MCR.Metadata.Normalizer.Default.BaseDate=org.mycore.datamodel.metadata.normalization.MCRObjectDateNormalizer
-MCR.Metadata.Normalizer.Default.BaseStructure=org.mycore.datamodel.metadata.normalization.MCRObjectStructureNormalizer
-MCR.Metadata.Normalizer.Default.Classification=org.mycore.datamodel.metadata.normalization.MCRDefaultClassificationMappingNormalizer
+MCR.Metadata.Normalizer.Default.BaseId.Class=org.mycore.datamodel.metadata.normalization.MCRObjectIDNormalizer
+MCR.Metadata.Normalizer.Default.BaseDate.Class=org.mycore.datamodel.metadata.normalization.MCRObjectDateNormalizer
+MCR.Metadata.Normalizer.Default.BaseStructure.Class=org.mycore.datamodel.metadata.normalization.MCRObjectStructureNormalizer
+MCR.Metadata.Normalizer.Default.Classification.Class=org.mycore.datamodel.metadata.normalization.MCRDefaultClassificationMappingNormalizer
 
 ##############################################################################
 # LinkTable configuration
@@ -153,7 +153,7 @@ MCR.BatchEditor.BaseLevel.object=/mycoreobject
 ##############################################################################
 
 # Define the LayoutFactory class
-MCR.Layout.Transformer.Factory=org.mycore.common.xml.MCRLayoutTransformerFactory
+MCR.Layout.Transformer.Factory.Class=org.mycore.common.xml.MCRLayoutTransformerFactory
 
 # Default folder for XSL files, switch to xsl for XSL1 applications
 MCR.Layout.Transformer.Factory.XSLFolder=xslt
@@ -253,26 +253,26 @@ MCR.Access.Strategy.CreatorSubmittedPermissions=%MCR.Access.Strategy.CreatorPerm
 MCR.Access.Strategy.CreatorReviewPermissions=%MCR.Access.Strategy.CreatorPermissions%
 MCR.Access.Cache.Size=200
 
-MCR.RuleParser.ip=org.mycore.access.mcrimpl.MCRIPClause
+MCR.RuleParser.ip.Class=org.mycore.access.mcrimpl.MCRIPClause
 
 ##############################################################################
 # Fact-based Access System                                                   #
 ##############################################################################
 
-MCR.Access.Facts.Condition.and=org.mycore.access.facts.condition.combined.MCRAndCondition
-MCR.Access.Facts.Condition.or=org.mycore.access.facts.condition.combined.MCROrCondition
-MCR.Access.Facts.Condition.xor=org.mycore.access.facts.condition.combined.MCRXorCondition
-MCR.Access.Facts.Condition.not=org.mycore.access.facts.condition.combined.MCRNotCondition
-MCR.Access.Facts.Condition.id=org.mycore.access.facts.condition.fact.MCRStringCondition
-MCR.Access.Facts.Condition.target=org.mycore.access.facts.condition.fact.MCRStringCondition
-MCR.Access.Facts.Condition.action=org.mycore.access.facts.condition.fact.MCRStringCondition
-MCR.Access.Facts.Condition.user=org.mycore.access.facts.condition.fact.MCRUserCondition
-MCR.Access.Facts.Condition.role=org.mycore.access.facts.condition.fact.MCRRoleCondition
-MCR.Access.Facts.Condition.ip=org.mycore.access.facts.condition.fact.MCRIPCondition
-MCR.Access.Facts.Condition.status=org.mycore.access.facts.condition.fact.MCRStateCondition
-MCR.Access.Facts.Condition.createdby=org.mycore.access.facts.condition.fact.MCRCreatedByCondition
-MCR.Access.Facts.Condition.regex=org.mycore.access.facts.condition.fact.MCRRegExCondition
-MCR.Access.Facts.Condition.category=org.mycore.access.facts.condition.fact.MCRCategoryCondition
+MCR.Access.Facts.Condition.and.Class=org.mycore.access.facts.condition.combined.MCRAndCondition
+MCR.Access.Facts.Condition.or.Class=org.mycore.access.facts.condition.combined.MCROrCondition
+MCR.Access.Facts.Condition.xor.Class=org.mycore.access.facts.condition.combined.MCRXorCondition
+MCR.Access.Facts.Condition.not.Class=org.mycore.access.facts.condition.combined.MCRNotCondition
+MCR.Access.Facts.Condition.id.Class=org.mycore.access.facts.condition.fact.MCRStringCondition
+MCR.Access.Facts.Condition.target.Class=org.mycore.access.facts.condition.fact.MCRStringCondition
+MCR.Access.Facts.Condition.action.Class=org.mycore.access.facts.condition.fact.MCRStringCondition
+MCR.Access.Facts.Condition.user.Class=org.mycore.access.facts.condition.fact.MCRUserCondition
+MCR.Access.Facts.Condition.role.Class=org.mycore.access.facts.condition.fact.MCRRoleCondition
+MCR.Access.Facts.Condition.ip.Class=org.mycore.access.facts.condition.fact.MCRIPCondition
+MCR.Access.Facts.Condition.status.Class=org.mycore.access.facts.condition.fact.MCRStateCondition
+MCR.Access.Facts.Condition.createdby.Class=org.mycore.access.facts.condition.fact.MCRCreatedByCondition
+MCR.Access.Facts.Condition.regex.Class=org.mycore.access.facts.condition.fact.MCRRegExCondition
+MCR.Access.Facts.Condition.category.Class=org.mycore.access.facts.condition.fact.MCRCategoryCondition
 
 ##############################################################################
 # Persistence definitions
@@ -647,7 +647,7 @@ MCR.Resource.Resolver.SelectedProvider=default
 # Jersey settings
 ##############################################################################
 
-MCR.Jersey.Configuration=org.mycore.frontend.jersey.MCRJerseyDefaultConfiguration
+MCR.Jersey.Configuration.Class=org.mycore.frontend.jersey.MCRJerseyDefaultConfiguration
 MCR.Jersey.Resource.Packages=org.mycore.frontend.jersey.resources
 MCR.Jersey.Resource.ApplicationPaths=rsc
 
@@ -758,8 +758,8 @@ MCR.UserInformation.Resolver.Providers.system.Enabled=true
 
 MCR.JSON.Manager.Class=org.mycore.common.MCRJSONManager
 
-MCR.Category.DAO=org.mycore.datamodel.classifications2.impl.MCRCategoryDAOImpl
-MCR.Category.LinkService=org.mycore.datamodel.classifications2.impl.MCRCategLinkServiceImpl
+MCR.Category.DAO.Class=org.mycore.datamodel.classifications2.impl.MCRCategoryDAOImpl
+MCR.Category.LinkService.Class=org.mycore.datamodel.classifications2.impl.MCRCategLinkServiceImpl
 
 ##############################################################################
 # Rate-Limit-Resolver
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurationTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurationTest.java
index 043d807b0c..63942d8e15 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurationTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRConfigurationTest.java
@@ -154,6 +154,9 @@ private Pair<String, String> createConflictConfiguration() {
             i++;
         } while (a != b);
 
+        propertyA = propertyA + ".Class";
+        propertyB = propertyB + ".Class";
+        
         LogManager.getLogger().info("Colliding Strings:");
         LogManager.getLogger().info(classNameA + " " + propertyA + " => " + a);
         LogManager.getLogger().info(classNameB + " " + propertyB + " => " + b);
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 e48fe2343a..ad393585bd 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
@@ -1078,8 +1078,6 @@ public void directConfigurationWithUpperCaseSuffixRemovesLowerCaseClassEntry() {
         MCRInstanceConfiguration<?> configuration =
             ofClass(Object.class, TestClass.class, "Instance", Suffix.UPPER_CASE, properties, properties);
 
-        System.out.println(" ---- " + configuration.properties());
-        
         assertEquals("ClassValue", configuration.properties().get(""));
         assertFalse(configuration.properties().containsKey("Class"));
         assertFalse(configuration.properties().containsKey("class"));
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorBasicTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorBasicTest.java
index 70eedd690b..272273f50f 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorBasicTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorBasicTest.java
@@ -38,11 +38,12 @@ public class MCRInstantiatorBasicTest {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithSingletonFactory.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithSingletonFactory.class)
         })
     public void singletonFactory() {
 
-        TestClassWithSingletonFactory instance = ofName(TestClassWithSingletonFactory.class, "Foo").instantiate();
+        TestClassWithSingletonFactory instance = ofName(TestClassWithSingletonFactory.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
 
@@ -51,11 +52,12 @@ public void singletonFactory() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWitAnnotatedFactory.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWitAnnotatedFactory.class)
         })
     public void annotatedFactory() {
 
-        TestClassWitAnnotatedFactory instance = ofName(TestClassWitAnnotatedFactory.class, "Foo").instantiate();
+        TestClassWitAnnotatedFactory instance = ofName(TestClassWitAnnotatedFactory.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
 
@@ -64,23 +66,24 @@ public void annotatedFactory() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWitAnnotatedFactories.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWitAnnotatedFactories.class)
         })
     public void annotatedFactories() {
 
         assertThrows(MCRConfigurationException.class,
-            () -> ofName(TestClassWitAnnotatedFactories.class, "Foo").instantiate());
+            () -> ofName(TestClassWitAnnotatedFactories.class, "Foo.Class").instantiate());
 
     }
 
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithConstructor.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithConstructor.class)
         })
     public void constructorFactory() {
 
-        TestClassWithConstructor instance = ofName(TestClassWithConstructor.class, "Foo").instantiate();
+        TestClassWithConstructor instance = ofName(TestClassWithConstructor.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
 
@@ -89,24 +92,24 @@ public void constructorFactory() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithoutConstructorOrFactory.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithoutConstructorOrFactory.class)
         })
     public void noConstructorOrFactory() {
 
         assertThrows(MCRConfigurationException.class,
-            () -> ofName(TestClassWithoutConstructorOrFactory.class, "Foo").instantiate());
+            () -> ofName(TestClassWithoutConstructorOrFactory.class, "Foo.Class").instantiate());
 
     }
 
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMultipleFactories.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMultipleFactories.class)
         })
     public void multipleFactories() {
 
         assertThrows(MCRConfigurationException.class,
-            () -> ofName(TestClassWithMultipleFactories.class, "Foo").instantiate());
+            () -> ofName(TestClassWithMultipleFactories.class, "Foo.Class").instantiate());
 
     }
 
@@ -117,8 +120,8 @@ public void multipleFactories() {
         })
     public void configurationImplicit() {
 
-        ImplicitTestClass instance = ofName(ImplicitTestClass.class, "Foo",
-            MCRInstanceConfiguration.Options.IMPLICIT).instantiate();
+        ImplicitTestClass instance = ofName(ImplicitTestClass.class,
+            "Foo.Class", MCRInstanceConfiguration.Options.IMPLICIT).instantiate();
 
         assertNotNull(instance);
 
@@ -127,12 +130,13 @@ public void configurationImplicit() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithConfigurationProxy.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithConfigurationProxy.class),
             @MCRTestProperty(key = "Foo.Value", string = "Value")
         })
     public void configurationProxy() {
 
-        TestClassWithConfigurationProxy instance = ofName(TestClassWithConfigurationProxy.class, "Foo").instantiate();
+        TestClassWithConfigurationProxy instance = ofName(TestClassWithConfigurationProxy.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
 
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorCollectionTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorCollectionTest.java
index 35e9306a6e..672527ddcd 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorCollectionTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorCollectionTest.java
@@ -43,13 +43,14 @@ public class MCRInstantiatorCollectionTest {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMap.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMap.class),
             @MCRTestProperty(key = "Foo.EntryA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.EntryB", string = "ValueB"),
         })
     public void map() {
 
-        TestClassWithMap instance = ofName(TestClassWithMap.class, "Foo").instantiate();
+        TestClassWithMap instance = ofName(TestClassWithMap.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -68,25 +69,26 @@ public void map() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMap.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMap.class),
         })
     public void mapNotPresent() {
 
         assertThrows(MCRConfigurationException.class,
-            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo.Class").instantiate());
 
     }
 
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalMap.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalMap.class),
             @MCRTestProperty(key = "Foo.EntryA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.EntryB", string = "ValueB"),
         })
     public void optionalMap() {
 
-        TestClassWithOptionalMap instance = ofName(TestClassWithOptionalMap.class, "Foo").instantiate();
+        TestClassWithOptionalMap instance = ofName(TestClassWithOptionalMap.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -105,11 +107,12 @@ public void optionalMap() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalMap.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalMap.class),
         })
     public void optionalMapNotPresent() {
 
-        TestClassWithOptionalMap instance = ofName(TestClassWithOptionalMap.class, "Foo").instantiate();
+        TestClassWithOptionalMap instance = ofName(TestClassWithOptionalMap.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -120,7 +123,7 @@ public void optionalMapNotPresent() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMapWithSentinel.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMapWithSentinel.class),
             @MCRTestProperty(key = "Foo.EntryA.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.EntryA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.EntryB.Sentinel", string = "true"),
@@ -129,7 +132,8 @@ public void optionalMapNotPresent() {
         })
     public void mapWithSentinel() {
 
-        TestClassWithMapWithSentinel instance = ofName(TestClassWithMapWithSentinel.class, "Foo").instantiate();
+        TestClassWithMapWithSentinel instance = ofName(TestClassWithMapWithSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -146,13 +150,14 @@ public void mapWithSentinel() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMapsWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMapsWithPrefix.class),
             @MCRTestProperty(key = "Foo.Map1.Entry", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Map2.Entry", string = "ValueB"),
         })
     public void mapWithPrefix() {
 
-        TestClassWithMapsWithPrefix instance = ofName(TestClassWithMapsWithPrefix.class, "Foo").instantiate();
+        TestClassWithMapsWithPrefix instance = ofName(TestClassWithMapsWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map1);
@@ -173,12 +178,13 @@ public void mapWithPrefix() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMapWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMapWithPrefix.class),
             @MCRTestProperty(key = "Foo.Map", string = "EntryA:ValueA,EntryB:ValueB"),
         })
     public void shortFormMapWithPrefix() {
 
-        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class, "Foo").instantiate();
+        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -197,14 +203,15 @@ public void shortFormMapWithPrefix() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMapWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMapWithPrefix.class),
             @MCRTestProperty(key = "Foo.Map", string = "A:ShortValueA,B:ShortValueB"),
             @MCRTestProperty(key = "Foo.Map.EntryA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Map.EntryB", string = "ValueB"),
         })
     public void mixedFormMapWithPrefix() {
 
-        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class, "Foo").instantiate();
+        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -255,14 +262,15 @@ public void shortFormMapWithoutPrefix() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMapWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMapWithPrefix.class),
             @MCRTestProperty(key = "Foo.Map", string = "A:ShortValueA,B"),
             @MCRTestProperty(key = "Foo.Map.EntryA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Map.EntryB", empty = true),
         })
     public void mapWithEmptyMapValues() {
 
-        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class, "Foo").instantiate();
+        TestClassWithMapWithPrefix instance = ofName(TestClassWithMapWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -281,7 +289,7 @@ public void mapWithEmptyMapValues() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithMapWithPrefixAndSentinel.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithMapWithPrefixAndSentinel.class),
             @MCRTestProperty(key = "Foo.Map.EntryA.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.Map.EntryA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Map.EntryB.Sentinel", string = "true"),
@@ -290,8 +298,8 @@ public void mapWithEmptyMapValues() {
         })
     public void mapWithPrefixAndSentinel() {
 
-        TestClassWithMapWithPrefixAndSentinel instance =
-            ofName(TestClassWithMapWithPrefixAndSentinel.class, "Foo").instantiate();
+        TestClassWithMapWithPrefixAndSentinel instance = ofName(TestClassWithMapWithPrefixAndSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -308,13 +316,14 @@ public void mapWithPrefixAndSentinel() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithList.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithList.class),
             @MCRTestProperty(key = "Foo.23", string = "Value23"),
             @MCRTestProperty(key = "Foo.42", string = "Value42"),
         })
     public void list() {
 
-        TestClassWithList instance = ofName(TestClassWithList.class, "Foo").instantiate();
+        TestClassWithList instance = ofName(TestClassWithList.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -333,25 +342,26 @@ public void list() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithList.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithList.class),
         })
     public void listNotPresent() {
 
         assertThrows(MCRConfigurationException.class,
-            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo.Class").instantiate());
 
     }
 
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalList.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalList.class),
             @MCRTestProperty(key = "Foo.23", string = "Value23"),
             @MCRTestProperty(key = "Foo.42", string = "Value42"),
         })
     public void optionalList() {
 
-        TestClassWithOptionalList instance = ofName(TestClassWithOptionalList.class, "Foo").instantiate();
+        TestClassWithOptionalList instance = ofName(TestClassWithOptionalList.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -370,11 +380,12 @@ public void optionalList() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalList.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalList.class),
         })
     public void optionalListNotPresent() {
 
-        TestClassWithOptionalList instance = ofName(TestClassWithOptionalList.class, "Foo").instantiate();
+        TestClassWithOptionalList instance = ofName(TestClassWithOptionalList.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -385,7 +396,7 @@ public void optionalListNotPresent() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithListAndSentinel.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithListAndSentinel.class),
             @MCRTestProperty(key = "Foo.7.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.7", string = "Value7"),
             @MCRTestProperty(key = "Foo.23.Sentinel", string = "true"),
@@ -395,7 +406,8 @@ public void optionalListNotPresent() {
         })
     public void listWithSentinel() {
 
-        TestClassWithListAndSentinel instance = ofName(TestClassWithListAndSentinel.class, "Foo").instantiate();
+        TestClassWithListAndSentinel instance = ofName(TestClassWithListAndSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -409,13 +421,14 @@ public void listWithSentinel() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithListsWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithListsWithPrefix.class),
             @MCRTestProperty(key = "Foo.List1.23", string = "Value23"),
             @MCRTestProperty(key = "Foo.List2.42", string = "Value42"),
         })
     public void listWithPrefix() {
 
-        TestClassWithListsWithPrefix instance = ofName(TestClassWithListsWithPrefix.class, "Foo").instantiate();
+        TestClassWithListsWithPrefix instance = ofName(TestClassWithListsWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list1);
@@ -436,12 +449,13 @@ public void listWithPrefix() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithListWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithListWithPrefix.class),
             @MCRTestProperty(key = "Foo.List", string = "ShortValue23,ShortValue42"),
         })
     public void shortFormListWithPrefix() {
 
-        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class, "Foo").instantiate();
+        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -460,14 +474,15 @@ public void shortFormListWithPrefix() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithListWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithListWithPrefix.class),
             @MCRTestProperty(key = "Foo.List", string = "ShortValue23,ShortValue42"),
             @MCRTestProperty(key = "Foo.List.42", string = "AfterValue42"),
             @MCRTestProperty(key = "Foo.List.-23", string = "BeforeValue23"),
         })
     public void mixedFormListWithPrefix() {
 
-        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class, "Foo").instantiate();
+        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -518,14 +533,15 @@ public void shortFormListWithoutPrefix() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithListWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithListWithPrefix.class),
             @MCRTestProperty(key = "Foo.List", string = "ShortValue23,"),
             @MCRTestProperty(key = "Foo.List.42", string = "AfterValue42"),
             @MCRTestProperty(key = "Foo.List.-23", empty = true),
         })
     public void listWithEmptyValues() {
 
-        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class, "Foo").instantiate();
+        TestClassWithListWithPrefix instance = ofName(TestClassWithListWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -544,7 +560,7 @@ public void listWithEmptyValues() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithListWithPrefixAndSentinel.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithListWithPrefixAndSentinel.class),
             @MCRTestProperty(key = "Foo.List.7.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.List.7", string = "Value7"),
             @MCRTestProperty(key = "Foo.List.23.Sentinel", string = "true"),
@@ -553,8 +569,8 @@ public void listWithEmptyValues() {
         })
     public void listWithPrefixAndSentinel() {
 
-        TestClassWithListWithPrefixAndSentinel instance =
-            ofName(TestClassWithListWithPrefixAndSentinel.class, "Foo").instantiate();
+        TestClassWithListWithPrefixAndSentinel instance = ofName(TestClassWithListWithPrefixAndSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorConfigTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorConfigTest.java
index 1a688c9398..dabf5ab853 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorConfigTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorConfigTest.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.assertTrue;
+import static org.mycore.common.config.MCRConfiguration2.set;
 import static org.mycore.common.config.instantiator.MCRInstanceConfiguration.ofName;
 
 import java.util.ArrayList;
@@ -151,14 +152,14 @@ public void test() {
         assertTrue(instances.containsKey(INSTANCE_1_KEY), "Expected key " + INSTANCE_1_KEY + " to be present");
         assertTrue(instances.containsKey(INSTANCE_2_KEY), "Expected key " + INSTANCE_2_KEY + " to be present");
 
-        testInstance(INSTANCE_1_NAME, false);
-        testInstance(INSTANCE_2_NAME, true);
+        testInstance(INSTANCE_1_NAME);
+        testInstance(INSTANCE_2_NAME);
 
     }
 
-    private void testInstance(String instanceName, boolean withClassSuffix) {
+    private void testInstance(String instanceName) {
 
-        String fullInstanceName = withClassSuffix(instanceName, withClassSuffix);
+        String fullInstanceName = withClassSuffix(instanceName);
 
         List<String> list = MCRConfiguration2.getInstantiatablePropertyKeys(fullInstanceName).toList();
         assertTrue(list.contains(fullInstanceName), "Properties should contain " + instanceName);
@@ -174,7 +175,8 @@ private void testInstance(String instanceName, boolean withClassSuffix) {
 
     public void validateFields(ConfigurableTestInstance instance) {
 
-        assertTrue(instance.map.containsKey(ASSIGNED_KEY), "The map field should contain the assigned test key");
+        assertTrue(instance.map.containsKey(ASSIGNED_KEY),
+            "The map field should contain the assigned test key");
 
         assertTrue(instance.map.containsKey(PREFIX_ASSIGNED_KEY),
             "The map field should contain the assigned test key with prefix");
@@ -188,18 +190,23 @@ public void validateFields(ConfigurableTestInstance instance) {
         assertTrue(instance.prefixMap.containsKey(ASSIGNED_KEY),
             "The prefix map field should contain the assigned test key");
 
-        assertEquals(1, instance.prefixMap.size(), "The map field should have exactly one entry");
+        assertEquals(1, instance.prefixMap.size(),
+            "The map field should have exactly one entry");
 
         assertEquals(PREFIX_ASSIGNED_VALUE, instance.prefixMap.get(ASSIGNED_KEY),
             "The assigned test key should have the assigned value");
 
-        assertEquals(VALUE_REQUIRED_FIELD, instance.required, "The required field should match");
+        assertEquals(VALUE_REQUIRED_FIELD, instance.required,
+            "The required field should match");
 
-        assertEquals(DEFAULT_VALUE, instance.requiredWithDefault, "The required field with default should match");
+        assertEquals(DEFAULT_VALUE, instance.requiredWithDefault,
+            "The required field with default should match");
 
-        assertNull(instance.absentOptional, "The absent optional field should be null");
+        assertNull(instance.absentOptional,
+            "The absent optional field should be null");
 
-        assertEquals(VALUE_PRESENT_OPTIONAL_FIELD, instance.presentOptional, "The present optional field should match");
+        assertEquals(VALUE_PRESENT_OPTIONAL_FIELD, instance.presentOptional,
+            "The present optional field should match");
 
         assertEquals(DEFAULT_VALUE, instance.absentOptionalWithDefault,
             "The absent optional field with default should match");
@@ -207,7 +214,8 @@ public void validateFields(ConfigurableTestInstance instance) {
         assertEquals(VALUE_PRESENT_OPTIONAL_FIELD_WITH_DEFAULT, instance.presentOptionalWithDefault,
             "The present optional field with default should match");
 
-        assertEquals(VALUE_ABSOLUTE_FIELD, instance.absolute, "The absolute field should match");
+        assertEquals(VALUE_ABSOLUTE_FIELD, instance.absolute,
+            "The absolute field should match");
 
     }
 
@@ -228,17 +236,20 @@ public void validateMethods(ConfigurableTestInstance instance) {
         assertTrue(instance.getPrefixMap().containsKey(ASSIGNED_KEY),
             "The prefix map method value should contain the assigned test key");
 
-        assertEquals(1, instance.getPrefixMap().size(), "The map field should have exactly one entry");
+        assertEquals(1, instance.getPrefixMap().size(),
+            "The map field should have exactly one entry");
 
         assertEquals(PREFIX_ASSIGNED_VALUE, instance.getPrefixMap().get(ASSIGNED_KEY),
             "The assigned test key should have the assigned value");
 
-        assertEquals(VALUE_REQUIRED_METHOD, instance.getRequired(), "The required method value should match");
+        assertEquals(VALUE_REQUIRED_METHOD, instance.getRequired(),
+            "The required method value should match");
 
         assertEquals(DEFAULT_VALUE, instance.getRequiredWithDefault(),
             "The required method value with default should match");
 
-        assertNull(instance.getAbsentOptional(), "The absent optional method value should be null");
+        assertNull(instance.getAbsentOptional(),
+            "The absent optional method value should be null");
 
         assertEquals(VALUE_PRESENT_OPTIONAL_METHOD, instance.getPresentOptional(),
             "The present optional method value should match");
@@ -249,7 +260,8 @@ public void validateMethods(ConfigurableTestInstance instance) {
         assertEquals(VALUE_PRESENT_OPTIONAL_METHOD_DEFAULT, instance.getPresentOptionalWithDefault(),
             "The present optional method value with default should match");
 
-        assertEquals(VALUE_ABSOLUTE_METHOD, instance.getAbsolute(), "The absolute method value should match");
+        assertEquals(VALUE_ABSOLUTE_METHOD, instance.getAbsolute(),
+            "The absolute method value should match");
 
         assertEquals(VALUE_CONVERTING_METHOD.length(), instance.getConverting(),
             "The converting method value should match");
@@ -261,7 +273,8 @@ public void validateMethods(ConfigurableTestInstance instance) {
 
     public void validatePostConstruction(ConfigurableTestInstance instance, String fullInstanceName) {
 
-        assertEquals(fullInstanceName, instance.postConstructionProperty, "Post construction value should match");
+        assertEquals(fullInstanceName, instance.postConstructionProperty,
+            "Post construction value should match");
 
         assertEquals(VALUES_ORDERED_POST_CONSTRUCTION, instance.getOrderedPostConstructionValues(),
             "The ordered post construction values should match");
@@ -274,36 +287,34 @@ public void validatePostConstruction(ConfigurableTestInstance instance, String f
     @BeforeEach
     public void setTestProperties() {
 
-        MCRConfiguration2.set(DEFAULT_KEY, DEFAULT_VALUE);
-        MCRConfiguration2.set(KEY_ABSOLUTE_FIELD, VALUE_ABSOLUTE_FIELD);
-        MCRConfiguration2.set(KEY_ABSOLUTE_METHOD, VALUE_ABSOLUTE_METHOD);
+        set(DEFAULT_KEY, DEFAULT_VALUE);
+        set(KEY_ABSOLUTE_FIELD, VALUE_ABSOLUTE_FIELD);
+        set(KEY_ABSOLUTE_METHOD, VALUE_ABSOLUTE_METHOD);
 
-        configureInstance(INSTANCE_1_NAME, false);
-        configureInstance(INSTANCE_2_NAME, true);
+        configureInstance(INSTANCE_1_NAME);
+        configureInstance(INSTANCE_2_NAME);
 
     }
 
-    private static void configureInstance(String instanceName, boolean withClassSuffix) {
-        String fullInstanceName = withClassSuffix(instanceName, withClassSuffix);
-        MCRConfiguration2.set(fullInstanceName, ConfigurableTestInstance.class.getName());
-        MCRConfiguration2.set(instanceName + "." + ASSIGNED_KEY, ASSIGNED_VALUE);
-        MCRConfiguration2.set(instanceName + "." + PREFIX_ASSIGNED_KEY, PREFIX_ASSIGNED_VALUE);
-        MCRConfiguration2.set(instanceName + "." + KEY_REQUIRED_FIELD, VALUE_REQUIRED_FIELD);
-        MCRConfiguration2.set(instanceName + "." + KEY_PRESENT_OPTIONAL_FIELD, VALUE_PRESENT_OPTIONAL_FIELD);
-        MCRConfiguration2.set(instanceName + "." + KEY_PRESENT_OPTIONAL_FIELD_WITH_DEFAULT,
-            VALUE_PRESENT_OPTIONAL_FIELD_WITH_DEFAULT);
-        MCRConfiguration2.set(instanceName + "." + KEY_REQUIRED_METHOD, VALUE_REQUIRED_METHOD);
-        MCRConfiguration2.set(instanceName + "." + KEY_PRESENT_OPTIONAL_METHOD, VALUE_PRESENT_OPTIONAL_METHOD);
-        MCRConfiguration2.set(instanceName + "." + KEY_PRESENT_OPTIONAL_METHOD_DEFAULT,
-            VALUE_PRESENT_OPTIONAL_METHOD_DEFAULT);
-        MCRConfiguration2.set(instanceName + "." + KEY_CONVERTING_METHOD, VALUE_CONVERTING_METHOD);
-        MCRConfiguration2.set(instanceName + "." + KEY_ORDERED_METHOD, VALUE_ORDERED_METHOD);
-        MCRConfiguration2.set(instanceName + "." + KEY_ORDERED_METHOD_1, VALUE_ORDERED_METHOD_1);
-        MCRConfiguration2.set(instanceName + "." + KEY_ORDERED_METHOD_2, VALUE_ORDERED_METHOD_2);
+    private static void configureInstance(String instanceName) {
+        String fullInstanceName = withClassSuffix(instanceName);
+        set(fullInstanceName, ConfigurableTestInstance.class.getName());
+        set(instanceName + "." + ASSIGNED_KEY, ASSIGNED_VALUE);
+        set(instanceName + "." + PREFIX_ASSIGNED_KEY, PREFIX_ASSIGNED_VALUE);
+        set(instanceName + "." + KEY_REQUIRED_FIELD, VALUE_REQUIRED_FIELD);
+        set(instanceName + "." + KEY_PRESENT_OPTIONAL_FIELD, VALUE_PRESENT_OPTIONAL_FIELD);
+        set(instanceName + "." + KEY_PRESENT_OPTIONAL_FIELD_WITH_DEFAULT, VALUE_PRESENT_OPTIONAL_FIELD_WITH_DEFAULT);
+        set(instanceName + "." + KEY_REQUIRED_METHOD, VALUE_REQUIRED_METHOD);
+        set(instanceName + "." + KEY_PRESENT_OPTIONAL_METHOD, VALUE_PRESENT_OPTIONAL_METHOD);
+        set(instanceName + "." + KEY_PRESENT_OPTIONAL_METHOD_DEFAULT, VALUE_PRESENT_OPTIONAL_METHOD_DEFAULT);
+        set(instanceName + "." + KEY_CONVERTING_METHOD, VALUE_CONVERTING_METHOD);
+        set(instanceName + "." + KEY_ORDERED_METHOD, VALUE_ORDERED_METHOD);
+        set(instanceName + "." + KEY_ORDERED_METHOD_1, VALUE_ORDERED_METHOD_1);
+        set(instanceName + "." + KEY_ORDERED_METHOD_2, VALUE_ORDERED_METHOD_2);
     }
 
-    private static String withClassSuffix(String instanceName, boolean withClassSuffix) {
-        return instanceName + (withClassSuffix ? ".Class" : "");
+    private static String withClassSuffix(String instanceName) {
+        return instanceName + ".Class";
     }
 
     public static class ConfigurableTestInstance {
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorDefaultTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorDefaultTest.java
index 61485f4d58..7b747667be 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorDefaultTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorDefaultTest.java
@@ -47,12 +47,13 @@ public class MCRInstantiatorDefaultTest {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedClass.class),
-            @MCRTestProperty(key = "Foo.Nested", classNameOf = NestedClass.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedClass.class),
+            @MCRTestProperty(key = "Foo.Nested.Class", classNameOf = NestedClass.class)
         })
     public void nested() {
 
-        TestClassWithNestedClass instance = ofName(TestClassWithNestedClass.class, "Foo").instantiate();
+        TestClassWithNestedClass instance = ofName(TestClassWithNestedClass.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -64,11 +65,12 @@ public void nested() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithImplicitNestedClass.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithImplicitNestedClass.class)
         })
     public void nestedImplicit() {
 
-        TestClassWithImplicitNestedClass instance = ofName(TestClassWithImplicitNestedClass.class, "Foo").instantiate();
+        TestClassWithImplicitNestedClass instance = ofName(TestClassWithImplicitNestedClass.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -80,13 +82,14 @@ public void nestedImplicit() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedNestedClass.class),
-            @MCRTestProperty(key = "Foo.Nested", classNameOf = TestClassWithNestedClass.class),
-            @MCRTestProperty(key = "Foo.Nested.Nested", classNameOf = NestedClass.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedNestedClass.class),
+            @MCRTestProperty(key = "Foo.Nested.Class", classNameOf = TestClassWithNestedClass.class),
+            @MCRTestProperty(key = "Foo.Nested.Nested.Class", classNameOf = NestedClass.class)
         })
     public void nestedNested() {
 
-        TestClassWithNestedNestedClass instance = ofName(TestClassWithNestedNestedClass.class, "Foo").instantiate();
+        TestClassWithNestedNestedClass instance = ofName(TestClassWithNestedNestedClass.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -99,13 +102,14 @@ public void nestedNested() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedMap.class),
-            @MCRTestProperty(key = "Foo.EntryA", classNameOf = OneKindOfEntry.class),
-            @MCRTestProperty(key = "Foo.EntryB", classNameOf = OtherKindOfEntry.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedMap.class),
+            @MCRTestProperty(key = "Foo.EntryA.Class", classNameOf = OneKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.EntryB.Class", classNameOf = OtherKindOfEntry.class)
         })
     public void nestedMap() {
 
-        TestClassWithNestedMap instance = ofName(TestClassWithNestedMap.class, "Foo").instantiate();
+        TestClassWithNestedMap instance = ofName(TestClassWithNestedMap.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -126,14 +130,14 @@ public void nestedMap() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedMapOfImplicitEntries.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedMapOfImplicitEntries.class),
             @MCRTestProperty(key = "Foo.EntryA.Property1", string = "Custom1"),
             @MCRTestProperty(key = "Foo.EntryB.Property2", string = "Custom2"),
         })
     public void nestedMapImplicit() {
 
-        TestClassWithNestedMapOfImplicitEntries instance =
-            ofName(TestClassWithNestedMapOfImplicitEntries.class, "Foo").instantiate();
+        TestClassWithNestedMapOfImplicitEntries instance = ofName(TestClassWithNestedMapOfImplicitEntries.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -156,13 +160,14 @@ public void nestedMapImplicit() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedList.class),
-            @MCRTestProperty(key = "Foo.23", classNameOf = OneKindOfEntry.class),
-            @MCRTestProperty(key = "Foo.42", classNameOf = OtherKindOfEntry.class)
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedList.class),
+            @MCRTestProperty(key = "Foo.23.Class", classNameOf = OneKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.42.Class", classNameOf = OtherKindOfEntry.class)
         })
     public void nestedList() {
 
-        TestClassWithNestedList instance = ofName(TestClassWithNestedList.class, "Foo").instantiate();
+        TestClassWithNestedList instance = ofName(TestClassWithNestedList.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -183,14 +188,14 @@ public void nestedList() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedListOfImplicitEntries.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedListOfImplicitEntries.class),
             @MCRTestProperty(key = "Foo.23.Property1", string = "Custom1"),
             @MCRTestProperty(key = "Foo.42.Property2", string = "Custom2"),
         })
     public void nestedListImplicit() {
 
-        TestClassWithNestedListOfImplicitEntries instance =
-            ofName(TestClassWithNestedListOfImplicitEntries.class, "Foo").instantiate();
+        TestClassWithNestedListOfImplicitEntries instance = ofName(TestClassWithNestedListOfImplicitEntries.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNestedTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNestedTest.java
index b923c4d02e..24fbf94962 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNestedTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorNestedTest.java
@@ -44,14 +44,15 @@ public class MCRInstantiatorNestedTest {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedClass.class),
-            @MCRTestProperty(key = "Foo.Nested", classNameOf = NestedClass.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedClass.class),
+            @MCRTestProperty(key = "Foo.Nested.Class", classNameOf = NestedClass.class),
             @MCRTestProperty(key = "Foo.Nested.PropertyA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Nested.PropertyB", string = "ValueB")
         })
     public void nested() {
 
-        TestClassWithNestedClass instance = ofName(TestClassWithNestedClass.class, "Foo").instantiate();
+        TestClassWithNestedClass instance = ofName(TestClassWithNestedClass.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -63,25 +64,26 @@ public void nested() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedClass.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedClass.class),
         })
     public void nestedNotPresent() {
 
         assertThrows(MCRConfigurationException.class,
-            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo.Class").instantiate());
 
     }
 
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithImplicitNestedClass.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithImplicitNestedClass.class),
             @MCRTestProperty(key = "Foo.Nested.PropertyA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Nested.PropertyB", string = "ValueB")
         })
     public void nestedImplicit() {
 
-        TestClassWithImplicitNestedClass instance = ofName(TestClassWithImplicitNestedClass.class, "Foo").instantiate();
+        TestClassWithImplicitNestedClass instance = ofName(TestClassWithImplicitNestedClass.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -93,14 +95,15 @@ public void nestedImplicit() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalNestedClass.class),
-            @MCRTestProperty(key = "Foo.Nested", classNameOf = NestedClass.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalNestedClass.class),
+            @MCRTestProperty(key = "Foo.Nested.Class", classNameOf = NestedClass.class),
             @MCRTestProperty(key = "Foo.Nested.PropertyA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Nested.PropertyB", string = "ValueB")
         })
     public void nestedOptional() {
 
-        TestClassWithOptionalNestedClass instance = ofName(TestClassWithOptionalNestedClass.class, "Foo").instantiate();
+        TestClassWithOptionalNestedClass instance = ofName(TestClassWithOptionalNestedClass.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -112,11 +115,12 @@ public void nestedOptional() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalNestedClass.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalNestedClass.class),
         })
     public void nestedOptionalNotPresent() {
 
-        TestClassWithOptionalNestedClass instance = ofName(TestClassWithOptionalNestedClass.class, "Foo").instantiate();
+        TestClassWithOptionalNestedClass instance = ofName(TestClassWithOptionalNestedClass.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNull(instance.nested);
@@ -126,15 +130,16 @@ public void nestedOptionalNotPresent() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedNestedClass.class),
-            @MCRTestProperty(key = "Foo.Nested", classNameOf = TestClassWithNestedClass.class),
-            @MCRTestProperty(key = "Foo.Nested.Nested", classNameOf = NestedClass.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedNestedClass.class),
+            @MCRTestProperty(key = "Foo.Nested.Class", classNameOf = TestClassWithNestedClass.class),
+            @MCRTestProperty(key = "Foo.Nested.Nested.Class", classNameOf = NestedClass.class),
             @MCRTestProperty(key = "Foo.Nested.Nested.PropertyA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Nested.Nested.PropertyB", string = "ValueB")
         })
     public void nestedNested() {
 
-        TestClassWithNestedNestedClass instance = ofName(TestClassWithNestedNestedClass.class, "Foo").instantiate();
+        TestClassWithNestedNestedClass instance = ofName(TestClassWithNestedNestedClass.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -147,16 +152,16 @@ public void nestedNested() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalNestedClassAndSentinel.class),
-            @MCRTestProperty(key = "Foo.Nested", classNameOf = NestedClass.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalNestedClassAndSentinel.class),
+            @MCRTestProperty(key = "Foo.Nested.Class", classNameOf = NestedClass.class),
             @MCRTestProperty(key = "Foo.Nested.Sentinel", string = "true"),
             @MCRTestProperty(key = "Foo.Nested.PropertyA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Nested.PropertyB", string = "ValueB")
         })
     public void nestedOptionalAndSentinel() {
 
-        TestClassWithOptionalNestedClassAndSentinel instance =
-            ofName(TestClassWithOptionalNestedClassAndSentinel.class, "Foo").instantiate();
+        TestClassWithOptionalNestedClassAndSentinel instance = ofName(TestClassWithOptionalNestedClassAndSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.nested);
@@ -168,16 +173,16 @@ public void nestedOptionalAndSentinel() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalNestedClassAndSentinel.class),
-            @MCRTestProperty(key = "Foo.Nested", classNameOf = NestedClass.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalNestedClassAndSentinel.class),
+            @MCRTestProperty(key = "Foo.Nested.Class", classNameOf = NestedClass.class),
             @MCRTestProperty(key = "Foo.Nested.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.Nested.PropertyA", string = "ValueA"),
             @MCRTestProperty(key = "Foo.Nested.PropertyB", string = "ValueB")
         })
     public void nestedOptionalAndSentinelNotPresent() {
 
-        TestClassWithOptionalNestedClassAndSentinel instance =
-            ofName(TestClassWithOptionalNestedClassAndSentinel.class, "Foo").instantiate();
+        TestClassWithOptionalNestedClassAndSentinel instance = ofName(TestClassWithOptionalNestedClassAndSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNull(instance.nested);
@@ -187,15 +192,16 @@ public void nestedOptionalAndSentinelNotPresent() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedMap.class),
-            @MCRTestProperty(key = "Foo.EntryA", classNameOf = OneKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedMap.class),
+            @MCRTestProperty(key = "Foo.EntryA.Class", classNameOf = OneKindOfEntry.class),
             @MCRTestProperty(key = "Foo.EntryA.PropertyA", string = "ValueA"),
-            @MCRTestProperty(key = "Foo.EntryB", classNameOf = OtherKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.EntryB.Class", classNameOf = OtherKindOfEntry.class),
             @MCRTestProperty(key = "Foo.EntryB.PropertyB", string = "ValueB"),
         })
     public void nestedMap() {
 
-        TestClassWithNestedMap instance = ofName(TestClassWithNestedMap.class, "Foo").instantiate();
+        TestClassWithNestedMap instance = ofName(TestClassWithNestedMap.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -216,26 +222,26 @@ public void nestedMap() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedMap.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedMap.class),
         })
     public void nestedMapNotPresent() {
 
         assertThrows(MCRConfigurationException.class,
-            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo.Class").instantiate());
 
     }
 
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedMapOfImplicitEntries.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedMapOfImplicitEntries.class),
             @MCRTestProperty(key = "Foo.EntryA.Property", string = "ValueA"),
             @MCRTestProperty(key = "Foo.EntryB.Property", string = "ValueB"),
         })
     public void nestedMapImplicit() {
 
-        TestClassWithNestedMapOfImplicitEntries instance =
-            ofName(TestClassWithNestedMapOfImplicitEntries.class, "Foo").instantiate();
+        TestClassWithNestedMapOfImplicitEntries instance = ofName(TestClassWithNestedMapOfImplicitEntries.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -256,15 +262,16 @@ public void nestedMapImplicit() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalNestedMap.class),
-            @MCRTestProperty(key = "Foo.EntryA", classNameOf = OneKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalNestedMap.class),
+            @MCRTestProperty(key = "Foo.EntryA.Class", classNameOf = OneKindOfEntry.class),
             @MCRTestProperty(key = "Foo.EntryA.PropertyA", string = "ValueA"),
-            @MCRTestProperty(key = "Foo.EntryB", classNameOf = OtherKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.EntryB.Class", classNameOf = OtherKindOfEntry.class),
             @MCRTestProperty(key = "Foo.EntryB.PropertyB", string = "ValueB"),
         })
     public void nestedOptionalMap() {
 
-        TestClassWithOptionalNestedMap instance = ofName(TestClassWithOptionalNestedMap.class, "Foo").instantiate();
+        TestClassWithOptionalNestedMap instance = ofName(TestClassWithOptionalNestedMap.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -285,11 +292,12 @@ public void nestedOptionalMap() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalNestedMap.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalNestedMap.class),
         })
     public void nestedOptionalMapNotPresent() {
 
-        TestClassWithOptionalNestedMap instance = ofName(TestClassWithOptionalNestedMap.class, "Foo").instantiate();
+        TestClassWithOptionalNestedMap instance = ofName(TestClassWithOptionalNestedMap.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -300,21 +308,21 @@ public void nestedOptionalMapNotPresent() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedMapWithSentinel.class),
-            @MCRTestProperty(key = "Foo.EntryA", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedMapWithSentinel.class),
+            @MCRTestProperty(key = "Foo.EntryA.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.EntryA.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.EntryA.Property", string = "ValueA"),
-            @MCRTestProperty(key = "Foo.EntryB", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.EntryB.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.EntryB.Sentinel", string = "true"),
             @MCRTestProperty(key = "Foo.EntryB.Property", string = "ValueB"),
-            @MCRTestProperty(key = "Foo.EntryC", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.EntryC.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.EntryC.Property", string = "ValueC"),
 
         })
     public void nestedMapWithSentinel() {
 
-        TestClassWithNestedMapWithSentinel instance =
-            ofName(TestClassWithNestedMapWithSentinel.class, "Foo").instantiate();
+        TestClassWithNestedMapWithSentinel instance = ofName(TestClassWithNestedMapWithSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -331,16 +339,16 @@ public void nestedMapWithSentinel() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedMapsWithPrefix.class),
-            @MCRTestProperty(key = "Foo.Map1.Entry", classNameOf = OneKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedMapsWithPrefix.class),
+            @MCRTestProperty(key = "Foo.Map1.Entry.Class", classNameOf = OneKindOfEntry.class),
             @MCRTestProperty(key = "Foo.Map1.Entry.PropertyA", string = "ValueA"),
-            @MCRTestProperty(key = "Foo.Map2.Entry", classNameOf = OtherKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.Map2.Entry.Class", classNameOf = OtherKindOfEntry.class),
             @MCRTestProperty(key = "Foo.Map2.Entry.PropertyB", string = "ValueB"),
         })
     public void nestedMapWithPrefix() {
 
-        TestClassWithNestedMapsWithPrefix instance =
-            ofName(TestClassWithNestedMapsWithPrefix.class, "Foo").instantiate();
+        TestClassWithNestedMapsWithPrefix instance = ofName(TestClassWithNestedMapsWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map1);
@@ -363,21 +371,21 @@ public void nestedMapWithPrefix() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedMapWithPrefixAndSentinel.class),
-            @MCRTestProperty(key = "Foo.Map.EntryA", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedMapWithPrefixAndSentinel.class),
+            @MCRTestProperty(key = "Foo.Map.EntryA.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.Map.EntryA.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.Map.EntryA.Property", string = "ValueA"),
-            @MCRTestProperty(key = "Foo.Map.EntryB", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.Map.EntryB.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.Map.EntryB.Sentinel", string = "true"),
             @MCRTestProperty(key = "Foo.Map.EntryB.Property", string = "ValueB"),
-            @MCRTestProperty(key = "Foo.Map.EntryC", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.Map.EntryC.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.Map.EntryC.Property", string = "ValueC"),
 
         })
     public void nestedMapWithPrefixAndSentinel() {
 
-        TestClassWithNestedMapWithPrefixAndSentinel instance =
-            ofName(TestClassWithNestedMapWithPrefixAndSentinel.class, "Foo").instantiate();
+        TestClassWithNestedMapWithPrefixAndSentinel instance = ofName(TestClassWithNestedMapWithPrefixAndSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.map);
@@ -394,15 +402,16 @@ public void nestedMapWithPrefixAndSentinel() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedList.class),
-            @MCRTestProperty(key = "Foo.23", classNameOf = OneKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedList.class),
+            @MCRTestProperty(key = "Foo.23.Class", classNameOf = OneKindOfEntry.class),
             @MCRTestProperty(key = "Foo.23.PropertyA", string = "Value23"),
-            @MCRTestProperty(key = "Foo.42", classNameOf = OtherKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.42.Class", classNameOf = OtherKindOfEntry.class),
             @MCRTestProperty(key = "Foo.42.PropertyB", string = "Value42"),
         })
     public void nestedList() {
 
-        TestClassWithNestedList instance = ofName(TestClassWithNestedList.class, "Foo").instantiate();
+        TestClassWithNestedList instance = ofName(TestClassWithNestedList.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -423,26 +432,26 @@ public void nestedList() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedList.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedList.class),
         })
     public void nestedListNotPresent() {
 
         assertThrows(MCRConfigurationException.class,
-            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo").instantiate());
+            () -> MCRInstanceConfiguration.ofName(Object.class, "Foo.Class").instantiate());
 
     }
 
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedListOfImplicitEntries.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedListOfImplicitEntries.class),
             @MCRTestProperty(key = "Foo.23.Property", string = "Value23"),
             @MCRTestProperty(key = "Foo.42.Property", string = "Value42"),
         })
     public void nestedListImplicit() {
 
-        TestClassWithNestedListOfImplicitEntries instance =
-            ofName(TestClassWithNestedListOfImplicitEntries.class, "Foo").instantiate();
+        TestClassWithNestedListOfImplicitEntries instance = ofName(TestClassWithNestedListOfImplicitEntries.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -463,15 +472,16 @@ public void nestedListImplicit() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalNestedList.class),
-            @MCRTestProperty(key = "Foo.23", classNameOf = OneKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalNestedList.class),
+            @MCRTestProperty(key = "Foo.23.Class", classNameOf = OneKindOfEntry.class),
             @MCRTestProperty(key = "Foo.23.PropertyA", string = "Value23"),
-            @MCRTestProperty(key = "Foo.42", classNameOf = OtherKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.42.Class", classNameOf = OtherKindOfEntry.class),
             @MCRTestProperty(key = "Foo.42.PropertyB", string = "Value42"),
         })
     public void nestedOptionalList() {
 
-        TestClassWithOptionalNestedList instance = ofName(TestClassWithOptionalNestedList.class, "Foo").instantiate();
+        TestClassWithOptionalNestedList instance = ofName(TestClassWithOptionalNestedList.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -492,11 +502,12 @@ public void nestedOptionalList() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithOptionalNestedList.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithOptionalNestedList.class),
         })
     public void nestedOptionalListNotPresent() {
 
-        TestClassWithOptionalNestedList instance = ofName(TestClassWithOptionalNestedList.class, "Foo").instantiate();
+        TestClassWithOptionalNestedList instance = ofName(TestClassWithOptionalNestedList.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -507,21 +518,21 @@ public void nestedOptionalListNotPresent() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedListAndSentinel.class),
-            @MCRTestProperty(key = "Foo.7", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedListAndSentinel.class),
+            @MCRTestProperty(key = "Foo.7.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.7.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.7.Property", string = "Value7"),
-            @MCRTestProperty(key = "Foo.23", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.23.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.23.Sentinel", string = "true"),
             @MCRTestProperty(key = "Foo.23.Property", string = "Value23"),
-            @MCRTestProperty(key = "Foo.42", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.42.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.42.Property", string = "Value42"),
 
         })
     public void nestedListWithSentinel() {
 
-        TestClassWithNestedListAndSentinel instance =
-            ofName(TestClassWithNestedListAndSentinel.class, "Foo").instantiate();
+        TestClassWithNestedListAndSentinel instance = ofName(TestClassWithNestedListAndSentinel.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
@@ -535,16 +546,16 @@ public void nestedListWithSentinel() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedListsWithPrefix.class),
-            @MCRTestProperty(key = "Foo.List1.23", classNameOf = OneKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedListsWithPrefix.class),
+            @MCRTestProperty(key = "Foo.List1.23.Class", classNameOf = OneKindOfEntry.class),
             @MCRTestProperty(key = "Foo.List1.23.PropertyA", string = "Value23"),
-            @MCRTestProperty(key = "Foo.List2.42", classNameOf = OtherKindOfEntry.class),
+            @MCRTestProperty(key = "Foo.List2.42.Class", classNameOf = OtherKindOfEntry.class),
             @MCRTestProperty(key = "Foo.List2.42.PropertyB", string = "Value42"),
         })
     public void nestedListWithPrefix() {
 
-        TestClassWithNestedListsWithPrefix instance =
-            ofName(TestClassWithNestedListsWithPrefix.class, "Foo").instantiate();
+        TestClassWithNestedListsWithPrefix instance = ofName(TestClassWithNestedListsWithPrefix.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list1);
@@ -567,20 +578,21 @@ public void nestedListWithPrefix() {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithNestedListWithPrefixAndSentinel.class),
-            @MCRTestProperty(key = "Foo.List.7", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithNestedListWithPrefixAndSentinel.class),
+            @MCRTestProperty(key = "Foo.List.7.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.List.7.Sentinel", string = "false"),
             @MCRTestProperty(key = "Foo.List.7.Property", string = "Value7"),
-            @MCRTestProperty(key = "Foo.List.23", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.List.23.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.List.23.Sentinel", string = "true"),
             @MCRTestProperty(key = "Foo.List.23.Property", string = "Value23"),
-            @MCRTestProperty(key = "Foo.List.42", classNameOf = SimpleEntry.class),
+            @MCRTestProperty(key = "Foo.List.42.Class", classNameOf = SimpleEntry.class),
             @MCRTestProperty(key = "Foo.List.42.Property", string = "Value42"),
         })
     public void nestedListWithPrefixAndSentinel() {
 
         TestClassWithNestedListWithPrefixAndSentinel instance =
-            ofName(TestClassWithNestedListWithPrefixAndSentinel.class, "Foo").instantiate();
+            ofName(TestClassWithNestedListWithPrefixAndSentinel.class,
+                "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertNotNull(instance.list);
diff --git a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorProxyTest.java b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorProxyTest.java
index 9e744784bb..4e04b711a0 100644
--- a/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorProxyTest.java
+++ b/mycore-base/src/test/java/org/mycore/common/config/MCRInstantiatorProxyTest.java
@@ -37,13 +37,14 @@ public class MCRInstantiatorProxyTest {
     @Test
     @MCRTestConfiguration(
         properties = {
-            @MCRTestProperty(key = "Foo", classNameOf = TestClassWithConfigurationProxy.class),
+            @MCRTestProperty(key = "Foo.Class", classNameOf = TestClassWithConfigurationProxy.class),
             @MCRTestProperty(key = "Foo.Property1", string = "Value1"),
             @MCRTestProperty(key = "Foo.Property2", string = "Value2")
         })
     public void annotated() {
 
-        TestClassWithConfigurationProxy instance = ofName(TestClassWithConfigurationProxy.class, "Foo").instantiate();
+        TestClassWithConfigurationProxy instance = ofName(TestClassWithConfigurationProxy.class,
+            "Foo.Class").instantiate();
 
         assertNotNull(instance);
         assertEquals("Value1-Value2", instance.value());
diff --git a/mycore-classbrowser/src/main/java/org/mycore/frontend/servlets/MCRClassificationBrowser2.java b/mycore-classbrowser/src/main/java/org/mycore/frontend/servlets/MCRClassificationBrowser2.java
index dcd93bdf05..0087693fcd 100644
--- a/mycore-classbrowser/src/main/java/org/mycore/frontend/servlets/MCRClassificationBrowser2.java
+++ b/mycore-classbrowser/src/main/java/org/mycore/frontend/servlets/MCRClassificationBrowser2.java
@@ -65,7 +65,7 @@ public class MCRClassificationBrowser2 extends MCRServlet {
 
     protected MCRQueryAdapter getQueryAdapter(final String fieldName) {
         MCRQueryAdapter adapter = MCRConfiguration2.getInstanceOfOrThrow(MCRQueryAdapter.class,
-            "MCR.Module-classbrowser.QueryAdapter");
+            "MCR.Module-classbrowser.QueryAdapter.Class");
         adapter.setFieldName(fieldName);
         return adapter;
     }
diff --git a/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/json/GsonSerializationTest.java b/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/json/GsonSerializationTest.java
index 4c4e744f74..411da6885b 100644
--- a/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/json/GsonSerializationTest.java
+++ b/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/json/GsonSerializationTest.java
@@ -36,7 +36,7 @@ public class GsonSerializationTest {
     public void init() {
         final MCRConfigurationLoader configurationLoader = MCRConfigurationLoaderFactory.getConfigurationLoader();
         MCRConfigurationBase.initialize(configurationLoader.loadDeprecated(), configurationLoader.load(), true);
-        MCRConfiguration2.set("MCR.Category.DAO", CategoryDAOMock.class.getName());
+        MCRConfiguration2.set("MCR.Category.DAO.Class", CategoryDAOMock.class.getName());
     }
 
     protected MCRCategoryImpl createCateg(String rootID, String id2, String text) {
diff --git a/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/json/MCRCategoryJsonTest.java b/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/json/MCRCategoryJsonTest.java
index 53df5e28a3..e99e77046b 100644
--- a/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/json/MCRCategoryJsonTest.java
+++ b/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/json/MCRCategoryJsonTest.java
@@ -33,7 +33,7 @@
 @MCRTestConfiguration(
     properties = {
         @MCRTestProperty(key = "MCR.Metadata.DefaultLang", string = "de"),
-        @MCRTestProperty(key = "MCR.Category.DAO", classNameOf = CategoryDAOMock.class)
+        @MCRTestProperty(key = "MCR.Category.DAO.Class", classNameOf = CategoryDAOMock.class)
     })
 @MyCoReTest
 public class MCRCategoryJsonTest {
diff --git a/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/resources/MCRClassificationEditorResourceTest.java b/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/resources/MCRClassificationEditorResourceTest.java
index ee191edad6..d063daa220 100644
--- a/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/resources/MCRClassificationEditorResourceTest.java
+++ b/mycore-classeditor/src/test/java/org/mycore/frontend/classeditor/resources/MCRClassificationEditorResourceTest.java
@@ -68,8 +68,8 @@
     @MCRTestProperty(key = "MCR.IFS2.Store.ClasseditorTempStore.SlotLayout", string = "4-2-2"),
     @MCRTestProperty(key = "MCR.EventHandler.MCRObject.2.Class", classNameOf = MCRXMLMetadataEventHandler.class),
     @MCRTestProperty(key = "MCR.Persistence.LinkTable.Store.Class", classNameOf = LinkTableStoreMock.class),
-    @MCRTestProperty(key = "MCR.Category.DAO", classNameOf = CategoryDAOMock.class),
-    @MCRTestProperty(key = "MCR.Category.LinkService", classNameOf = CategoryLinkServiceMock.class),
+    @MCRTestProperty(key = "MCR.Category.DAO.Class", classNameOf = CategoryDAOMock.class),
+    @MCRTestProperty(key = "MCR.Category.LinkService.Class", classNameOf = CategoryLinkServiceMock.class),
     @MCRTestProperty(key = "MCR.Access.Class", classNameOf = MCRAccessBaseImpl.class),
     @MCRTestProperty(key = "MCR.Access.Cache.Size", string = "200")
 })
diff --git a/mycore-cronjob/src/main/resources/components/cronjob/config/deprecated.properties b/mycore-cronjob/src/main/resources/components/cronjob/config/deprecated.properties
new file mode 100644
index 0000000000..af75d3fd11
--- /dev/null
+++ b/mycore-cronjob/src/main/resources/components/cronjob/config/deprecated.properties
@@ -0,0 +1 @@
+MCR.Cronjob.Jobs.(\S+)=MCR.Cronjob.Jobs.$1.Class
diff --git a/mycore-csl/src/main/java/org/mycore/csl/MCRCSLTransformer.java b/mycore-csl/src/main/java/org/mycore/csl/MCRCSLTransformer.java
index 2dfe619636..a9b3c6c9b2 100644
--- a/mycore-csl/src/main/java/org/mycore/csl/MCRCSLTransformer.java
+++ b/mycore-csl/src/main/java/org/mycore/csl/MCRCSLTransformer.java
@@ -48,7 +48,7 @@ public class MCRCSLTransformer extends MCRParameterizedTransformer {
 
     public static final String DEFAULT_STYLE = "nature";
 
-    public static final String ITEM_PROVIDER = "ItemProviderClass";
+    public static final String ITEM_PROVIDER = "ItemProvider.Class";
 
     private static final String CONFIG_PREFIX = "MCR.ContentTransformer.";
 
diff --git a/mycore-csl/src/main/resources/components/csl/config/deprecated.properties b/mycore-csl/src/main/resources/components/csl/config/deprecated.properties
new file mode 100644
index 0000000000..5a41a9119c
--- /dev/null
+++ b/mycore-csl/src/main/resources/components/csl/config/deprecated.properties
@@ -0,0 +1 @@
+MCR.ContentTransformer.(\S+).ItemProviderClass=MCR.ContentTransformer.$1.ItemProvider.Class
diff --git a/mycore-csl/src/main/resources/components/csl/config/mycore.properties b/mycore-csl/src/main/resources/components/csl/config/mycore.properties
index 9dc32363b6..7945560695 100644
--- a/mycore-csl/src/main/resources/components/csl/config/mycore.properties
+++ b/mycore-csl/src/main/resources/components/csl/config/mycore.properties
@@ -6,13 +6,13 @@ MCR.CSL.DefaultLocale = en
 # MCR.ContentTransformer.mods2csl.Class=org.mycore.csl.MCRCSLTransformer
 # MCR.ContentTransformer.mods2csl.format=html | xml
 # MCR.ContentTransformer.mods2csl.style=elsevier-harvard
-# MCR.ContentTransformer.mods2csl.ItemProviderClass=org.mycore.mods.csl.MCRModsItemDataProvider
+# MCR.ContentTransformer.mods2csl.ItemProvider.Class=org.mycore.mods.csl.MCRModsItemDataProvider
 # MCR.ContentTransformer.mods2csl.MIMEType=text/html; charset\="UTF-8"
 #
 # via bibtex
 # MCR.ContentTransformer.cslFormatter.Class=org.mycore.csl.MCRCSLTransformer
 # MCR.ContentTransformer.cslFormatter.format=html
 # MCR.ContentTransformer.cslFormatter.style=elsevier-harvard
-# MCR.ContentTransformer.cslFormatter.ItemProviderClass=org.mycore.csl.MCRBibtextItemDataProvider
+# MCR.ContentTransformer.cslFormatter.ItemProvider.Class=org.mycore.csl.MCRBibtextItemDataProvider
 # MCR.ContentTransformer.mods2csl.Class=org.mycore.common.content.transformer.MCRTransformerPipe
 # MCR.ContentTransformer.mods2csl.Steps=bibmods, mods2bibtex, cslFormatter
diff --git a/mycore-fo/src/main/java/org/mycore/component/fo/common/fo/MCRFoFormatterHelper.java b/mycore-fo/src/main/java/org/mycore/component/fo/common/fo/MCRFoFormatterHelper.java
index b1593e26b2..4040a0ef07 100644
--- a/mycore-fo/src/main/java/org/mycore/component/fo/common/fo/MCRFoFormatterHelper.java
+++ b/mycore-fo/src/main/java/org/mycore/component/fo/common/fo/MCRFoFormatterHelper.java
@@ -23,7 +23,7 @@
 /**
  * Returns the XSL-FO formatter instance configured via PROPERTY, for example
  * 
- * MCR.LayoutService.FoFormatter.class=org.mycore.common.fo.MCRFoFormatterFOP
+ * MCR.LayoutService.FoFormatter.Class=org.mycore.common.fo.MCRFoFormatterFOP
  * 
  * (which is the default using Apache FOP)
  * 
@@ -34,7 +34,7 @@
 public class MCRFoFormatterHelper {
 
     /** The configuration PROPERTY */
-    private static final String PROPERTY = "MCR.LayoutService.FoFormatter.class";
+    private static final String PROPERTY = "MCR.LayoutService.FoFormatter.Class";
 
     /** The singleton */
     private static MCRFoFormatterInterface formatter;
diff --git a/mycore-fo/src/main/resources/components/fo/config/deprecated.properties b/mycore-fo/src/main/resources/components/fo/config/deprecated.properties
new file mode 100644
index 0000000000..2408fe57e1
--- /dev/null
+++ b/mycore-fo/src/main/resources/components/fo/config/deprecated.properties
@@ -0,0 +1 @@
+MCR.LayoutService.FoFormatter.class=MCR.LayoutService.FoFormatter.Class
diff --git a/mycore-fo/src/main/resources/components/fo/config/mycore.properties b/mycore-fo/src/main/resources/components/fo/config/mycore.properties
index 1fee8716bf..25bc06f38a 100644
--- a/mycore-fo/src/main/resources/components/fo/config/mycore.properties
+++ b/mycore-fo/src/main/resources/components/fo/config/mycore.properties
@@ -3,10 +3,10 @@
 ##############################################################################
 
 # Define the LayoutFactory class extended for FO
-MCR.Layout.Transformer.Factory=org.mycore.component.fo.common.content.xml.MCRLayoutTransformerFoFactory
+MCR.Layout.Transformer.Factory.Class=org.mycore.component.fo.common.content.xml.MCRLayoutTransformerFoFactory
 
 # Class that implements MCRFoFormatterInterface
-MCR.LayoutService.FoFormatter.class=org.mycore.component.fo.common.fo.MCRFoFormatterFOP
+MCR.LayoutService.FoFormatter.Class=org.mycore.component.fo.common.fo.MCRFoFormatterFOP
 # Configuration file for FOP in classpath
 MCR.LayoutService.FoFormatter.FOP.config=
 
diff --git a/mycore-iiif/src/main/java/org/mycore/iiif/image/impl/MCRIIIFImageImpl.java b/mycore-iiif/src/main/java/org/mycore/iiif/image/impl/MCRIIIFImageImpl.java
index 72ba58ca03..10044642e4 100644
--- a/mycore-iiif/src/main/java/org/mycore/iiif/image/impl/MCRIIIFImageImpl.java
+++ b/mycore-iiif/src/main/java/org/mycore/iiif/image/impl/MCRIIIFImageImpl.java
@@ -56,7 +56,7 @@ public static synchronized MCRIIIFImageImpl obtainInstance(String implNameParame
             return IMPLHOLDER.get(implName);
         }
 
-        String classPropertyName = MCR_IIIF_IMAGE_CONFIG_PREFIX + implName;
+        String classPropertyName = MCR_IIIF_IMAGE_CONFIG_PREFIX + implName + ".Class";
         Class<? extends MCRIIIFImageImpl> classObject = MCRConfiguration2.<MCRIIIFImageImpl>getClass(classPropertyName)
             .orElseThrow(() -> MCRConfiguration2.createConfigurationException(classPropertyName));
 
diff --git a/mycore-iview2/src/main/java/org/mycore/iview2/frontend/MCRTileServlet.java b/mycore-iview2/src/main/java/org/mycore/iview2/frontend/MCRTileServlet.java
index 86e859d6c3..d4f51485ed 100644
--- a/mycore-iview2/src/main/java/org/mycore/iview2/frontend/MCRTileServlet.java
+++ b/mycore-iview2/src/main/java/org/mycore/iview2/frontend/MCRTileServlet.java
@@ -56,7 +56,7 @@ public class MCRTileServlet extends HttpServlet {
     private static final Logger LOGGER = LogManager.getLogger();
 
     private static final MCRTileFileProvider TFP = MCRConfiguration2.getInstanceOfOrThrow(
-        MCRDefaultTileFileProvider.class, "MCR.IIIFImage.Iview.TileFileProvider");
+        MCRDefaultTileFileProvider.class, "MCR.IIIFImage.Iview.TileFileProvider.Class");
 
     /**
      * Extracts tile or image properties from iview2 file and transmits it.
diff --git a/mycore-iview2/src/main/java/org/mycore/iview2/services/MCRImageTiler.java b/mycore-iview2/src/main/java/org/mycore/iview2/services/MCRImageTiler.java
index 55348ad40a..5791c720eb 100644
--- a/mycore-iview2/src/main/java/org/mycore/iview2/services/MCRImageTiler.java
+++ b/mycore-iview2/src/main/java/org/mycore/iview2/services/MCRImageTiler.java
@@ -77,7 +77,7 @@ private MCRImageTiler() {
         runLock = new ReentrantLock();
         try {
             Class<? extends MCRTilingAction> tilingActionImpl = MCRConfiguration2.<MCRTilingAction>getClass(
-                MCRIView2Tools.CONFIG_PREFIX + "MCRTilingActionImpl").orElse(MCRTilingAction.class);
+                MCRIView2Tools.CONFIG_PREFIX + "MCRTilingActionImpl.Class").orElse(MCRTilingAction.class);
             tilingActionConstructor = tilingActionImpl.getConstructor(MCRTileJob.class);
         } catch (Exception e) {
             LOGGER.error("Error while initializing", e);
diff --git a/mycore-iview2/src/main/java/org/mycore/iview2/services/MCRTilingAction.java b/mycore-iview2/src/main/java/org/mycore/iview2/services/MCRTilingAction.java
index 936e4e018c..2e326bdf0c 100644
--- a/mycore-iview2/src/main/java/org/mycore/iview2/services/MCRTilingAction.java
+++ b/mycore-iview2/src/main/java/org/mycore/iview2/services/MCRTilingAction.java
@@ -43,7 +43,7 @@
  * <p>
  * This class can be extended. Any extending class should provide and implementation for {@link #getMCRImage()}.
  * To get the extending class invoked, one need to define a MyCoRe property, which defaults to:
- * <code>MCR.Module-iview2.MCRTilingActionImpl=org.mycore.iview2.services.MCRTilingAction</code>
+ * <code>MCR.Module-iview2.MCRTilingActionImpl.Class=org.mycore.iview2.services.MCRTilingAction</code>
  * @author Thomas Scheffler (yagee)
  *
  */
diff --git a/mycore-iview2/src/main/resources/components/iview2/config/deprecated.properties b/mycore-iview2/src/main/resources/components/iview2/config/deprecated.properties
index 653118280a..5dbb9c0670 100644
--- a/mycore-iview2/src/main/resources/components/iview2/config/deprecated.properties
+++ b/mycore-iview2/src/main/resources/components/iview2/config/deprecated.properties
@@ -11,3 +11,7 @@ MCR.Module-iview2.PDFCreatorURI=MCR.Viewer.PDFCreatorURI
 MCR.Module-iview2.text.enabled=MCR.Viewer.text.enabled
 MCR.Module-iview2.pdfProviderURL=MCR.Viewer.pdfProviderURL
 MCR.Module-iview2.MCRIviewACLProvider=MCR.Viewer.MCRIviewACLProvider
+MCR.IIIFImage.Iview=MCR.IIIFImage.Iview.Class
+MCR.IIIFImage.Iview.TileFileProvider=MCR.IIIFImage.Iview.TileFileProvider.Class
+MCR.IIIFImage.thumbnail=MCR.IIIFImage.thumbnail.Class
+MCR.Module-iview2.MCRIView2XSLFunctionsAdapter=MCR.Module-iview2.MCRIView2XSLFunctionsAdapter.Class
diff --git a/mycore-iview2/src/main/resources/components/iview2/config/mycore.properties b/mycore-iview2/src/main/resources/components/iview2/config/mycore.properties
index 2d36aa75c1..33b21057e2 100644
--- a/mycore-iview2/src/main/resources/components/iview2/config/mycore.properties
+++ b/mycore-iview2/src/main/resources/components/iview2/config/mycore.properties
@@ -5,7 +5,7 @@
 ### handle creating and removing cache files
 MCR.EventHandler.MCRPath.020.Class=org.mycore.iview2.events.MCRImageTileEventHandler
 
-MCR.Module-iview2.MCRIView2XSLFunctionsAdapter=org.mycore.iview2.frontend.MCRIView2XSLFunctionsAdapter
+MCR.Module-iview2.MCRIView2XSLFunctionsAdapter.Class=org.mycore.iview2.frontend.MCRIView2XSLFunctionsAdapter
 
 ### content types that shall be displayed by iview
 MCR.Module-iview2.SupportedContentTypes=image/tiff,image/jpeg,image/jp2,image/png,image/gif,image/bmp,image/x-windows-bmp
@@ -37,18 +37,18 @@ MCR.LayoutTransformerFactory.Default.Ignore=%MCR.LayoutTransformerFactory.Defaul
 MCR.IIIFImage.Default=Iview
 
 # the iview2 impl of IIIF Image
-MCR.IIIFImage.Iview=org.mycore.iview2.iiif.MCRIVIEWIIIFImageImpl
+MCR.IIIFImage.Iview.Class=org.mycore.iview2.iiif.MCRIVIEWIIIFImageImpl
 # 1gb default size of images
 MCR.IIIFImage.Iview.MaxImageBytes=1073741824
 MCR.IIIFImage.Iview.TransparentFormats=png
 
-MCR.IIIFImage.thumbnail=org.mycore.iview2.iiif.MCRThumbnailImageImpl
+MCR.IIIFImage.thumbnail.Class=org.mycore.iview2.iiif.MCRThumbnailImageImpl
 # 1024*1024*3
 MCR.IIIFImage.thumbnail.MaxImageBytes=3145728
 MCR.IIIFImage.thumbnail.TransparentFormats=png
 MCR.IIIFImage.thumbnail.Derivate.Types=derivate_types:thumbnail,derivate_types:content
 
-MCR.IIIFImage.Iview.TileFileProvider=org.mycore.iview2.backend.MCRDefaultTileFileProvider
+MCR.IIIFImage.Iview.TileFileProvider.Class=org.mycore.iview2.backend.MCRDefaultTileFileProvider
 MCR.IIIFImage.Iview.ThumbnailForPdfEventHandler.Derivate.Types=derivate_types:content
 MCR.EventHandler.MCRDerivate.080.Class=org.mycore.iview2.events.MCRThumbnailForPdfEventHandler
 MCR.Media.Thumbnail.Generators=%MCR.Media.Thumbnail.Generators%,org.mycore.iview2.services.MCRImageThumbnailGenerator
diff --git a/mycore-jobqueue/src/main/resources/components/jobqueue/config/mycore.properties b/mycore-jobqueue/src/main/resources/components/jobqueue/config/mycore.properties
index 1fd776b11e..91678cbe17 100644
--- a/mycore-jobqueue/src/main/resources/components/jobqueue/config/mycore.properties
+++ b/mycore-jobqueue/src/main/resources/components/jobqueue/config/mycore.properties
@@ -43,11 +43,11 @@ MCR.QueuedJob.Cleaner.Selectors.finishedOrdinaryJobs.Statuses=FINISHED
 MCR.QueuedJob.Cleaner.Selectors.finishedOrdinaryJobs.AgeDays=1
 MCR.QueuedJob.OrdinaryJobs=%MCR.QueuedJob.OrdinaryJobs%,org.mycore.services.queuedjob.staticcontent.MCRStaticContentGeneratorJobAction
 
-MCR.Cronjob.Jobs.QueuedJobCleaner=org.mycore.mcr.cronjob.MCRCommandCronJob
+MCR.Cronjob.Jobs.QueuedJobCleaner.Class=org.mycore.mcr.cronjob.MCRCommandCronJob
 MCR.Cronjob.Jobs.QueuedJobCleaner.Command=clean job queue
 MCR.Cronjob.Jobs.QueuedJobCleaner.Cron=42 23 * * *
 MCR.Cronjob.Jobs.QueuedJobCleaner.User=system:JANITOR
 MCR.Cronjob.Jobs.QueuedJobCleaner.Enabled=true
 
-MCR.Cronjob.Jobs.QueuedJobResetter=org.mycore.services.queuedjob.MCRJobResetter
+MCR.Cronjob.Jobs.QueuedJobResetter.Class=org.mycore.services.queuedjob.MCRJobResetter
 MCR.Cronjob.Jobs.QueuedJobResetter.Cron=*/3 * * * *
diff --git a/mycore-jsessions/src/main/resources/components/jsessions/config/mycore.properties b/mycore-jsessions/src/main/resources/components/jsessions/config/mycore.properties
index 43508eafc1..55454eb346 100644
--- a/mycore-jsessions/src/main/resources/components/jsessions/config/mycore.properties
+++ b/mycore-jsessions/src/main/resources/components/jsessions/config/mycore.properties
@@ -1,6 +1,6 @@
 MCR.CLI.Classes.Internal=%MCR.CLI.Classes.Internal%,org.mycore.jsessions.MCRSessionCommands
 
-MCR.Cronjob.Jobs.InvalidateSingleHitSessions=org.mycore.mcr.cronjob.MCRCommandCronJob
+MCR.Cronjob.Jobs.InvalidateSingleHitSessions.Class=org.mycore.mcr.cronjob.MCRCommandCronJob
 MCR.Cronjob.Jobs.InvalidateSingleHitSessions.Command=invalidate single hit HTTP guest sessions idle for more than 5 minutes
 MCR.Cronjob.Jobs.InvalidateSingleHitSessions.Cron=* * * * *
 MCR.Cronjob.Jobs.InvalidateSingleHitSessions.User=system:JANITOR
diff --git a/mycore-mets/src/main/java/org/mycore/mets/model/MCRMETSGeneratorFactory.java b/mycore-mets/src/main/java/org/mycore/mets/model/MCRMETSGeneratorFactory.java
index d36df2e8c1..5dbd8a26cf 100644
--- a/mycore-mets/src/main/java/org/mycore/mets/model/MCRMETSGeneratorFactory.java
+++ b/mycore-mets/src/main/java/org/mycore/mets/model/MCRMETSGeneratorFactory.java
@@ -30,7 +30,6 @@
 import org.jdom2.Document;
 import org.jdom2.JDOMException;
 import org.jdom2.input.SAXBuilder;
-import org.mycore.common.MCRClassTools;
 import org.mycore.common.MCRException;
 import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.datamodel.niofs.MCRPath;
@@ -38,7 +37,7 @@
 /**
  * Factory to create mets generator's. By default, this class uses the property 'MCR.Component.MetsMods.Generator' to
  * determine which generator is chosen. You can use either use {@link #setSelector(MCRMETSGeneratorSelector)} to add
- * your own selector or use the property 'MCR.Component.MetsMods.Generator.Selector'.
+ * your own selector or use the property 'MCR.Component.MetsMods.Generator.Selector.Class'.
  *
  * @author Matthias Eichner
  */
@@ -49,21 +48,13 @@ public final class MCRMETSGeneratorFactory {
     private static boolean ignoreMetsXml;
 
     static {
+
+        generatorSelector = MCRConfiguration2.getInstanceOfOrThrow(MCRMETSGeneratorSelector.class,
+            "MCR.Component.MetsMods.Generator.Selector.Class");
+
         // ignore mets.xml of the derivate by default
         ignoreMetsXml = true;
 
-        // get selector
-        Class<? extends MCRMETSGeneratorSelector> cn = MCRConfiguration2.<MCRMETSPropertyGeneratorSelector>getClass(
-            "MCR.Component.MetsMods.Generator.Selector").orElse(MCRMETSPropertyGeneratorSelector.class);
-        try {
-            generatorSelector = cn.getDeclaredConstructor().newInstance();
-        } catch (Exception cause) {
-            generatorSelector = new MCRMETSPropertyGeneratorSelector();
-            throw new MCRException(
-                "Unable to instantiate " + cn + ". Please check the 'MCR.Component.MetsMods.Generator.Selector'."
-                    + " Using default MCRMETSPropertyGeneratorSelector.",
-                cause);
-        }
     }
 
     private MCRMETSGeneratorFactory() {
@@ -170,22 +161,12 @@ public interface MCRMETSGeneratorSelector {
      */
     public static class MCRMETSPropertyGeneratorSelector implements MCRMETSGeneratorSelector {
 
-        private static Class<? extends MCRMETSGenerator> metsGeneratorClass;
-
         @Override
         public MCRMETSGenerator get(MCRPath derivatePath) {
-            String cn = MCRConfiguration2.getString("MCR.Component.MetsMods.Generator")
-                .orElse(MCRMETSDefaultGenerator.class.getName());
-            try {
-                if (metsGeneratorClass == null || !cn.equals(metsGeneratorClass.getName())) {
-                    metsGeneratorClass = MCRClassTools.forName(cn);
-                }
-                return metsGeneratorClass.getDeclaredConstructor().newInstance();
-            } catch (Exception cause) {
-                throw new MCRException("Unable to instantiate " + cn
-                    + ". Please check the 'MCR.Component.MetsMods.Generator' property'.", cause);
-            }
+            return MCRConfiguration2.getInstanceOfOrThrow(MCRMETSGenerator.class,
+                "MCR.Component.MetsMods.Generator.Class");
         }
+
     }
 
 }
diff --git a/mycore-mets/src/main/resources/components/mets/config/deprecated.properties b/mycore-mets/src/main/resources/components/mets/config/deprecated.properties
new file mode 100644
index 0000000000..1eac84f36d
--- /dev/null
+++ b/mycore-mets/src/main/resources/components/mets/config/deprecated.properties
@@ -0,0 +1,2 @@
+MCR.Component.MetsMods.Generator.Selector=MCR.Component.MetsMods.Generator.Selector.Class
+MCR.Component.MetsMods.Generator=MCR.Component.MetsMods.Generator.Class
diff --git a/mycore-mets/src/main/resources/components/mets/config/mycore.properties b/mycore-mets/src/main/resources/components/mets/config/mycore.properties
index bc37fe3d55..be2e37ac9f 100644
--- a/mycore-mets/src/main/resources/components/mets/config/mycore.properties
+++ b/mycore-mets/src/main/resources/components/mets/config/mycore.properties
@@ -33,8 +33,8 @@
   MCR.Solr.Indexer.File.AccumulatorList=%MCR.Solr.Indexer.File.AccumulatorList%,org.mycore.mets.solr.MCRSolrAltoExtractor,org.mycore.mets.solr.MCRMetsFileIndexAccumulator
 
 # mets generation
-MCR.Component.MetsMods.Generator.Selector=org.mycore.mets.model.MCRMETSGeneratorFactory$MCRMETSPropertyGeneratorSelector
-MCR.Component.MetsMods.Generator=org.mycore.mets.model.MCRMETSDefaultGenerator
+MCR.Component.MetsMods.Generator.Class=org.mycore.mets.model.MCRMETSDefaultGenerator
+MCR.Component.MetsMods.Generator.Selector.Class=org.mycore.mets.model.MCRMETSGeneratorFactory$MCRMETSPropertyGeneratorSelector
 
 # used to detect which translation languages are allowed (mets-generation) (default values de, en)
 MCR.METS.Allowed.Translation.Subfolder=de,en
diff --git a/mycore-mets/src/test/java/org/mycore/mets/model/MCRMETSGeneratorFactoryTest.java b/mycore-mets/src/test/java/org/mycore/mets/model/MCRMETSGeneratorFactoryTest.java
index e97f0095eb..c8a12be790 100644
--- a/mycore-mets/src/test/java/org/mycore/mets/model/MCRMETSGeneratorFactoryTest.java
+++ b/mycore-mets/src/test/java/org/mycore/mets/model/MCRMETSGeneratorFactoryTest.java
@@ -22,13 +22,15 @@
 
 import org.junit.jupiter.api.Test;
 import org.mycore.common.config.MCRConfiguration2;
+import org.mycore.test.MyCoReTest;
 
+@MyCoReTest
 public class MCRMETSGeneratorFactoryTest {
 
     @Test
     public void getGenerator() {
         // prepare config
-        MCRConfiguration2.set("MCR.Component.MetsMods.Generator", TestGenerator.class.getName());
+        MCRConfiguration2.set("MCR.Component.MetsMods.Generator.Class", TestGenerator.class.getName());
         // check getGenerator
         MCRMETSGenerator generator = MCRMETSGeneratorFactory.create(null);
         assertInstanceOf(TestGenerator.class, generator);
diff --git a/mycore-migration/src/main/java/org/mycore/migration/cli/MCRMigrationCommands.java b/mycore-migration/src/main/java/org/mycore/migration/cli/MCRMigrationCommands.java
index 54549a825a..057947b680 100644
--- a/mycore-migration/src/main/java/org/mycore/migration/cli/MCRMigrationCommands.java
+++ b/mycore-migration/src/main/java/org/mycore/migration/cli/MCRMigrationCommands.java
@@ -87,7 +87,7 @@ public class MCRMigrationCommands {
 
     private static final Logger LOGGER = LogManager.getLogger();
 
-    public static final String CHILDREN_ORDER_STRATEGY_PROPERTY = "MCR.Migration.ChildrenOrder.Strategy";
+    public static final String CHILDREN_ORDER_STRATEGY_PROPERTY = "MCR.Migration.ChildrenOrder.Strategy.Class";
 
     public static final String MIGRATE_NORMALIZED_OBJECT = "migrate to normalized object {0}";
     public static final String MIGRATE_NORMALIZED_OBJECT_VERSION = "migrate svn store to normalized versioned objects";
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..0b09296556 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
@@ -91,7 +91,7 @@ public boolean isSupported(MCRObject object) {
     @Override
     protected Stream<MCRCategory> getCategories(MCRCategoryDAO dao, MCRObject object) {
         return new MCRMODSWrapper(object).getMcrCategoryIDs().stream()
-            .map(categoryId -> dao.getCategory(categoryId, 0));
+                .map(categoryId -> dao.getCategory(categoryId, 0));
     }
 
     public static class Factory implements Supplier<MCRMODSXMappingClassificationGenerator> {
diff --git a/mycore-mods/src/main/java/org/mycore/mods/merger/MCRMergerFactory.java b/mycore-mods/src/main/java/org/mycore/mods/merger/MCRMergerFactory.java
index 93a2f0b901..c91ab23d1e 100644
--- a/mycore-mods/src/main/java/org/mycore/mods/merger/MCRMergerFactory.java
+++ b/mycore-mods/src/main/java/org/mycore/mods/merger/MCRMergerFactory.java
@@ -26,8 +26,8 @@
  * Since MODS elements need to be compared and merged differently, the factory returns
  * different merger implementations for different element types.
  * <p>
- * MCR.MODS.Merger.default=[Default class to merge MODS, typically MCRMerger]
- * MCR.MODS.Merger.[elementName]=[Specific implementation by element name]
+ * MCR.MODS.Merger.default.Class=[Default class to merge MODS, typically MCRMerger]
+ * MCR.MODS.Merger.[elementName].Class=[Specific implementation by element name]
  *
  * @author Frank Lützenkirchen
  */
@@ -39,8 +39,8 @@ public class MCRMergerFactory {
      * Returns an MCRMerger instance usable for merging MODS elements with the given name
      */
     private static MCRMerger getEntryInstance(String name) {
-        return MCRConfiguration2.getInstanceOf(MCRMerger.class, CONFIG_PREFIX + name)
-            .orElseGet(() -> MCRConfiguration2.getInstanceOfOrThrow(MCRMerger.class, CONFIG_PREFIX + "default"));
+        return MCRConfiguration2.getInstanceOf(MCRMerger.class, CONFIG_PREFIX + name + ".Class")
+            .orElseGet(() -> MCRConfiguration2.getInstanceOfOrThrow(MCRMerger.class, CONFIG_PREFIX + "default.Class"));
     }
 
     /**
diff --git a/mycore-mods/src/main/resources/components/mods/config/deprecated.properties b/mycore-mods/src/main/resources/components/mods/config/deprecated.properties
index 96beff1487..b6cec3e857 100644
--- a/mycore-mods/src/main/resources/components/mods/config/deprecated.properties
+++ b/mycore-mods/src/main/resources/components/mods/config/deprecated.properties
@@ -1 +1,3 @@
 MCR.MODS.Embargo.Job.Schedule.WaitInMinutes=MCR.Cronjob.Jobs.MODSEmbargoRelease.Cron
+MCR.Persistence.LinkProvider.Impl.(\S+)=MCR.Persistence.LinkProvider.Impl.$1.Class
+MCR.MODS.Merger.(\S+)=MCR.MODS.Merger.$1.Class
diff --git a/mycore-mods/src/main/resources/components/mods/config/mycore.properties b/mycore-mods/src/main/resources/components/mods/config/mycore.properties
index 92e538fb79..ffe4de8e31 100644
--- a/mycore-mods/src/main/resources/components/mods/config/mycore.properties
+++ b/mycore-mods/src/main/resources/components/mods/config/mycore.properties
@@ -88,12 +88,12 @@ MCR.URIResolver.redirect.editor-mods-external=webapp:editor/editor-mods-external
 MCR.URIResolver.ModuleResolver.sort=org.mycore.mods.MCRMODSSorter
 
 # validation
-MCR.Metadata.Validator.mods.loop.class=org.mycore.mods.MCRMODSLoopValidator
+MCR.Metadata.Validator.mods.loop.Class=org.mycore.mods.MCRMODSLoopValidator
 
 # normalization
-MCR.Metadata.Normalizer.mods.InheritedMetadata=org.mycore.mods.MCRMODSInheritedMetadataNormalizer
-MCR.Metadata.Normalizer.mods.SortElements=org.mycore.mods.MCRMODSSortElementsMetadataNormalizer
-MCR.Metadata.Normalizer.mods.RemoveGeneratedClasses=org.mycore.mods.MCRMODSClassificationMappingNormalizer
+MCR.Metadata.Normalizer.mods.InheritedMetadata.Class=org.mycore.mods.MCRMODSInheritedMetadataNormalizer
+MCR.Metadata.Normalizer.mods.SortElements.Class=org.mycore.mods.MCRMODSSortElementsMetadataNormalizer
+MCR.Metadata.Normalizer.mods.RemoveGeneratedClasses.Class=org.mycore.mods.MCRMODSClassificationMappingNormalizer
 
 # expander
 MCR.ObjectExpander.Impl.mods.Class=org.mycore.mods.MCRMODSExpander
@@ -111,7 +111,7 @@ MCR.ObjectExpander.Impl.mods.ClassificationMapper.Generators.xPath.Enabled=true
 MCR.ObjectExpander.Impl.mods.ClassificationMapper.Generators.xPath.ClassificationIds=%MCR.Category.XPathMapping.ClassIDs%
 
 # link table
-MCR.Persistence.LinkProvider.Impl.mods=org.mycore.mods.MCRMODSLinkProvider
+MCR.Persistence.LinkProvider.Impl.mods.Class=org.mycore.mods.MCRMODSLinkProvider
 
 # Enrichment Resolver
 MCR.URIResolver.ModuleResolver.enrich=org.mycore.mods.enrichment.MCREnrichmentResolver
@@ -130,33 +130,33 @@ MCR.Scopus.PartnerID=HzOxMe3b
 MCR.Scopus.Backlink=https://www.scopus.com/inward/record.url?partnerID=%UBO.Scopus.PartnerID%&origin=inward&scp=
 
 # MODS Merger
-MCR.MODS.Merger.titleInfo=org.mycore.mods.merger.MCRTitleInfoMerger
-MCR.MODS.Merger.name=org.mycore.mods.merger.MCRNameMerger
-MCR.MODS.Merger.namePart=org.mycore.mods.merger.MCRUniqueTypeMerger
-MCR.MODS.Merger.displayForm=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.originInfo=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.edition=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.place=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.publisher=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.dateIssued=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.dateModified=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.dateCreated=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.dateOther=org.mycore.mods.merger.MCRUniqueTypeMerger
-MCR.MODS.Merger.issuance=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.frequency=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.location=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.physicalDescription=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.part=org.mycore.mods.merger.MCRUniqueMerger
-MCR.MODS.Merger.detail=org.mycore.mods.merger.MCRUniqueTypeMerger
-MCR.MODS.Merger.extent=org.mycore.mods.merger.MCRExtentMerger
-MCR.MODS.Merger.identifier=org.mycore.mods.merger.MCRIdentifierMerger
-MCR.MODS.Merger.nameIdentifier=org.mycore.mods.merger.MCRIdentifierMerger
-MCR.MODS.Merger.abstract=org.mycore.mods.merger.MCRAbstractMerger
-MCR.MODS.Merger.relatedItem=org.mycore.mods.merger.MCRRelatedItemMerger
-MCR.MODS.Merger.classification=org.mycore.mods.merger.MCRCategoryMerger
-MCR.MODS.Merger.genre=org.mycore.mods.merger.MCRCategoryMerger
-MCR.MODS.Merger.typeOfResource=org.mycore.mods.merger.MCRCategoryMerger
-MCR.MODS.Merger.default=org.mycore.mods.merger.MCRMerger
+MCR.MODS.Merger.titleInfo.Class=org.mycore.mods.merger.MCRTitleInfoMerger
+MCR.MODS.Merger.name.Class=org.mycore.mods.merger.MCRNameMerger
+MCR.MODS.Merger.namePart.Class=org.mycore.mods.merger.MCRUniqueTypeMerger
+MCR.MODS.Merger.displayForm.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.originInfo.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.edition.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.place.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.publisher.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.dateIssued.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.dateModified.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.dateCreated.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.dateOther.Class=org.mycore.mods.merger.MCRUniqueTypeMerger
+MCR.MODS.Merger.issuance.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.frequency.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.location.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.physicalDescription.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.part.Class=org.mycore.mods.merger.MCRUniqueMerger
+MCR.MODS.Merger.detail.Class=org.mycore.mods.merger.MCRUniqueTypeMerger
+MCR.MODS.Merger.extent.Class=org.mycore.mods.merger.MCRExtentMerger
+MCR.MODS.Merger.identifier.Class=org.mycore.mods.merger.MCRIdentifierMerger
+MCR.MODS.Merger.nameIdentifier.Class=org.mycore.mods.merger.MCRIdentifierMerger
+MCR.MODS.Merger.abstract.Class=org.mycore.mods.merger.MCRAbstractMerger
+MCR.MODS.Merger.relatedItem.Class=org.mycore.mods.merger.MCRRelatedItemMerger
+MCR.MODS.Merger.classification.Class=org.mycore.mods.merger.MCRCategoryMerger
+MCR.MODS.Merger.genre.Class=org.mycore.mods.merger.MCRCategoryMerger
+MCR.MODS.Merger.typeOfResource.Class=org.mycore.mods.merger.MCRCategoryMerger
+MCR.MODS.Merger.default.Class=org.mycore.mods.merger.MCRMerger
 
 # Maximum number of characters to compare from two abstracts
 MCR.MODS.Merger.AbstractMerger.MaxCompareLength=500
@@ -165,10 +165,10 @@ MCR.MODS.Merger.AbstractMerger.MaxCompareLength=500
 MCR.MODS.Merger.AbstractMerger.MaxDistancePercent=5
 
 # MetadataService configuration for MyCoRe-PI
-MCR.PI.MetadataService.MODSURN=org.mycore.mods.identifier.MCRMODSURNMetadataService
-MCR.PI.MetadataService.MODSDOI=org.mycore.mods.identifier.MCRMODSDOIMetadataService
-MCR.PI.MetadataService.MODSPURL=org.mycore.mods.identifier.MCRMODSPURLMetadataService
-MCR.PI.MetadataService.MODSHDL=org.mycore.mods.identifier.MCRAbstractMODSMetadataService
+MCR.PI.MetadataService.MODSURN.Class=org.mycore.mods.identifier.MCRMODSURNMetadataService
+MCR.PI.MetadataService.MODSDOI.Class=org.mycore.mods.identifier.MCRMODSDOIMetadataService
+MCR.PI.MetadataService.MODSPURL.Class=org.mycore.mods.identifier.MCRMODSPURLMetadataService
+MCR.PI.MetadataService.MODSHDL.Class=org.mycore.mods.identifier.MCRAbstractMODSMetadataService
 MCR.PI.MetadataService.MODSHDL.Type=hdl
 
 MCR.MODS.Utils.shortenTitleLength=120
@@ -206,11 +206,11 @@ MCR.CSL.KnownUnmappedPersonRoles=ctb,his,hnr,ths,rev
 MCR.ContentTransformer.modsList2csl.Class=org.mycore.csl.MCRCSLTransformer
 MCR.ContentTransformer.modsList2csl.format=html
 MCR.ContentTransformer.modsList2csl.style=elsevier-harvard
-MCR.ContentTransformer.modsList2csl.ItemProviderClass=org.mycore.mods.csl.MCRListModsItemDataProvider
+MCR.ContentTransformer.modsList2csl.ItemProvider.Class=org.mycore.mods.csl.MCRListModsItemDataProvider
 MCR.ContentTransformer.modsList2csl.MIMEType=text/html; charset\="UTF-8"
 
 MCR.ContentTransformer.modsList2csljson.Class=org.mycore.csl.MCRCSLJSONTransformer
-MCR.ContentTransformer.modsList2csljson.ItemProviderClass=org.mycore.mods.csl.MCRListModsItemDataProvider
+MCR.ContentTransformer.modsList2csljson.ItemProvider.Class=org.mycore.mods.csl.MCRListModsItemDataProvider
 
 MCR.ContentTransformer.modsCsl-xhtml-pdf.Class=org.mycore.webtools.pdf.MCRXHTML2PDFTransformer
 MCR.ContentTransformer.modsCsl-xhtml-pdf.ContentDisposition=attachment
@@ -255,9 +255,9 @@ MCR.Export.CSL.Styles=ieee,apa,elsevier-harvard,springer-basic-author-date,din-1
 MCR.Export.CSL.Rows=500
 MCR.Export.Standalone.Rows=9999
 
-MCR.Access.Facts.Condition.collection=org.mycore.mods.access.facts.condition.MCRMODSCollectionCondition
-MCR.Access.Facts.Condition.genre=org.mycore.mods.access.facts.condition.MCRMODSGenreCondition
-MCR.Access.Facts.Condition.embargo=org.mycore.mods.access.facts.condition.MCRMODSEmbargoCondition
+MCR.Access.Facts.Condition.collection.Class=org.mycore.mods.access.facts.condition.MCRMODSCollectionCondition
+MCR.Access.Facts.Condition.genre.Class=org.mycore.mods.access.facts.condition.MCRMODSGenreCondition
+MCR.Access.Facts.Condition.embargo.Class=org.mycore.mods.access.facts.condition.MCRMODSEmbargoCondition
 
 # Migration from mods:extension @label to @type
 MCR.MODS.Migration.CovertLabelList=
diff --git a/mycore-mods/src/test/resources/mycore.properties b/mycore-mods/src/test/resources/mycore.properties
index 83ef0c6e96..447c7e7860 100644
--- a/mycore-mods/src/test/resources/mycore.properties
+++ b/mycore-mods/src/test/resources/mycore.properties
@@ -1,6 +1,6 @@
 TestFolder=MCREnrichmentTest
 
-MCR.Metadata.Validator.mods.loop.class=org.mycore.mods.MCRMODSLoopValidator
+MCR.Metadata.Validator.mods.loop.Class=org.mycore.mods.MCRMODSLoopValidator
 
 # testBasicEnrichment()
 
diff --git a/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jparser/MCRNeo4JMetaXMLParser.java b/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jparser/MCRNeo4JMetaXMLParser.java
index b1fa34f67c..542edcbffa 100644
--- a/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jparser/MCRNeo4JMetaXMLParser.java
+++ b/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jparser/MCRNeo4JMetaXMLParser.java
@@ -46,7 +46,7 @@ public class MCRNeo4JMetaXMLParser extends MCRNeo4JAbstractDataModelParser {
     private static final String CLASS_KEY = "MCRMetaXML";
 
     public MCRNeo4JMetaXMLParser() {
-        Map<String, String> propertiesMap = MCRConfiguration2.getSubPropertiesMap(NEO4J_CONFIG_PREFIX + "ParserClass.");
+        Map<String, String> propertiesMap = MCRConfiguration2.getSubPropertiesMap(NEO4J_CONFIG_PREFIX + "Parser.");
         parserMap = getMCRNeo4JInstantiatedParserMap(propertiesMap, CLASS_KEY);
     }
 
diff --git a/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jparser/MCRNeo4JParser.java b/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jparser/MCRNeo4JParser.java
index 3ceaf2d38b..5aad05acb6 100644
--- a/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jparser/MCRNeo4JParser.java
+++ b/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jparser/MCRNeo4JParser.java
@@ -57,10 +57,10 @@ public class MCRNeo4JParser implements MCRNeo4JMetaParser {
 
     private final Map<String, MCRNeo4JAbstractDataModelParser> parserMap;
 
-    private static final String CLASS_KEY = "BaseParser";
+    private static final String CLASS_KEY = "BaseParser.Class";
 
     public MCRNeo4JParser() {
-        Map<String, String> propertiesMap = MCRConfiguration2.getSubPropertiesMap(NEO4J_CONFIG_PREFIX + "ParserClass.");
+        Map<String, String> propertiesMap = MCRConfiguration2.getSubPropertiesMap(NEO4J_CONFIG_PREFIX + "Parser.");
         parserMap = getMCRNeo4JInstantiatedParserMap(propertiesMap, CLASS_KEY);
     }
 
diff --git a/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jutil/MCRNeo4JUtil.java b/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jutil/MCRNeo4JUtil.java
index 10efa0bd08..c50368f470 100644
--- a/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jutil/MCRNeo4JUtil.java
+++ b/mycore-neo4j/src/main/java/org/mycore/mcr/neo4j/datamodel/metadata/neo4jutil/MCRNeo4JUtil.java
@@ -115,8 +115,12 @@ public static Map<String, MCRNeo4JAbstractDataModelParser> getMCRNeo4JInstantiat
         propertiesMap.forEach((k, v) -> {
             // avoid loop instantiation
             if (!Objects.equals(k, filterClassKey)) {
-                parserMap.put(k, MCRConfiguration2.getInstanceOfOrThrow(MCRNeo4JAbstractDataModelParser.class,
-                    NEO4J_CONFIG_PREFIX + "ParserClass." + k));
+                String type = k;
+                if (k.endsWith(".Class") || k.endsWith(".class")) {
+                    type = k.substring(0, k.length() - ".Class".length());
+                }
+                parserMap.put(type, MCRConfiguration2.getInstanceOfOrThrow(MCRNeo4JAbstractDataModelParser.class,
+                    NEO4J_CONFIG_PREFIX + "Parser." + k));
             }
         });
         return parserMap;
diff --git a/mycore-neo4j/src/main/resources/components/neo4j/config/deprecated.properties b/mycore-neo4j/src/main/resources/components/neo4j/config/deprecated.properties
new file mode 100644
index 0000000000..403f934827
--- /dev/null
+++ b/mycore-neo4j/src/main/resources/components/neo4j/config/deprecated.properties
@@ -0,0 +1,2 @@
+MCR.Neo4J.MetaParser.ParserClass.BaseParser=MCR.Neo4J.MetaParser.Parser.BaseParser.Class
+MCR.Neo4J.ParserClass.(\S+)=MCR.Neo4J.ParserClass.$1.Class
diff --git a/mycore-neo4j/src/main/resources/components/neo4j/config/mycore.properties b/mycore-neo4j/src/main/resources/components/neo4j/config/mycore.properties
index aabdbf691c..3a16fee0b1 100644
--- a/mycore-neo4j/src/main/resources/components/neo4j/config/mycore.properties
+++ b/mycore-neo4j/src/main/resources/components/neo4j/config/mycore.properties
@@ -22,21 +22,21 @@
 # MCR.Neo4J.NodeAttribute.agent.firstDate=/mycoreobject/metadata/def.firstDate
 
 # MetaParser
-  MCR.Neo4J.MetaParser.ParserClass.BaseParser=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JParser
+  MCR.Neo4J.MetaParser.Parser.BaseParser.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JParser
 
 # DataModelParser
 # MyCore DataModel
-MCR.Neo4J.ParserClass.MCRMetaClassification=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaClassificationParser
-MCR.Neo4J.ParserClass.MCRMetaHistoryDate=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaHistoryDateParser
-MCR.Neo4J.ParserClass.MCRMetaISO8601Date=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaISO8601DateParser
-MCR.Neo4J.ParserClass.MCRMetaLangText=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaLangTextParser
-MCR.Neo4J.ParserClass.MCRMetaLinkID=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaLinkIDParser
+MCR.Neo4J.Parser.MCRMetaClassification.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaClassificationParser
+MCR.Neo4J.Parser.MCRMetaHistoryDate.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaHistoryDateParser
+MCR.Neo4J.Parser.MCRMetaISO8601Date.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaISO8601DateParser
+MCR.Neo4J.Parser.MCRMetaLangText.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaLangTextParser
+MCR.Neo4J.Parser.MCRMetaLinkID.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaLinkIDParser
 
 # MetaXMLParser
-MCR.Neo4J.ParserClass.MCRMetaXML=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaXMLParser
+MCR.Neo4J.ParserClass.MCRMetaXML.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaXMLParser
 
 # examples for MCRMetaXML content parser
-# MCR.Neo4J.ParserClass.MCRMetaXML.mods=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRMetaXMLModsParser
-# MCR.Neo4J.ParserClass.MCRMetaXML.record=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRMetaXMLRecordParser
+# MCR.Neo4J.ParserClass.MCRMetaXML.mods.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRMetaXMLModsParser
+# MCR.Neo4J.ParserClass.MCRMetaXML.record.Class=org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRMetaXMLRecordParser
 
 MCR.Neo4J.VISNetworkJSURL=/webjars/vis-network/9.1.2/dist/vis-network.js
diff --git a/mycore-neo4j/src/test/java/org/mycore/mcr/neo4j/parser/MCRNeo4JParserTest.java b/mycore-neo4j/src/test/java/org/mycore/mcr/neo4j/parser/MCRNeo4JParserTest.java
index 9e16eea245..d074f1271f 100644
--- a/mycore-neo4j/src/test/java/org/mycore/mcr/neo4j/parser/MCRNeo4JParserTest.java
+++ b/mycore-neo4j/src/test/java/org/mycore/mcr/neo4j/parser/MCRNeo4JParserTest.java
@@ -54,11 +54,11 @@ public void testParseMCRObject() throws Exception {
             "/mycoreobject/metadata/def.mss82");
         MCRConfiguration2.set("MCR.Neo4J.NodeAttribute.manuscript.signature",
             "/mycoreobject/metadata/def.mss02");
-        MCRConfiguration2.set("MCR.Neo4J.ParserClass.MCRMetaLangText",
+        MCRConfiguration2.set("MCR.Neo4J.Parser.MCRMetaLangText.Class",
             "org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaLangTextParser");
-        MCRConfiguration2.set("MCR.Neo4J.ParserClass.MCRMetaClassification",
+        MCRConfiguration2.set("MCR.Neo4J.Parser.MCRMetaClassification.Class",
             "org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaClassificationParser");
-        MCRConfiguration2.set("MCR.Neo4J.ParserClass.MCRMetaHistoryDate",
+        MCRConfiguration2.set("MCR.Neo4J.Parser.MCRMetaHistoryDate.Class",
             "org.mycore.mcr.neo4j.datamodel.metadata.neo4jparser.MCRNeo4JMetaHistoryDateParser");
 
         final MCRNeo4JParser parser = new MCRNeo4JParser();
diff --git a/mycore-oai/src/main/java/org/mycore/oai/MCROAIAdapter.java b/mycore-oai/src/main/java/org/mycore/oai/MCROAIAdapter.java
index 4b45f7982a..6d2bd16fb9 100644
--- a/mycore-oai/src/main/java/org/mycore/oai/MCROAIAdapter.java
+++ b/mycore-oai/src/main/java/org/mycore/oai/MCROAIAdapter.java
@@ -90,10 +90,10 @@ public void init(String baseURL, String oaiConfiguration) {
 
     public MCROAISetManager getSetManager() {
         if (this.setManager == null) {
-            String setManager = getConfigPrefix() + "SetManager";
+            String setManager = getConfigPrefix() + "SetManager.Class";
             this.setManager = MCRConfiguration2.getInstanceOf(MCROAISetManager.class, setManager)
                 .orElseGet(() -> MCRConfiguration2.getInstanceOfOrThrow(
-                    MCROAISetManager.class, PREFIX + "DefaultSetManager"));
+                    MCROAISetManager.class, PREFIX + "DefaultSetManager.Class"));
             int cacheMaxAge = MCRConfiguration2.getInt(this.configPrefix + "SetCache.MaxAge").orElse(0);
             this.setManager.init(getConfigPrefix(), cacheMaxAge);
         }
diff --git a/mycore-oai/src/main/java/org/mycore/oai/MCROAIDataProvider.java b/mycore-oai/src/main/java/org/mycore/oai/MCROAIDataProvider.java
index cd9ef8e5c4..f9bfac5139 100644
--- a/mycore-oai/src/main/java/org/mycore/oai/MCROAIDataProvider.java
+++ b/mycore-oai/src/main/java/org/mycore/oai/MCROAIDataProvider.java
@@ -171,10 +171,10 @@ private OAIAdapter getOAIAdapter() {
 
     private MCROAIAdapter createOAIAdapter(String oaiAdapterKey) {
         MCROAIAdapter oaiAdapter;
-        String adapter = MCROAIAdapter.PREFIX + oaiAdapterKey + ".Adapter";
+        String adapter = MCROAIAdapter.PREFIX + oaiAdapterKey + ".Adapter.Class";
         oaiAdapter = MCRConfiguration2.getInstanceOf(MCROAIAdapter.class, adapter)
             .orElseGet(() -> MCRConfiguration2.getInstanceOfOrThrow(
-                MCROAIAdapter.class, MCROAIAdapter.PREFIX + "DefaultAdapter"));
+                MCROAIAdapter.class, MCROAIAdapter.PREFIX + "DefaultAdapter.Class"));
         oaiAdapter.init(this.myBaseURL, oaiAdapterKey);
         return oaiAdapter;
     }
diff --git a/mycore-oai/src/main/java/org/mycore/oai/MCROAISearchManager.java b/mycore-oai/src/main/java/org/mycore/oai/MCROAISearchManager.java
index 069b06df28..f915007163 100644
--- a/mycore-oai/src/main/java/org/mycore/oai/MCROAISearchManager.java
+++ b/mycore-oai/src/main/java/org/mycore/oai/MCROAISearchManager.java
@@ -248,10 +248,10 @@ public int getPartitionSize() {
 
     public static MCROAISearcher getSearcher(MCROAIIdentify identify, MetadataFormat format, int partitionSize,
         MCROAISetManager setManager, MCROAIObjectManager objectManager) {
-        String className = identify.getConfigPrefix() + "Searcher";
+        String className = identify.getConfigPrefix() + "Searcher.Class";
         MCROAISearcher searcher = MCRConfiguration2.getInstanceOf(MCROAISearcher.class, className)
             .orElseGet(() -> MCRConfiguration2.getInstanceOfOrThrow(
-                MCROAISearcher.class, MCROAIAdapter.PREFIX + "DefaultSearcher"));
+                MCROAISearcher.class, MCROAIAdapter.PREFIX + "DefaultSearcher.Class"));
         searcher.init(identify, format, MAX_AGE, partitionSize, setManager, objectManager);
         return searcher;
     }
diff --git a/mycore-oai/src/main/resources/components/oai/config/deprecated.properties b/mycore-oai/src/main/resources/components/oai/config/deprecated.properties
index 9957c291ef..148399b260 100644
--- a/mycore-oai/src/main/resources/components/oai/config/deprecated.properties
+++ b/mycore-oai/src/main/resources/components/oai/config/deprecated.properties
@@ -1 +1,7 @@
 MCR.OAIDataProvider.OAI2.EarliestDatestamp.fieldName=MCR.OAIDataProvider.OAI2.EarliestDatestamp.FieldName
+MCR.OAIDataProvider.DefaultAdapter=MCR.OAIDataProvider.DefaultAdapter.Class
+MCR.OAIDataProvider.DefaultSearcher=MCR.OAIDataProvider.DefaultSearcher.Class
+MCR.OAIDataProvider.DefaultSetManager=MCR.OAIDataProvider.DefaultSetManager.Class
+MCR.OAIDataProvider.(\S+).Adapter=MCR.OAIDataProvider.$1.Adapter.Class
+MCR.OAIDataProvider.(\S+).Searcher=MCR.OAIDataProvider.$1.Searcher.Class
+MCR.OAIDataProvider.(\S+).SetManager=MCR.OAIDataProvider.$1.SetManager.Class
diff --git a/mycore-oai/src/main/resources/components/oai/config/mycore.properties b/mycore-oai/src/main/resources/components/oai/config/mycore.properties
index 2d3693a0c9..a392a8c09f 100644
--- a/mycore-oai/src/main/resources/components/oai/config/mycore.properties
+++ b/mycore-oai/src/main/resources/components/oai/config/mycore.properties
@@ -48,9 +48,9 @@ MCR.OAIDataProvider.RunListRecordsParallel=true
 # stop on errors or continue
 MCR.OAIDataProvider.FailOnErrorRecords=false
 
-MCR.OAIDataProvider.DefaultAdapter=org.mycore.oai.MCROAIAdapter
-MCR.OAIDataProvider.DefaultSearcher=org.mycore.oai.MCROAICombinedSearcher
-MCR.OAIDataProvider.DefaultSetManager=org.mycore.oai.MCROAISetManager
+MCR.OAIDataProvider.DefaultAdapter.Class=org.mycore.oai.MCROAIAdapter
+MCR.OAIDataProvider.DefaultSearcher.Class=org.mycore.oai.MCROAICombinedSearcher
+MCR.OAIDataProvider.DefaultSetManager.Class=org.mycore.oai.MCROAISetManager
 
 ##############################################################################
 # Configuration for a specific OAI Data Provider Instance                    #
@@ -83,7 +83,7 @@ MCR.OAIDataProvider.OAI2.Granularity=YYYY_MM_DD
 # MCR.OAIDataProvider.OAI2.Friends.DBThueringen=https://www.db-thueringen.de/servlets/OAIDataProvider
 
 # OAI Adapter configuration
-MCR.OAIDataProvider.OAI2.Adapter=org.mycore.oai.MCROAIAdapter
+MCR.OAIDataProvider.OAI2.Adapter.Class=org.mycore.oai.MCROAIAdapter
 # MCR.OAIDataProvider.OAI2.Adapter.HeaderURIPattern=xslStyle:mods2oaiheader:mcrobject:{id}
 # MCR.OAIDataProvider.OAI2.Adapter.RecordURIPattern=xslStyle:mods2{format}:mcrobject:{id}
 
@@ -91,14 +91,14 @@ MCR.OAIDataProvider.OAI2.Adapter=org.mycore.oai.MCROAIAdapter
 MCR.OAIDataProvider.OAI2.MetadataFormats=oai_dc
 
 # search result configuration
-MCR.OAIDataProvider.OAI2.Searcher=org.mycore.oai.MCROAICombinedSearcher
+MCR.OAIDataProvider.OAI2.Searcher.Class=org.mycore.oai.MCROAICombinedSearcher
 # MCR.OAIDataProvider.OAI2.Search.RequestHandler=/oai_search
 # MCR.OAIDataProvider.OAI2.Search.Restriction=objectType\:mods
 MCR.OAIDataProvider.OAI2.Search.FromUntil=modified
 
 
 # OAI Set configuration
-MCR.OAIDataProvider.OAI2.SetManager=org.mycore.oai.MCROAISetManager
+MCR.OAIDataProvider.OAI2.SetManager.Class=org.mycore.oai.MCROAISetManager
 MCR.OAIDataProvider.OAI2.FilterEmptySets=true
 MCR.OAIDataProvider.OAI2.SetCache.MaxAge=0
 # MCR.OAIDataProvider.OAI2.Sets=open_access,openaire,driver,ec_fundedresources,GENRE,SDNB
diff --git a/mycore-ocfl-s3/src/main/resources/components/ocfl-s3/config/mycore.properties b/mycore-ocfl-s3/src/main/resources/components/ocfl-s3/config/mycore.properties
index f2fa75b1bc..42f436c9ed 100644
--- a/mycore-ocfl-s3/src/main/resources/components/ocfl-s3/config/mycore.properties
+++ b/mycore-ocfl-s3/src/main/resources/components/ocfl-s3/config/mycore.properties
@@ -20,7 +20,7 @@
 # S3 repository settings
 ############################
 
-MCR.OCFL.Repository.Main=org.mycore.ocfl.repository.MCROCFLS3RepositoryProvider
+MCR.OCFL.Repository.Main.Class=org.mycore.ocfl.repository.MCROCFLS3RepositoryProvider
 
 MCR.OCFL.Repository.Main.S3.Endpoint=http://your-s3-endpoint:9000
 MCR.OCFL.Repository.Main.S3.Bucket=ocfl
diff --git a/mycore-ocfl/src/main/java/org/mycore/ocfl/classification/MCROCFLClassificationTransaction.java b/mycore-ocfl/src/main/java/org/mycore/ocfl/classification/MCROCFLClassificationTransaction.java
index c9cb76c2c4..6b5a1b972f 100644
--- a/mycore-ocfl/src/main/java/org/mycore/ocfl/classification/MCROCFLClassificationTransaction.java
+++ b/mycore-ocfl/src/main/java/org/mycore/ocfl/classification/MCROCFLClassificationTransaction.java
@@ -46,7 +46,7 @@ public class MCROCFLClassificationTransaction implements MCRPersistenceTransacti
     private static final Logger LOGGER = LogManager.getLogger();
 
     private static final MCROCFLXMLClassificationManager MANAGER = MCRConfiguration2
-        .getSingleInstanceOf(MCROCFLXMLClassificationManager.class, "MCR.Classification.Manager")
+        .getSingleInstanceOf(MCROCFLXMLClassificationManager.class, "MCR.Classification.Manager.Class")
         .orElse(null);
 
     private static final ThreadLocal<Map<MCRCategoryID, Character>> CATEGORY_WORKSPACE = new ThreadLocal<>();
diff --git a/mycore-ocfl/src/main/java/org/mycore/ocfl/commands/MCROCFLCommands.java b/mycore-ocfl/src/main/java/org/mycore/ocfl/commands/MCROCFLCommands.java
index ed2a731671..61f536e192 100644
--- a/mycore-ocfl/src/main/java/org/mycore/ocfl/commands/MCROCFLCommands.java
+++ b/mycore-ocfl/src/main/java/org/mycore/ocfl/commands/MCROCFLCommands.java
@@ -301,7 +301,7 @@ public static void writeUserToDb(String userId) throws IOException {
     public static void writeClassToDbVersioned(String classId, String revision)
         throws URISyntaxException, JDOMException, IOException, SAXException {
         MCROCFLXMLClassificationManager manager = MCRConfiguration2.getSingleInstanceOfOrThrow(
-            MCROCFLXMLClassificationManager.class, "MCR.Classification.Manager");
+            MCROCFLXMLClassificationManager.class, "MCR.Classification.Manager.Class");
         MCRCategoryID cId = MCRCategoryID.ofString(classId);
         MCRContent content = manager.retrieveContent(cId, revision);
         MCRCategory category = MCRXMLTransformer.getCategory(content.asXML());
@@ -373,7 +373,7 @@ public static void purgeClass(String mcrCgIdString) {
             throw new MCRUsageException("You can only purge root classifications!");
         }
         MCRConfiguration2.getSingleInstanceOfOrThrow(
-            MCROCFLXMLClassificationManager.class, "MCR.Classification.Manager").purge(mcrCgId);
+            MCROCFLXMLClassificationManager.class, "MCR.Classification.Manager.Class").purge(mcrCgId);
 
     }
 
@@ -436,7 +436,7 @@ public static void purgeMarkedClasses() {
         String repositoryKey = MCRConfiguration2.getStringOrThrow("MCR.Classification.Manager.Repository");
         OcflRepository repository = MCROCFLRepositoryProvider.getRepository(repositoryKey);
         MCROCFLXMLClassificationManager manager = MCRConfiguration2.getSingleInstanceOfOrThrow(
-            MCROCFLXMLClassificationManager.class, "MCR.Classification.Manager");
+            MCROCFLXMLClassificationManager.class, "MCR.Classification.Manager.Class");
         repository.listObjectIds()
             .filter(obj -> obj.startsWith(MCROCFLObjectIDPrefixHelper.CLASSIFICATION))
             .filter(obj -> Objects.equals(repository.describeObject(obj).getHeadVersion().getVersionInfo().getMessage(),
diff --git a/mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/MCROCFLFileSystemProvider.java b/mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/MCROCFLFileSystemProvider.java
index 407b373f3e..84518adc41 100644
--- a/mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/MCROCFLFileSystemProvider.java
+++ b/mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/MCROCFLFileSystemProvider.java
@@ -99,19 +99,19 @@ public class MCROCFLFileSystemProvider extends MCRVersionedFileSystemProvider {
     @SuppressWarnings("unchecked")
     public void init() throws IOException {
         // digest calculator
-        String digestCalculatorProperty = "MCR.Content.DigestCalculator";
+        String digestCalculatorProperty = "MCR.Content.DigestCalculator.Class";
         this.digestCalculator = MCRConfiguration2
             .getSingleInstanceOfOrThrow(MCROCFLDigestCalculator.class, digestCalculatorProperty);
 
         // transactional storage
-        String transactionalStorageProperty = "MCR.Content.TransactionalStorage";
+        String transactionalStorageProperty = "MCR.Content.TransactionalStorage.Class";
         this.transactionalStorage = MCRConfiguration2
             .getSingleInstanceOfOrThrow(MCROCFLTransactionalStorage.class, transactionalStorageProperty);
         Files.createDirectories(this.transactionalStorage.getRoot());
         this.transactionalStorage.clearTransactional();
 
         // remote storage
-        String remoteStorageProperty = "MCR.Content.RemoteStorage";
+        String remoteStorageProperty = "MCR.Content.RemoteStorage.Class";
         this.remoteStorage = MCRConfiguration2
             .getSingleInstanceOf(MCROCFLRemoteTemporaryStorage.class, remoteStorageProperty).orElse(null);
 
diff --git a/mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/storage/MCROCFLDefaultRemoteTemporaryStorage.java b/mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/storage/MCROCFLDefaultRemoteTemporaryStorage.java
index b8dfda9fef..b5df8a13a4 100644
--- a/mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/storage/MCROCFLDefaultRemoteTemporaryStorage.java
+++ b/mycore-ocfl/src/main/java/org/mycore/ocfl/niofs/storage/MCROCFLDefaultRemoteTemporaryStorage.java
@@ -610,7 +610,7 @@ public MCROCFLDefaultRemoteTemporaryStorage get() {
             @SuppressWarnings("unchecked")
             MCROCFLDigestCalculator<Path, MCRDigest> digestCalculator =
                 (MCROCFLDigestCalculator<Path, MCRDigest>) MCRConfiguration2
-                    .getSingleInstanceOfOrThrow(MCROCFLDigestCalculator.class, "MCR.Content.DigestCalculator");
+                    .getSingleInstanceOfOrThrow(MCROCFLDigestCalculator.class, "MCR.Content.DigestCalculator.Class");
             return new MCROCFLDefaultRemoteTemporaryStorage(root, evictionStrategy, digestCalculator);
         }
 
diff --git a/mycore-ocfl/src/main/java/org/mycore/ocfl/repository/MCROCFLRepositoryProvider.java b/mycore-ocfl/src/main/java/org/mycore/ocfl/repository/MCROCFLRepositoryProvider.java
index f4614fd80b..6735ef585d 100644
--- a/mycore-ocfl/src/main/java/org/mycore/ocfl/repository/MCROCFLRepositoryProvider.java
+++ b/mycore-ocfl/src/main/java/org/mycore/ocfl/repository/MCROCFLRepositoryProvider.java
@@ -74,7 +74,7 @@ static MCROCFLRepository getRepository(String id) {
      */
     static MCROCFLRepositoryProvider obtainInstance(String id) {
         return MCRConfiguration2.getSingleInstanceOfOrThrow(
-            MCROCFLRepositoryProvider.class, REPOSITORY_PROPERTY_PREFIX + id);
+            MCROCFLRepositoryProvider.class, REPOSITORY_PROPERTY_PREFIX + id + ".Class");
     }
 
 }
diff --git a/mycore-ocfl/src/main/resources/components/ocfl/config/deprecated.properties b/mycore-ocfl/src/main/resources/components/ocfl/config/deprecated.properties
new file mode 100644
index 0000000000..6b0fefcbf4
--- /dev/null
+++ b/mycore-ocfl/src/main/resources/components/ocfl/config/deprecated.properties
@@ -0,0 +1,7 @@
+MCR.OCFL.Repository.Main=MCR.OCFL.Repository.Main.Class
+MCR.Classification.Manager=MCR.Classification.Manager.Class
+MCR.Content.DigestCalculator=MCR.Content.DigestCalculator.Class
+MCR.Content.TransactionalStorage=MCR.Content.TransactionalStorage.Class
+MCR.Content.RemoteStorage=MCR.Content.RemoteStorage.Class
+MCR.Content.RemoteStorage.EvictionStrategy=MCR.Content.RemoteStorage.EvictionStrategy.Class
+MCR.Cronjob.Jobs.CompactRemoteStorageJournal=MCR.Cronjob.Jobs.CompactRemoteStorageJournal.Class
diff --git a/mycore-ocfl/src/main/resources/components/ocfl/config/mycore.properties b/mycore-ocfl/src/main/resources/components/ocfl/config/mycore.properties
index 2bd9303121..ce02a80ea5 100644
--- a/mycore-ocfl/src/main/resources/components/ocfl/config/mycore.properties
+++ b/mycore-ocfl/src/main/resources/components/ocfl/config/mycore.properties
@@ -33,13 +33,13 @@ MCR.CLI.Classes.Internal=%MCR.CLI.Classes.Internal%,org.mycore.ocfl.commands.MCR
 #                   OCFL Repository Configuration                    #
 ######################################################################
 
-MCR.OCFL.Repository.Main=org.mycore.ocfl.repository.MCROCFLHashRepositoryProvider
+MCR.OCFL.Repository.Main.Class=org.mycore.ocfl.repository.MCROCFLHashRepositoryProvider
 MCR.OCFL.Repository.Main.RepositoryRoot=%MCR.datadir%/ocfl-root
 MCR.OCFL.Repository.Main.WorkDir=%MCR.datadir%/ocfl-temp
 
 # There is an alternative repository provider implementation which results in directory structure
 # as we know it from the MyCoRe IFS2 implementation:
-# MCR.OCFL.Repository.Main=org.mycore.ocfl.repository.MCROCFLMCRRepositoryProvider
+# MCR.OCFL.Repository.Main.Class=org.mycore.ocfl.repository.MCROCFLMCRRepositoryProvider
 
 # The slot layout can be configured, if not - the default will be calculated as follows:
 # Integer.toString(MCRConfiguration2.getString("MCR.Metadata.ObjectID.NumberPattern").orElse("0000000000").length() - 4) + "-2-2";
@@ -61,10 +61,10 @@ MCR.Metadata.Manager.Repository=Main
 ######################################################################
 
 # Add Events for the Eventhandler to the default CategoryDAO implementation
-# MCR.Category.DAO=org.mycore.datamodel.classifications2.impl.MCREventedCategoryDAOImpl
+# MCR.Category.DAO.Class=org.mycore.datamodel.classifications2.impl.MCREventedCategoryDAOImpl
 
 # Enable the OCFL Classification Manager
-# MCR.Classification.Manager=org.mycore.ocfl.classification.MCROCFLXMLClassificationManager
+# MCR.Classification.Manager.Class=org.mycore.ocfl.classification.MCROCFLXMLClassificationManager
 
 # Default Classification Manager repository
 MCR.Classification.Manager.Repository=Main
@@ -146,25 +146,25 @@ MCR.Content.Manager.Repository=Main
 MCR.Metadata.ObjectID.Generator.Class=org.mycore.datamodel.common.MCRFileBaseCacheObjectIDGenerator
 
 # Digest Calculation
-MCR.Content.DigestCalculator=org.mycore.ocfl.niofs.MCROCFLSha512DigestCalculator
+MCR.Content.DigestCalculator.Class=org.mycore.ocfl.niofs.MCROCFLSha512DigestCalculator
 
 # Transactional repository settings
-MCR.Content.TransactionalStorage=org.mycore.ocfl.niofs.storage.MCROCFLDefaultTransactionalStorage
+MCR.Content.TransactionalStorage.Class=org.mycore.ocfl.niofs.storage.MCROCFLDefaultTransactionalStorage
 MCR.Content.TransactionalStorage.Path=%MCR.datadir%/ocfl-storage/transactional
 
 ############################
 # Remote repository settings
 ############################
 
-# MCR.Content.RemoteStorage=org.mycore.ocfl.niofs.storage.MCROCFLDefaultRemoteTemporaryStorage
+# MCR.Content.RemoteStorage.Class=org.mycore.ocfl.niofs.storage.MCROCFLDefaultRemoteTemporaryStorage
 # MCR.Content.RemoteStorage.Path=%MCR.datadir%/ocfl-storage/remote
-# MCR.Content.RemoteStorage.EvictionStrategy=org.mycore.ocfl.niofs.storage.MCROCFLNeverEvictStrategy
+# MCR.Content.RemoteStorage.EvictionStrategy.Class=org.mycore.ocfl.niofs.storage.MCROCFLNeverEvictStrategy
 # Max Size Eviction Strategy with 1 GB
-# MCR.Content.RemoteStorage.EvictionStrategy=org.mycore.ocfl.niofs.storage.MCROCFLMaxSizeEvictionStrategy
+# MCR.Content.RemoteStorage.EvictionStrategy.Class=org.mycore.ocfl.niofs.storage.MCROCFLMaxSizeEvictionStrategy
 # MCR.Content.RemoteStorage.EvictionStrategy.MaxSize=1000
 
 # compact remote storage journal
-# MCR.Cronjob.Jobs.CompactRemoteStorageJournal=org.mycore.mcr.cronjob.MCRCommandCronJob
+# MCR.Cronjob.Jobs.CompactRemoteStorageJournal.Class=org.mycore.mcr.cronjob.MCRCommandCronJob
 # MCR.Cronjob.Jobs.CompactRemoteStorageJournal.Command=compact ocfl remote storage journal
 # MCR.Cronjob.Jobs.CompactRemoteStorageJournal.Cron=0 */1 * * *
 # MCR.Cronjob.Jobs.CompactRemoteStorageJournal.User=system:JANITOR
diff --git a/mycore-ocfl/src/test/java/org/mycore/ocfl/test/MCROCFLSetupExtension.java b/mycore-ocfl/src/test/java/org/mycore/ocfl/test/MCROCFLSetupExtension.java
index 7392195045..8881e7e045 100644
--- a/mycore-ocfl/src/test/java/org/mycore/ocfl/test/MCROCFLSetupExtension.java
+++ b/mycore-ocfl/src/test/java/org/mycore/ocfl/test/MCROCFLSetupExtension.java
@@ -92,14 +92,17 @@ public void beforeEach(ExtensionContext context) throws Exception {
         MCRConfiguration2.set(purgePropertyName, Boolean.toString(purge != null ? purge : false));
 
         // Set transactional storage
-        MCRConfiguration2.set("MCR.Content.TransactionalStorage", MCROCFLDefaultTransactionalStorage.class.getName());
+        MCRConfiguration2.set("MCR.Content.TransactionalStorage.Class",
+            MCROCFLDefaultTransactionalStorage.class.getName());
 
         // Set remote configuration
         if (remote != null && remote) {
-            MCRConfiguration2.set("MCR.Content.RemoteStorage", MCROCFLDefaultRemoteTemporaryStorage.class.getName());
-            MCRConfiguration2.set("MCR.Content.RemoteStorage.EvictionStrategy",
+            MCRConfiguration2.set("MCR.Content.RemoteStorage.Class",
+                MCROCFLDefaultRemoteTemporaryStorage.class.getName());
+            MCRConfiguration2.set("MCR.Content.RemoteStorage.EvictionStrategy.Class",
                 MCROCFLNeverEvictStrategy.class.getName());
-            MCRConfiguration2.set("MCR.Content.RemoteStorage.Path", "%MCR.datadir%/ocfl-storage/remote");
+            MCRConfiguration2.set("MCR.Content.RemoteStorage.Path",
+                "%MCR.datadir%/ocfl-storage/remote");
         }
 
         // Execute common initialization
diff --git a/mycore-ocfl/src/test/resources/mycore.properties b/mycore-ocfl/src/test/resources/mycore.properties
index 78575226e6..fb037c4f66 100644
--- a/mycore-ocfl/src/test/resources/mycore.properties
+++ b/mycore-ocfl/src/test/resources/mycore.properties
@@ -18,6 +18,6 @@ MCR.NIO.DefaultScheme=ocfl
 MCR.Content.Manager.Repository=Test
 
 # local repository
-MCR.OCFL.Repository.Test=org.mycore.ocfl.test.MCROCFLSetupExtension$RepositoryProviderMock
+MCR.OCFL.Repository.Test.Class=org.mycore.ocfl.test.MCROCFLSetupExtension$RepositoryProviderMock
 MCR.OCFL.Repository.Test.RepositoryRoot=%MCR.datadir%/ocfl-root
 MCR.OCFL.Repository.Test.WorkDir=%MCR.datadir%/ocfl-temp
diff --git a/mycore-pi/src/main/java/org/mycore/pi/MCRGenericPIGenerator.java b/mycore-pi/src/main/java/org/mycore/pi/MCRGenericPIGenerator.java
index 0bd1e2561e..29af2a1856 100644
--- a/mycore-pi/src/main/java/org/mycore/pi/MCRGenericPIGenerator.java
+++ b/mycore-pi/src/main/java/org/mycore/pi/MCRGenericPIGenerator.java
@@ -57,7 +57,7 @@
 
 /**
  *
- * MCR.PI.Generator.myGenerator=org.mycore.pi.urn.MCRGenericPIGenerator
+ * MCR.PI.Generator.myGenerator=org.mycore.pi.urn.MCRGenericPIGenerator.Class
  * <p>
  * Set a generic pattern.
  * <p>
diff --git a/mycore-pi/src/main/java/org/mycore/pi/MCRPIGenerator.java b/mycore-pi/src/main/java/org/mycore/pi/MCRPIGenerator.java
index ee9f300d13..3f97353a9b 100644
--- a/mycore-pi/src/main/java/org/mycore/pi/MCRPIGenerator.java
+++ b/mycore-pi/src/main/java/org/mycore/pi/MCRPIGenerator.java
@@ -38,7 +38,7 @@ public final Map<String, String> getProperties() {
         return properties;
     }
 
-    @MCRPostConstruction
+    @MCRPostConstruction(MCRPostConstruction.Value.CANONICAL)
     public void init(String property) {
         generatorID = property.substring(GENERATOR_CONFIG_PREFIX.length());
     }
diff --git a/mycore-pi/src/main/java/org/mycore/pi/MCRPIService.java b/mycore-pi/src/main/java/org/mycore/pi/MCRPIService.java
index e2714f4da1..81fd5fad64 100644
--- a/mycore-pi/src/main/java/org/mycore/pi/MCRPIService.java
+++ b/mycore-pi/src/main/java/org/mycore/pi/MCRPIService.java
@@ -94,6 +94,8 @@ public abstract class MCRPIService<T extends MCRPersistentIdentifier> {
     @SuppressWarnings("unused")
     private static final Logger LOGGER = LogManager.getLogger();
 
+    public static final String CLASS_SUFFIX = ".Class";
+
     static {
         ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("MCRPIRegister-#%d")
             .build();
@@ -199,11 +201,7 @@ public static void updateFlagsInDatabase(MCRBase obj) {
             });
     }
 
-    public static Predicate<MCRBase> getPredicateInstance(String predicateProperty) {
-        return MCRConfiguration2.getInstanceOfOrThrow(Predicate.class, predicateProperty);
-    }
-
-    @MCRPostConstruction
+    @MCRPostConstruction(MCRPostConstruction.Value.CANONICAL)
     public void init(String prop) {
         registrationServiceID = prop.substring(MCRPIServiceManager.REGISTRATION_SERVICE_CONFIG_PREFIX.length());
     }
@@ -237,7 +235,7 @@ public MCRPIMetadataService<T> getMetadataService() {
                 getServiceID() + " has no " + METADATA_SERVICE_PROPERTY_KEY + "!");
         }
 
-        String msProperty = METADATA_SERVICE_CONFIG_PREFIX + metadataService;
+        String msProperty = METADATA_SERVICE_CONFIG_PREFIX + metadataService + CLASS_SUFFIX;
         return MCRConfiguration2.getInstanceOfOrThrow(MCRPIMetadataService.class, msProperty);
     }
 
@@ -249,7 +247,7 @@ protected MCRPIGenerator<T> getGenerator() {
         String generatorName = Optional.ofNullable(getProperties().get(GENERATOR_PROPERTY_KEY))
             .orElseThrow(generatorPropertiesNotSetError);
 
-        String generatorPropertyKey = GENERATOR_CONFIG_PREFIX + generatorName;
+        String generatorPropertyKey = GENERATOR_CONFIG_PREFIX + generatorName + CLASS_SUFFIX;
         return MCRConfiguration2.getInstanceOfOrThrow(MCRPIGenerator.class, generatorPropertyKey);
     }
 
@@ -556,7 +554,7 @@ protected String requireNotEmptyProperty(String propertyName) throws MCRConfigur
 
     protected Predicate<MCRBase> getCreationPredicate() {
         final String predicateProperty = MCRPIServiceManager.REGISTRATION_SERVICE_CONFIG_PREFIX +
-            getServiceID() + "." + MCRPIJobService.CREATION_PREDICATE;
+            getServiceID() + "." + MCRPIJobService.CREATION_PREDICATE + CLASS_SUFFIX;
         if (MCRConfiguration2.getString(predicateProperty).isEmpty()) {
             return (o) -> false;
         }
@@ -565,11 +563,15 @@ protected Predicate<MCRBase> getCreationPredicate() {
 
     protected Predicate<MCRBase> getRegistrationPredicate() {
         final String predicateProperty = MCRPIServiceManager.REGISTRATION_SERVICE_CONFIG_PREFIX +
-            getServiceID() + "." + MCRPIJobService.REGISTRATION_PREDICATE;
+            getServiceID() + "." + MCRPIJobService.REGISTRATION_PREDICATE  + CLASS_SUFFIX;
         if (MCRConfiguration2.getString(predicateProperty).isEmpty()) {
             return (o) -> true;
         }
         return getPredicateInstance(predicateProperty);
     }
 
+    public static Predicate<MCRBase> getPredicateInstance(String predicateProperty) {
+        return MCRConfiguration2.getInstanceOfOrThrow(Predicate.class, predicateProperty);
+    }
+
 }
diff --git a/mycore-pi/src/main/java/org/mycore/pi/MCRPIServiceManager.java b/mycore-pi/src/main/java/org/mycore/pi/MCRPIServiceManager.java
index 326b68543b..ea77445a33 100644
--- a/mycore-pi/src/main/java/org/mycore/pi/MCRPIServiceManager.java
+++ b/mycore-pi/src/main/java/org/mycore/pi/MCRPIServiceManager.java
@@ -29,6 +29,8 @@ public final class MCRPIServiceManager {
 
     public static final String REGISTRATION_SERVICE_CONFIG_PREFIX = "MCR.PI.Service.";
 
+    public static final String CLASS_SUFFIX = ".Class";
+
     private MCRPIServiceManager(){
     }
 
@@ -39,6 +41,12 @@ public static MCRPIServiceManager getInstance() {
     public List<String> getServiceIDList() {
         return MCRConfiguration2.getInstantiatablePropertyKeys(REGISTRATION_SERVICE_CONFIG_PREFIX)
             .map(s -> s.substring(REGISTRATION_SERVICE_CONFIG_PREFIX.length()))
+            .map(s -> {
+                if (s.endsWith(CLASS_SUFFIX) || s.endsWith(".class")) {
+                    return s.substring(0, s.length() - CLASS_SUFFIX.length());
+                }
+                return s;
+            })
             .collect(Collectors.toList());
     }
 
@@ -54,14 +62,14 @@ public List<MCRPIService<MCRPersistentIdentifier>> getAutoCreationList() {
             .stream()
             .filter(service -> MCRConfiguration2
                 .getString(REGISTRATION_SERVICE_CONFIG_PREFIX + service.getServiceID() + "." +
-                    CREATION_PREDICATE)
+                    CREATION_PREDICATE + CLASS_SUFFIX)
                 .isPresent())
             .collect(Collectors.toList());
     }
 
     public <T extends MCRPersistentIdentifier> MCRPIService<T> getRegistrationService(String id) {
         return MCRConfiguration2.getSingleInstanceOfOrThrow(
-            MCRPIService.class, REGISTRATION_SERVICE_CONFIG_PREFIX + id);
+            MCRPIService.class, REGISTRATION_SERVICE_CONFIG_PREFIX + id + CLASS_SUFFIX);
     }
 
     private static final class LazyInstanceHolder {
diff --git a/mycore-pi/src/main/java/org/mycore/pi/condition/MCRPIOtherPICreatedPredicate.java b/mycore-pi/src/main/java/org/mycore/pi/condition/MCRPIOtherPICreatedPredicate.java
index 1864da4638..1ebf1c81af 100644
--- a/mycore-pi/src/main/java/org/mycore/pi/condition/MCRPIOtherPICreatedPredicate.java
+++ b/mycore-pi/src/main/java/org/mycore/pi/condition/MCRPIOtherPICreatedPredicate.java
@@ -29,8 +29,8 @@
  * to specify the PI service and type of the PI which should be checked. 
  * <p>
  * sample configuration:
- * MCR.PI.Service.RosDokURN.CreationPredicate=org.mycore.pi.condition.MCRPIAndPredicate
- * MCR.PI.Service.RosDokURN.CreationPredicate.1=org.mycore.pi.condition.MCRPIOtherPICreatedPredicate
+ * MCR.PI.Service.RosDokURN.CreationPredicate.Class=org.mycore.pi.condition.MCRPIAndPredicate
+ * MCR.PI.Service.RosDokURN.CreationPredicate.1.Class=org.mycore.pi.condition.MCRPIOtherPICreatedPredicate
  * MCR.PI.Service.RosDokURN.CreationPredicate.1.Service=MCRLocalID
  * MCR.PI.Service.RosDokURN.CreationPredicate.1.Type=local_id
  * ...
diff --git a/mycore-pi/src/main/java/org/mycore/pi/condition/MCRPIOtherPIRegisteredPredicate.java b/mycore-pi/src/main/java/org/mycore/pi/condition/MCRPIOtherPIRegisteredPredicate.java
index 626209e877..6315d24d1b 100644
--- a/mycore-pi/src/main/java/org/mycore/pi/condition/MCRPIOtherPIRegisteredPredicate.java
+++ b/mycore-pi/src/main/java/org/mycore/pi/condition/MCRPIOtherPIRegisteredPredicate.java
@@ -29,8 +29,8 @@
  * to specify the PI service and type of the PI which should be checked. 
  * <p>
  * sample configuration:
- * MCR.PI.Service.RosDokURN.CreationPredicate=org.mycore.pi.condition.MCRPIAndPredicate
- * MCR.PI.Service.RosDokURN.CreationPredicate.1=org.mycore.pi.condition.MCRPIOtherPIRegisteredPredicate
+ * MCR.PI.Service.RosDokURN.CreationPredicate.Class=org.mycore.pi.condition.MCRPIAndPredicate
+ * MCR.PI.Service.RosDokURN.CreationPredicate.1.Class=org.mycore.pi.condition.MCRPIOtherPIRegisteredPredicate
  * MCR.PI.Service.RosDokURN.CreationPredicate.1.Service=MCRLocalID
  * MCR.PI.Service.RosDokURN.CreationPredicate.1.Type=local_id
  * ...
diff --git a/mycore-pi/src/main/resources/components/pi/config/deprecated.properties b/mycore-pi/src/main/resources/components/pi/config/deprecated.properties
index c247098632..bc092d051f 100644
--- a/mycore-pi/src/main/resources/components/pi/config/deprecated.properties
+++ b/mycore-pi/src/main/resources/components/pi/config/deprecated.properties
@@ -2,7 +2,10 @@ MCR.URN.URNGranular.SupportedContentTypes=MCR.PI.URNGranular.SupportedContentTyp
 MCR.URN.DNB.Credentials.Login=MCR.PI.DNB.Credentials.Login
 MCR.URN.DNB.Credentials.Password=MCR.PI.DNB.Credentials.Password
 MCR.PI.CronJob.disable=MCR.Cronjob.Jobs.DNBURNRegistrationCheck.Enabled
-MCR.PI.GranularRESTRegistrationStarter.taskPeriod=MCR.Cronjob.Jobs.URNGranularRESTRegistration.Cron
-# You also need to add MCR.Cronjob.Jobs.URNGranularRESTRegistration=org.mycore.pi.urn.rest.MCRURNGranularRESTRegistrationCronjob
+MCR.PI.GranularRESTRegistrationStarter.taskPeriod=MCR.Cronjob.Jobs.URNGranularRESTRegistration.Cron (and MCR.Cronjob.Jobs.URNGranularRESTRegistration.Class=org.mycore.pi.urn.rest.MCRURNGranularRESTRegistrationCronjob)
 MCR.PI.GranularRESTRegistrationTask.batchSize=MCR.CronJob.Default.URNGranularRESTRegistration.BatchSize
-
+MCR.PI.Service.(\S+)=MCR.PI.Service.$1.Class
+MCR.PI.Service.(\S+).CreationPredicate=MCR.PI.Service.$1.CreationPredicate.Class
+MCR.PI.Service.(\S+).RegistrationPredicate=MCR.PI.Service.$1.RegistrationPredicate.Class
+MCR.PI.Generator.(\S+)=MCR.PI.Generator.$1.Class
+MCR.PI.MetadataService.(\S+)=MCR.PI.MetadataService.$1.Class
diff --git a/mycore-pi/src/main/resources/components/pi/config/mycore.properties b/mycore-pi/src/main/resources/components/pi/config/mycore.properties
index dbb2ede361..aa89ec7558 100644
--- a/mycore-pi/src/main/resources/components/pi/config/mycore.properties
+++ b/mycore-pi/src/main/resources/components/pi/config/mycore.properties
@@ -24,7 +24,7 @@ MCR.PI.Default.Service.AncestorUpdatedTriggerUpdate=true
 MCR.PI.Default.Service.LinkedUpdatedTriggerUpdate=true
 
 # Quick example for DOI registration
-#MCR.PI.Service.Datacite=org.mycore.pi.doi.MCRDOIService
+#MCR.PI.Service.Datacite.Class=org.mycore.pi.doi.MCRDOIService
 #MCR.PI.Service.Datacite.Generator=UUIDDOI
 #MCR.PI.Service.Datacite.MetadataService=MODSDOI
 #MCR.PI.Service.Datacite.Username=
@@ -37,32 +37,32 @@ MCR.PI.Default.Service.LinkedUpdatedTriggerUpdate=true
 #MCR.PI.Service.Datacite.RegisterURLContext=receive/$ID
 
 # Quick example for URN Generation and Assignment (granular)
-#MCR.PI.Service.DNBURNGranular=org.mycore.pi.urn.MCRURNGranularOAIService
+#MCR.PI.Service.DNBURNGranular.Class=org.mycore.pi.urn.MCRURNGranularOAIService
 #MCR.PI.Service.DNBURNGranular.Generator=DNBDateURN
 #MCR.PI.Service.DNBURNGranular.MetadataService=MODSURN
 #MCR.PI.Service.DNBURNGranular.IgnoreFileNames=mets\\.xml,alto/.+,tei/.+
 
 #Quick example for URN Generation and Assignment (object)
-#MCR.PI.Service.DNBURN=org.mycore.pi.urn.MCRURNOAIService
+#MCR.PI.Service.DNBURN.Class=org.mycore.pi.urn.MCRURNOAIService
 #MCR.PI.Service.DNBURN.Generator=TypeYearCountURN
 #MCR.PI.Service.DNBURN.MetadataService=MODSURN
 
 # Generators
-MCR.PI.Generator.UUIDDOI=org.mycore.pi.doi.MCRUUIDDOIGenerator
-MCR.PI.Generator.MapObjectIDDOI=org.mycore.pi.doi.MCRMapObjectIDDOIGenerator
-#MCR.PI.Generator.IDPURLGenerator=org.mycore.pi.purl.MCRIDPURLGenerator
+MCR.PI.Generator.UUIDDOI.Class=org.mycore.pi.doi.MCRUUIDDOIGenerator
+MCR.PI.Generator.MapObjectIDDOI.Class=org.mycore.pi.doi.MCRMapObjectIDDOIGenerator
+#MCR.PI.Generator.IDPURLGenerator.Class=org.mycore.pi.purl.MCRIDPURLGenerator
 #MCR.PI.Generator.IDPURLGenerator.BaseURLTemplate=http://purl.meineUrl.de/$ID
 
-#MCR.PI.Generator.TypeYearCountURN=org.mycore.pi.MCRGenericPIGenerator
+#MCR.PI.Generator.TypeYearCountURN.Class=org.mycore.pi.MCRGenericPIGenerator
 #MCR.PI.Generator.TypeYearCountURN.GeneralPattern=urn:nbn:de:gbv:$ObjectType-$ObjectDate-$Count-
 #MCR.PI.Generator.TypeYearCountURN.DateFormat=yyyy
 #MCR.PI.Generator.TypeYearCountURN.CountPrecision=5
 #MCR.PI.Generator.TypeYearCountURN.Type=dnbUrn
 
 # MetadataService
-#MCR.PI.MetadataService.DefaultURNXpath=org.mycore.pi.urn.MCRPIXPathMetadataService
+#MCR.PI.MetadataService.DefaultURNXpat.Class=org.mycore.pi.urn.MCRPIXPathMetadataService
 #MCR.PI.MetadataService.DefaultURNXpath.Xpath=/mycoreobject/metadata/def.identifier[@class='MCRMetaLangText']/identifier[@type='urn'][starts-with(text(), 'urn:example-prefix')]
 
-MCR.Access.Facts.Condition.piregistered=org.mycore.pi.access.facts.condition.MCRPIHasRegisteredCondition
+MCR.Access.Facts.Condition.piregistered.Class=org.mycore.pi.access.facts.condition.MCRPIHasRegisteredCondition
 MCR.URIResolver.xslIncludes.functions=%MCR.URIResolver.xslIncludes.functions%,functions/pi.xsl
 MCR.URIResolver.ModuleResolver.pi=org.mycore.pi.MCRPIURIResolver
diff --git a/mycore-pi/src/test/java/org/mycore/pi/MCRPIManagerTest.java b/mycore-pi/src/test/java/org/mycore/pi/MCRPIManagerTest.java
index 296d8a8cd4..eb0f1aaba5 100644
--- a/mycore-pi/src/test/java/org/mycore/pi/MCRPIManagerTest.java
+++ b/mycore-pi/src/test/java/org/mycore/pi/MCRPIManagerTest.java
@@ -55,17 +55,17 @@
     @MCRTestProperty(key = "MCR.Metadata.Type.mock", string = "true"),
     @MCRTestProperty(key = "MCR.Metadata.Type.unregisterd", string = "true"),
     @MCRTestProperty(key = "MCR.PI.Resolvers", classNameOf = MCRMockResolver.class),
-    @MCRTestProperty(key = "MCR.PI.Service." + MCRPIManagerTest.MOCK_SERVICE,
+    @MCRTestProperty(key = "MCR.PI.Service." + MCRPIManagerTest.MOCK_SERVICE + ".Class",
         classNameOf = MCRMockIdentifierService.class),
     @MCRTestProperty(key = "MCR.PI.Service." + MCRPIManagerTest.MOCK_SERVICE + ".Generator",
         string = MCRPIManagerTest.MOCK_PID_GENERATOR),
     @MCRTestProperty(key = "MCR.PI.Service." + MCRPIManagerTest.MOCK_SERVICE + ".MetadataService",
         string = MCRPIManagerTest.MOCK_METADATA_SERVICE),
-    @MCRTestProperty(key = "MCR.PI.MetadataService." + MCRPIManagerTest.MOCK_METADATA_SERVICE,
+    @MCRTestProperty(key = "MCR.PI.MetadataService." + MCRPIManagerTest.MOCK_METADATA_SERVICE + ".Class",
         classNameOf = MCRMockMetadataService.class),
     @MCRTestProperty(key = "MCR.PI.MetadataService." + MCRPIManagerTest.MOCK_METADATA_SERVICE + "."
         + MCRMockMetadataService.TEST_PROPERTY, string = MCRMockMetadataService.TEST_PROPERTY_VALUE),
-    @MCRTestProperty(key = "MCR.PI.Generator." + MCRPIManagerTest.MOCK_PID_GENERATOR,
+    @MCRTestProperty(key = "MCR.PI.Generator." + MCRPIManagerTest.MOCK_PID_GENERATOR + ".Class",
         classNameOf = MCRMockIdentifierGenerator.class),
     @MCRTestProperty(key = "MCR.PI.Generator." + MCRPIManagerTest.MOCK_PID_GENERATOR + "."
         + MCRMockIdentifierGenerator.TEST_PROPERTY, string = MCRMockIdentifierGenerator.TEST_PROPERTY_VALUE),
@@ -113,7 +113,7 @@ public void testGet() throws Exception {
 
         MCRObject mcrObject = buildMockObject();
         registrationService.register(mcrObject, null);
-
+        
         MCRPI mcrpi = MCRPIManager.getInstance().get(MOCK_SERVICE, mcrObject.getId().toString(), null);
         assertNotNull(mcrpi);
     }
@@ -183,7 +183,7 @@ private MCRPI generateMCRPI() throws MCRPersistentIdentifierException {
 
     private MCRMockIdentifier generatePIFor(MCRObjectID mycoreID) {
         MCRMockIdentifierGenerator mcrUuidUrnGenerator = MCRConfiguration2.getInstanceOfOrThrow(
-            MCRMockIdentifierGenerator.class, "MCR.PI.Generator." + MOCK_PID_GENERATOR);
+            MCRMockIdentifierGenerator.class, "MCR.PI.Generator." + MOCK_PID_GENERATOR + ".Class");
         MCRObject mcrObject = new MCRObject();
         mcrObject.setId(mycoreID);
         return mcrUuidUrnGenerator.generate(mcrObject, "");
diff --git a/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIAndPredicateTest.java b/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIAndPredicateTest.java
index 4aa2429fbf..9bd5f6acf0 100644
--- a/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIAndPredicateTest.java
+++ b/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIAndPredicateTest.java
@@ -35,15 +35,17 @@
 })
 public class MCRPIAndPredicateTest {
 
-    private static final String KEY_CREATION_PREDICATE = "MCR.PI.Service.Mock.CreationPredicate";
+    public static final String PREFIX = "MCR.PI.Service.Mock.CreationPredicate";
 
-    private static final String KEY_CREATION_PREDICATE_1 = KEY_CREATION_PREDICATE + ".1";
+    private static final String KEY_CREATION_PREDICATE = PREFIX + ".Class";
 
-    private static final String KEY_CREATION_PREDICATE_1_1 = KEY_CREATION_PREDICATE + ".1.1";
+    private static final String KEY_CREATION_PREDICATE_1 = PREFIX + ".1.Class";
 
-    private static final String KEY_CREATION_PREDICATE_1_2 = KEY_CREATION_PREDICATE + ".1.2";
+    private static final String KEY_CREATION_PREDICATE_1_1 = PREFIX + ".1.1.Class";
 
-    private static final String KEY_CREATION_PREDICATE_2 = KEY_CREATION_PREDICATE + ".2";
+    private static final String KEY_CREATION_PREDICATE_1_2 = PREFIX + ".1.2.Class";
+
+    private static final String KEY_CREATION_PREDICATE_2 = PREFIX + ".2.Class";
 
     @Test
     @MCRTestConfiguration(properties = {
diff --git a/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIOrPredicateTest.java b/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIOrPredicateTest.java
index cc7b22e54a..ef3a26c585 100644
--- a/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIOrPredicateTest.java
+++ b/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIOrPredicateTest.java
@@ -35,15 +35,17 @@
 })
 public class MCRPIOrPredicateTest {
 
-    private static final String KEY_CREATION_PREDICATE = "MCR.PI.Service.Mock.CreationPredicate";
+    public static final String PREFIX = "MCR.PI.Service.Mock.CreationPredicate";
 
-    private static final String KEY_CREATION_PREDICATE_1 = KEY_CREATION_PREDICATE + ".1";
+    private static final String KEY_CREATION_PREDICATE = PREFIX + ".Class";
 
-    private static final String KEY_CREATION_PREDICATE_1_1 = KEY_CREATION_PREDICATE + ".1.1";
+    private static final String KEY_CREATION_PREDICATE_1 = PREFIX + ".1.Class";
 
-    private static final String KEY_CREATION_PREDICATE_1_2 = KEY_CREATION_PREDICATE + ".1.2";
+    private static final String KEY_CREATION_PREDICATE_1_1 = PREFIX + ".1.1.Class";
 
-    private static final String KEY_CREATION_PREDICATE_2 = KEY_CREATION_PREDICATE + ".2";
+    private static final String KEY_CREATION_PREDICATE_1_2 = PREFIX + ".1.2.Class";
+
+    private static final String KEY_CREATION_PREDICATE_2 = PREFIX + ".2.Class";
 
     @Test
     @MCRTestConfiguration(properties = {
diff --git a/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIXPathPredicateTest.java b/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIXPathPredicateTest.java
index dbba92c60f..8d9726c248 100644
--- a/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIXPathPredicateTest.java
+++ b/mycore-pi/src/test/java/org/mycore/pi/condition/MCRPIXPathPredicateTest.java
@@ -36,9 +36,11 @@
 })
 public class MCRPIXPathPredicateTest {
 
-    private static final String KEY_CREATION_PREDICATE = "MCR.PI.Service.Mock.CreationPredicate";
+    public static final String PREFIX = "MCR.PI.Service.Mock.CreationPredicate";
 
-    private static final String KEY_CREATION_PREDICATE_XPATH = KEY_CREATION_PREDICATE + ".XPath";
+    private static final String KEY_CREATION_PREDICATE = PREFIX + ".Class";
+
+    private static final String KEY_CREATION_PREDICATE_XPATH = PREFIX + ".XPath";
 
     @Test
     @MCRTestConfiguration(properties = {
diff --git a/mycore-pi/src/test/java/org/mycore/pi/doi/MCRMapObjectIDDOIGeneratorTest.java b/mycore-pi/src/test/java/org/mycore/pi/doi/MCRMapObjectIDDOIGeneratorTest.java
index d4490e5f3b..101ddb8bca 100644
--- a/mycore-pi/src/test/java/org/mycore/pi/doi/MCRMapObjectIDDOIGeneratorTest.java
+++ b/mycore-pi/src/test/java/org/mycore/pi/doi/MCRMapObjectIDDOIGeneratorTest.java
@@ -38,7 +38,7 @@
 @MyCoReTest
 @MCRTestConfiguration(properties = {
     @MCRTestProperty(key = "MCR.Metadata.Type.test", string = "true"),
-    @MCRTestProperty(key = "MCR.PI.Generator.MapObjectIDDOI", classNameOf = MCRMapObjectIDDOIGenerator.class),
+    @MCRTestProperty(key = "MCR.PI.Generator.MapObjectIDDOI.Class", classNameOf = MCRMapObjectIDDOIGenerator.class),
     @MCRTestProperty(key = "MCR.PI.Generator.MapObjectIDDOI.Prefix.junit_test", string = TEST_DOI_PREFIX),
     @MCRTestProperty(key = "MCR.PI.Generator.MapObjectIDDOI.Prefix.my_test", string = TEST_DOI_PREFIX + "/my.")
 })
@@ -49,7 +49,7 @@ public class MCRMapObjectIDDOIGeneratorTest {
     @BeforeEach
     public void setUp() {
         doiGenerator = MCRConfiguration2.getInstanceOfOrThrow(
-            MCRMapObjectIDDOIGenerator.class, "MCR.PI.Generator.MapObjectIDDOI");
+            MCRMapObjectIDDOIGenerator.class, "MCR.PI.Generator.MapObjectIDDOI.Class");
     }
 
     @Test
diff --git a/mycore-pi/src/test/java/org/mycore/pi/purl/MCRIDPURLGeneratorTest.java b/mycore-pi/src/test/java/org/mycore/pi/purl/MCRIDPURLGeneratorTest.java
index 4b809abac6..861c0320da 100644
--- a/mycore-pi/src/test/java/org/mycore/pi/purl/MCRIDPURLGeneratorTest.java
+++ b/mycore-pi/src/test/java/org/mycore/pi/purl/MCRIDPURLGeneratorTest.java
@@ -33,11 +33,11 @@
 @MyCoReTest
 @MCRTestConfiguration(properties = {
     @MCRTestProperty(key = "MCR.Metadata.Type.test", string = "true"),
-    @MCRTestProperty(key = GENERATOR_CONFIG_PREFIX + MCRIDPURLGeneratorTest.GENERATOR_1,
+    @MCRTestProperty(key = GENERATOR_CONFIG_PREFIX + MCRIDPURLGeneratorTest.GENERATOR_1 + ".Class",
         classNameOf = MCRIDPURLGenerator.class),
     @MCRTestProperty(key = GENERATOR_CONFIG_PREFIX + MCRIDPURLGeneratorTest.GENERATOR_1 + ".BaseURLTemplate",
         string = MCRIDPURLGeneratorTest.TEST_BASE_1),
-    @MCRTestProperty(key = GENERATOR_CONFIG_PREFIX + MCRIDPURLGeneratorTest.GENERATOR_2,
+    @MCRTestProperty(key = GENERATOR_CONFIG_PREFIX + MCRIDPURLGeneratorTest.GENERATOR_2 + ".Class",
         classNameOf = MCRIDPURLGenerator.class),
     @MCRTestProperty(key = GENERATOR_CONFIG_PREFIX + MCRIDPURLGeneratorTest.GENERATOR_2 + ".BaseURLTemplate",
         string = MCRIDPURLGeneratorTest.TEST_BASE_2)
@@ -59,12 +59,12 @@ public void generate() throws MCRPersistentIdentifierException {
         mcrObject.setId(testID);
 
         MCRIDPURLGenerator generator1 = MCRConfiguration2.getInstanceOfOrThrow(
-            MCRIDPURLGenerator.class, GENERATOR_CONFIG_PREFIX + GENERATOR_1);
+            MCRIDPURLGenerator.class, GENERATOR_CONFIG_PREFIX + GENERATOR_1 + ".Class");
         assertEquals("http://purl.myurl.de/my_test_00000001",
                 generator1.generate(mcrObject, "").asString(), "");
 
         MCRIDPURLGenerator generator2 = MCRConfiguration2.getInstanceOfOrThrow(
-            MCRIDPURLGenerator.class, GENERATOR_CONFIG_PREFIX + GENERATOR_2);
+            MCRIDPURLGenerator.class, GENERATOR_CONFIG_PREFIX + GENERATOR_2 + ".Class");
         assertEquals("http://purl.myurl.de/my_test_00000001/my_test_00000001/my_test_00000001",
                 generator2.generate(mcrObject, "").asString(), "");
 
diff --git a/mycore-pi/src/test/java/org/mycore/pi/urn/MCRDNBURNGeneratorTest.java b/mycore-pi/src/test/java/org/mycore/pi/urn/MCRDNBURNGeneratorTest.java
index 09ead7b282..d76cf8d728 100644
--- a/mycore-pi/src/test/java/org/mycore/pi/urn/MCRDNBURNGeneratorTest.java
+++ b/mycore-pi/src/test/java/org/mycore/pi/urn/MCRDNBURNGeneratorTest.java
@@ -42,7 +42,7 @@
     @MCRTestProperty(key = "MCR.Access.Class", classNameOf = MCRAccessBaseImpl.class),
     @MCRTestProperty(key = "MCR.Metadata.Type.mock", string = "true"),
     @MCRTestProperty(key = "MCR.Metadata.Type.unregisterd", string = "true"),
-    @MCRTestProperty(key = "MCR.PI.Generator." + MCRDNBURNGeneratorTest.GENERATOR_ID,
+    @MCRTestProperty(key = "MCR.PI.Generator." + MCRDNBURNGeneratorTest.GENERATOR_ID + ".Class",
         classNameOf = MCRFLURNGenerator.class),
     @MCRTestProperty(key = "MCR.PI.Generator." + MCRDNBURNGeneratorTest.GENERATOR_ID + ".Namespace",
         string = "urn:nbn:de:gbv")
@@ -59,7 +59,7 @@ public void generate()  {
         MCRObject mcrObject1 = new MCRObject();
         mcrObject1.setId(getID);
         MCRFLURNGenerator flGenerator = MCRConfiguration2.getInstanceOfOrThrow(
-            MCRFLURNGenerator.class, "MCR.PI.Generator." + GENERATOR_ID);
+            MCRFLURNGenerator.class, "MCR.PI.Generator." + GENERATOR_ID + ".Class");
         MCRDNBURN generated = flGenerator.generate(mcrObject1, "");
 
         String urn = generated.asString();
diff --git a/mycore-pi/src/test/java/org/mycore/pi/urn/rest/MCRURNGranularRESTServiceTest.java b/mycore-pi/src/test/java/org/mycore/pi/urn/rest/MCRURNGranularRESTServiceTest.java
index 986a455523..7df0fd9942 100644
--- a/mycore-pi/src/test/java/org/mycore/pi/urn/rest/MCRURNGranularRESTServiceTest.java
+++ b/mycore-pi/src/test/java/org/mycore/pi/urn/rest/MCRURNGranularRESTServiceTest.java
@@ -82,7 +82,7 @@
     @MCRTestProperty(key = "MCR.IFS2.Store.mycore_derivate.SlotLayout", string = "4-2-2"),
     @MCRTestProperty(key = "MCR.EventHandler.MCRDerivate.020.Class", classNameOf = MCRXMLMetadataEventHandler.class),
     @MCRTestProperty(key = "MCR.EventHandler.MCRDerivate.030.Class", classNameOf = MCRLinkTableEventHandler.class),
-    @MCRTestProperty(key = "MCR.PI.Generator.UUID", classNameOf = MCRUUIDURNGenerator.class),
+    @MCRTestProperty(key = "MCR.PI.Generator.UUID.Class", classNameOf = MCRUUIDURNGenerator.class),
     @MCRTestProperty(key = "MCR.PI.Generator.UUID.Namespace", string = "frontend-"),
     @MCRTestProperty(key = "MCR.PI.DNB.Credentials.Login", string = "test"),
     @MCRTestProperty(key = "MCR.PI.DNB.Credentials.Password", string = "test")
@@ -110,6 +110,7 @@ public void fullRegister(MCRMetadataExtension.BaseDirs baseDirs) throws Exceptio
         object = createObject();
         derivate = createDerivate(object.getId());
         MCRMetadataManager.create(object);
+
         MCRMetadataManager.create(derivate);
 
         List<MCRPath> fileList = new ArrayList<>();
diff --git a/mycore-restapi/src/main/java/org/mycore/restapi/v2/MCRRestV2App.java b/mycore-restapi/src/main/java/org/mycore/restapi/v2/MCRRestV2App.java
index 3a5cd6811e..2f28b6a844 100644
--- a/mycore-restapi/src/main/java/org/mycore/restapi/v2/MCRRestV2App.java
+++ b/mycore-restapi/src/main/java/org/mycore/restapi/v2/MCRRestV2App.java
@@ -19,16 +19,21 @@
 package org.mycore.restapi.v2;
 
 import java.net.URI;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
+import java.util.Collection;
 import java.util.Map;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
+import org.mycore.common.MCRClassTools;
 import org.mycore.common.MCRCoreVersion;
 import org.mycore.common.config.MCRConfiguration2;
-import org.mycore.common.config.annotation.MCRRawProperties;
+import org.mycore.common.config.MCRConfigurationException;
+import org.mycore.common.config.annotation.MCRConfigurationProxy;
+import org.mycore.common.config.annotation.MCRInstanceMap;
+import org.mycore.common.config.annotation.MCRPostConstruction;
+import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.frontend.MCRFrontendUtil;
 import org.mycore.restapi.MCRApiDraftFilter;
 import org.mycore.restapi.MCRContentNegotiationViaExtensionFilter;
@@ -50,7 +55,6 @@
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
 import io.swagger.v3.oas.models.servers.Server;
-
 import jakarta.ws.rs.ApplicationPath;
 import jakarta.ws.rs.InternalServerErrorException;
 
@@ -62,8 +66,8 @@ public class MCRRestV2App extends MCRJerseyRestApp {
     public MCRRestV2App() {
         super();
 
-        this.serviceBindingsResolver =
-            MCRConfiguration2.getInstanceOfOrThrow(BindingsResolver.class, "MCR.RestAPI.V2.Services");
+        serviceBindingsResolver = MCRConfiguration2.getInstanceOfOrThrow(BindingsResolver.class,
+            "MCR.RestAPI.V2.Services.Class");
 
         register(MCRContentNegotiationViaExtensionFilter.class);
         register(MCRNormalizeMCRObjectIDsFilter.class);
@@ -85,11 +89,11 @@ protected String getVersion() {
     }
 
     private void registerServices() {
-        final Map<Class<?>, Class<?>> bindings = this.serviceBindingsResolver.resolve();
+        Collection<Binding> bindings = this.serviceBindingsResolver.resolve();
         register(new AbstractBinder() {
             @Override
             protected void configure() {
-                bindings.forEach((from, to) -> bind(from).to(to));
+                bindings.forEach(binding -> bind(binding.implementationClass).to(binding.apiClass));
             }
         });
     }
@@ -137,6 +141,49 @@ private void setupOAS() {
         }
     }
 
+    @MCRConfigurationProxy(proxyClass = Binding.Factory.class)
+    public record Binding(Class<?> implementationClass, Class<?> apiClass) {
+
+        public static final class Factory implements Supplier<Binding> {
+
+            @MCRProperty(name = "From")
+            public String implementationClass;
+
+            @MCRProperty(name = "To")
+            public String apiClass;
+
+            private String property;
+
+            @MCRPostConstruction(MCRPostConstruction.Value.CANONICAL)
+            public void init(String property) {
+                this.property = property;
+            }
+
+            @Override
+            public Binding get() {
+                Class<?> implementationClass = toClass(this.implementationClass, "From");
+                Class<?> apiClass = toClass(this.apiClass, "To");
+                if (!apiClass.isAssignableFrom(implementationClass)) {
+                    throw new IllegalArgumentException("Implementation " + this.implementationClass + " configured in "
+                        + property + ".From does not implement/extend " + this.apiClass + " configured in "
+                        + property + ".To");
+                }
+                return new Binding(implementationClass, apiClass);
+            }
+
+            private Class<?> toClass(String className, String key) {
+                try {
+                    return MCRClassTools.forName(className);
+                } catch (ClassNotFoundException e) {
+                    throw new MCRConfigurationException("Cannot load class " + className + "configured in "
+                        + property + "." + key, e);
+                }
+            }
+
+        }
+
+    }
+
     /**
      * Scans entries like:
      * <ul>
@@ -146,57 +193,15 @@ private void setupOAS() {
      * <p>
      * and returns a map of From -> To classes for DI registration.
      */
-    public static class BindingsResolver {
+    public static final class BindingsResolver {
 
-        @MCRRawProperties(namePattern = "*", required = false)
-        public Map<String, String> bindings;
+        @MCRInstanceMap(valueClass = Binding.class)
+        public Map<String, Binding> bindings;
 
-        public Map<Class<?>, Class<?>> resolve() {
-            Map<String, String> props = (bindings != null) ? bindings : Map.of();
-
-            Map<String, String> fromByName = new HashMap<>();
-            Map<String, String> toByName = new HashMap<>();
-
-            for (Map.Entry<String, String> entry : props.entrySet()) {
-                String key = entry.getKey();
-                String value = entry.getValue() != null ? entry.getValue().trim() : null;
-                if (value == null || value.isEmpty()) {
-                    continue;
-                }
-                int dotIndex = key.lastIndexOf('.');
-                if (dotIndex < 0) {
-                    continue;
-                }
-                String name = key.substring(0, dotIndex);
-                String suffix = key.substring(dotIndex + 1);
-                if ("From".equals(suffix)) {
-                    fromByName.put(name, value);
-                } else if ("To".equals(suffix)) {
-                    toByName.put(name, value);
-                }
-            }
-            Map<Class<?>, Class<?>> result = new LinkedHashMap<>();
-            for (String name : toByName.keySet()) {
-                String toClassName = toByName.get(name);
-                String fromClassName = fromByName.get(name);
-                if (toClassName == null || fromClassName == null) {
-                    throw new IllegalStateException("Missing From/To for service: " + name);
-                }
-                try {
-                    Class<?> toCls = Class.forName(toClassName);
-                    Class<?> fromCls = Class.forName(fromClassName);
-                    if (!toCls.isAssignableFrom(fromCls)) {
-                        throw new IllegalArgumentException(
-                            "Implementation " + fromCls.getName() + " does not implement/extend " + toCls.getName());
-                    }
-                    result.put(fromCls, toCls);
-                } catch (ClassNotFoundException ex) {
-                    throw new IllegalStateException("Cannot load classes for service " + name + ": " + ex.getMessage(),
-                        ex);
-                }
-            }
-            return result;
+        public Collection<Binding> resolve() {
+            return bindings.values();
         }
+
     }
 
 }
diff --git a/mycore-restapi/src/main/resources/components/restapi/config/deprecated.properties b/mycore-restapi/src/main/resources/components/restapi/config/deprecated.properties
new file mode 100644
index 0000000000..4b0615efa2
--- /dev/null
+++ b/mycore-restapi/src/main/resources/components/restapi/config/deprecated.properties
@@ -0,0 +1 @@
+MCR.RestAPI.V2.Services=MCR.RestAPI.V2.Services.Class
diff --git a/mycore-restapi/src/main/resources/components/restapi/config/mycore.properties b/mycore-restapi/src/main/resources/components/restapi/config/mycore.properties
index 1d27334bf3..4789c1a49f 100644
--- a/mycore-restapi/src/main/resources/components/restapi/config/mycore.properties
+++ b/mycore-restapi/src/main/resources/components/restapi/config/mycore.properties
@@ -47,6 +47,6 @@ MCR.RestApi.Draft.MCRObjectState=false
 MCR.URIResolver.ModuleResolver.checkrestapiaccess=org.mycore.restapi.v2.MCRRestCheckAPIAccessResolver
 
 # V2 Services
-MCR.RestAPI.V2.Services=org.mycore.restapi.v2.MCRRestV2App$BindingsResolver
+MCR.RestAPI.V2.Services.Class=org.mycore.restapi.v2.MCRRestV2App$BindingsResolver
 MCR.RestAPI.V2.Services.ObjectLockService.From=org.mycore.restapi.v2.service.MCRRestObjectLockServiceImpl
 MCR.RestAPI.V2.Services.ObjectLockService.To= org.mycore.restapi.v2.service.MCRRestObjectLockService
diff --git a/mycore-solr/src/main/java/org/mycore/solr/index/document/MCRSolrInputDocumentFactory.java b/mycore-solr/src/main/java/org/mycore/solr/index/document/MCRSolrInputDocumentFactory.java
index e43b231548..10715a83f8 100644
--- a/mycore-solr/src/main/java/org/mycore/solr/index/document/MCRSolrInputDocumentFactory.java
+++ b/mycore-solr/src/main/java/org/mycore/solr/index/document/MCRSolrInputDocumentFactory.java
@@ -41,7 +41,7 @@ public abstract class MCRSolrInputDocumentFactory {
 
     public static MCRSolrInputDocumentFactory obtainInstance() {
         return MCRConfiguration2.getInstanceOfOrThrow(MCRSolrInputDocumentFactory.class,
-            SOLR_CONFIG_PREFIX + "SolrInputDocument.Factory");
+            SOLR_CONFIG_PREFIX + "SolrInputDocument.Factory.Class");
     }
 
     public abstract SolrInputDocument getDocument(MCRObjectID id, MCRContent content) throws SAXException, IOException;
diff --git a/mycore-solr/src/main/java/org/mycore/solr/index/file/MCRSolrPathDocumentFactory.java b/mycore-solr/src/main/java/org/mycore/solr/index/file/MCRSolrPathDocumentFactory.java
index 6fa795e462..cb9f08db2c 100644
--- a/mycore-solr/src/main/java/org/mycore/solr/index/file/MCRSolrPathDocumentFactory.java
+++ b/mycore-solr/src/main/java/org/mycore/solr/index/file/MCRSolrPathDocumentFactory.java
@@ -47,7 +47,7 @@ public class MCRSolrPathDocumentFactory {
 
     private static final String ACCUMULATOR_LIST_PROPERTY_NAME = SOLR_CONFIG_PREFIX + "Indexer.File.AccumulatorList";
 
-    private static final String CLASS_PROPERTY = SOLR_CONFIG_PREFIX + "SolrInputDocument.Path.Factory";
+    private static final String CLASS_PROPERTY = SOLR_CONFIG_PREFIX + "SolrInputDocument.Path.Factory.Class";
 
     private static final List<MCRSolrFileIndexAccumulator> ACCUMULATOR_LIST = resolveAccumulators();
 
diff --git a/mycore-solr/src/main/java/org/mycore/solr/index/handlers/MCRSolrIndexHandlerFactory.java b/mycore-solr/src/main/java/org/mycore/solr/index/handlers/MCRSolrIndexHandlerFactory.java
index 4a5653eb85..49d2ceac1b 100644
--- a/mycore-solr/src/main/java/org/mycore/solr/index/handlers/MCRSolrIndexHandlerFactory.java
+++ b/mycore-solr/src/main/java/org/mycore/solr/index/handlers/MCRSolrIndexHandlerFactory.java
@@ -51,7 +51,7 @@ public abstract class MCRSolrIndexHandlerFactory {
 
     public static MCRSolrIndexHandlerFactory obtainInstance() {
         return MCRConfiguration2.getInstanceOfOrThrow(MCRSolrIndexHandlerFactory.class,
-            SOLR_CONFIG_PREFIX + "IndexHandler.Factory");
+            SOLR_CONFIG_PREFIX + "IndexHandler.Factory.Class");
     }
 
     public abstract MCRSolrIndexHandler getIndexHandler(MCRContent content, MCRObjectID id);
diff --git a/mycore-solr/src/main/java/org/mycore/solr/index/strategy/MCRSolrIndexStrategyManager.java b/mycore-solr/src/main/java/org/mycore/solr/index/strategy/MCRSolrIndexStrategyManager.java
index 2c923fd17f..497d556a31 100644
--- a/mycore-solr/src/main/java/org/mycore/solr/index/strategy/MCRSolrIndexStrategyManager.java
+++ b/mycore-solr/src/main/java/org/mycore/solr/index/strategy/MCRSolrIndexStrategyManager.java
@@ -32,7 +32,7 @@
 public class MCRSolrIndexStrategyManager {
 
     private static final MCRSolrFileStrategy FILE_STRATEGY = MCRConfiguration2
-        .getInstanceOfOrThrow(MCRSolrFileStrategy.class, SOLR_CONFIG_PREFIX + "FileIndexStrategy");
+        .getInstanceOfOrThrow(MCRSolrFileStrategy.class, SOLR_CONFIG_PREFIX + "FileIndexStrategy.Class");
 
     public static boolean checkFile(Path file, BasicFileAttributes attrs) {
         return FILE_STRATEGY.check(file, attrs);
diff --git a/mycore-solr/src/main/resources/components/solr/config/deprecated.properties b/mycore-solr/src/main/resources/components/solr/config/deprecated.properties
index d9dc21cfdf..a4bba7a775 100644
--- a/mycore-solr/src/main/resources/components/solr/config/deprecated.properties
+++ b/mycore-solr/src/main/resources/components/solr/config/deprecated.properties
@@ -50,3 +50,7 @@ MCR.Solr.ServerURL=(MCR.Solr.IndexRegistry.Index.main.SolrUrl and MCR.Solr.Index
 MCR.Solr.Core.main.ServerURL=MCR.Solr.IndexRegistry.Index.main.SolrUrl or MCR.Solr.IndexRegistry.Index.main.SolrUrls
 MCR.Solr.Core.classification.ServerURL=MCR.Solr.IndexRegistry.Index.classification.SolrUrl or MCR.Solr.IndexRegistry.Index.classification.SolrUrls
 
+MCR.Module-classbrowser.QueryAdapter=MCR.Module-classbrowser.QueryAdapter.Class
+MCR.Solr.SolrInputDocument.Factory=MCR.Solr.SolrInputDocument.Factory.Class
+MCR.Solr.SolrInputDocument.Path.Factory=MCR.Solr.SolrInputDocument.Path.Factory.Class
+MCR.Solr.IndexHandler.Factory=MCR.Solr.IndexHandler.Factory.Class
diff --git a/mycore-solr/src/main/resources/components/solr/config/mycore.properties b/mycore-solr/src/main/resources/components/solr/config/mycore.properties
index ebb858b104..96246fa92c 100644
--- a/mycore-solr/src/main/resources/components/solr/config/mycore.properties
+++ b/mycore-solr/src/main/resources/components/solr/config/mycore.properties
@@ -84,7 +84,7 @@ MCR.URIResolver.ModuleResolver.solrfields=org.mycore.solr.common.xml.MCRSolrFiel
 
 MCR.URIResolver.xslImports.solr-document=solr/indexing/solr-basetemplate.xsl
 
-MCR.Module-classbrowser.QueryAdapter=org.mycore.solr.search.MCRSolrQueryAdapter
+MCR.Module-classbrowser.QueryAdapter.Class=org.mycore.solr.search.MCRSolrQueryAdapter
 
 MCR.Solr.Indexer.File.AccumulatorList=%MCR.Solr.Indexer.File.AccumulatorList%,org.mycore.solr.index.file.MCRSolrFileIndexBaseAccumulator,org.mycore.solr.index.file.tika.MCRSolrRemoteTikaAccumulator
 # define how many mycoreobjects will be sent to solr when rebuilding the metadata index
@@ -101,13 +101,13 @@ MCR.Solr.ExtractPath=/update/extract
 MCR.Solr.Proxy.WhiteList=/select
 
 
-MCR.Solr.SolrInputDocument.Factory=org.mycore.solr.index.document.MCRSolrTransformerInputDocumentFactory
+MCR.Solr.SolrInputDocument.Factory.Class=org.mycore.solr.index.document.MCRSolrTransformerInputDocumentFactory
 MCR.Solr.SolrInputDocument.Transformer=mycoreobject-solrdocument
 MCR.Solr.SolrInputDocument.MinimalFields=objectType,objectProject,derivateID,fileName,filePath,returnId,derivateMaindoc,created,modified,parent,state
 
-MCR.Solr.SolrInputDocument.Path.Factory=org.mycore.solr.index.file.MCRSolrPathDocumentFactory
+MCR.Solr.SolrInputDocument.Path.Factory.Class=org.mycore.solr.index.file.MCRSolrPathDocumentFactory
 
-MCR.Solr.IndexHandler.Factory=org.mycore.solr.index.handlers.MCRSolrLazyInputDocumentHandlerFactory
+MCR.Solr.IndexHandler.Factory.Class=org.mycore.solr.index.handlers.MCRSolrLazyInputDocumentHandlerFactory
 
 # the stylesheet used to add fields to the <user/> element on mycore side
 # due to a bug in mcr this must be set (even when the stylesheet named in the
@@ -132,7 +132,7 @@ MCR.ContentTransformer.response-prepared.Class=org.mycore.common.content.transfo
 MCR.ContentTransformer.response-prepared.TransformerFactoryClass=%SAXON%
 MCR.ContentTransformer.response-prepared.Stylesheet=xslt/solr/response/response-join-results.xsl,xslt/solr/response/response-addDocId.xsl,xslt/solr/response/response-addDerivates.xsl
 
-MCR.Solr.FileIndexStrategy=org.mycore.solr.index.strategy.MCRSolrMimeTypeStrategy
+MCR.Solr.FileIndexStrategy.Class=org.mycore.solr.index.strategy.MCRSolrMimeTypeStrategy
 MCR.Solr.MimeTypeStrategy.Pattern=image/.*
 
 # Deactivate dynamic fields per default (mycoreobject-solrdocument transformer)
diff --git a/mycore-viewer/src/main/java/org/mycore/viewer/resources/MCRViewerResource.java b/mycore-viewer/src/main/java/org/mycore/viewer/resources/MCRViewerResource.java
index fbd0b3fe3e..82bd7870f0 100644
--- a/mycore-viewer/src/main/java/org/mycore/viewer/resources/MCRViewerResource.java
+++ b/mycore-viewer/src/main/java/org/mycore/viewer/resources/MCRViewerResource.java
@@ -62,7 +62,7 @@
 public class MCRViewerResource {
 
     private static final MCRIviewACLProvider IVIEW_ACL_PROVDER = MCRConfiguration2.getInstanceOfOrThrow(
-        MCRIviewACLProvider.class, "MCR.Viewer.MCRIviewACLProvider");
+        MCRIviewACLProvider.class, "MCR.Viewer.MCRIviewACLProvider.Class");
 
     private static final String JSON_CONFIG_ELEMENT_NAME = "json";
 
@@ -143,7 +143,7 @@ protected MCRContent getContent(final HttpServletRequest req)
         }
         // build configuration object
         MCRViewerConfigurationStrategy configurationStrategy = MCRConfiguration2.getInstanceOfOrThrow(
-            MCRViewerConfigurationStrategy.class, "MCR.Viewer.configuration.strategy");
+            MCRViewerConfigurationStrategy.class, "MCR.Viewer.configuration.strategy.Class");
         MCRJDOMContent source = new MCRJDOMContent(buildResponseDocument(configurationStrategy.get(req)));
         MCRParameterCollector parameter = new MCRParameterCollector(req);
         MCRContentTransformer transformer = getContentTransformer(source.getDocType(), parameter);
diff --git a/mycore-viewer/src/main/resources/components/viewer/config/deprecated.properties b/mycore-viewer/src/main/resources/components/viewer/config/deprecated.properties
index e51cb018e9..3e6d64a099 100644
--- a/mycore-viewer/src/main/resources/components/viewer/config/deprecated.properties
+++ b/mycore-viewer/src/main/resources/components/viewer/config/deprecated.properties
@@ -1,2 +1,4 @@
 MCR.Viewer.bootstrapURL=MCR.Viewer.Bootstrap.Css.URL
 MCR.Viewer.FontaweSomeURL=MCR.Viewer.Fontawesome.Css.URL
+MCR.Viewer.configuration.strategy=MCR.Viewer.configuration.strategy.Class
+MCR.Viewer.MCRIviewACLProvider=MCR.Viewer.MCRIviewACLProvider.Class
diff --git a/mycore-viewer/src/main/resources/components/viewer/config/mycore.properties b/mycore-viewer/src/main/resources/components/viewer/config/mycore.properties
index 52681defac..d3427a17d5 100644
--- a/mycore-viewer/src/main/resources/components/viewer/config/mycore.properties
+++ b/mycore-viewer/src/main/resources/components/viewer/config/mycore.properties
@@ -13,8 +13,8 @@ MCR.Viewer.Fontawesome.Css.Integrity=sha384-nRgPTkuX86pH8yjPJUAFuASXQSSl2/bBUiNV
 
 MCR.URIResolver.xslIncludes.components-3=%MCR.URIResolver.xslIncludes.components-3%,altoChanges.xsl
 
-MCR.Viewer.configuration.strategy=org.mycore.viewer.configuration.MCRViewerDefaultConfigurationStrategy
-MCR.Viewer.MCRIviewACLProvider=org.mycore.viewer.configuration.MCRIviewDefaultACLProvider
+MCR.Viewer.configuration.strategy.Class=org.mycore.viewer.configuration.MCRViewerDefaultConfigurationStrategy
+MCR.Viewer.MCRIviewACLProvider.Class=org.mycore.viewer.configuration.MCRIviewDefaultACLProvider
 
 MCR.Viewer.AltoChangeSetStore.Class=org.mycore.viewer.alto.service.impl.MCRJPAAltoChangeSetStore
 MCR.Viewer.AltoChangeApplier.Class=org.mycore.viewer.alto.service.impl.MCRDefaultAltoChangeApplier
diff --git a/mycore-webtools/src/main/java/org/mycore/webtools/upload/MCRUploadResource.java b/mycore-webtools/src/main/java/org/mycore/webtools/upload/MCRUploadResource.java
index 010870ad8c..a46e1252ec 100644
--- a/mycore-webtools/src/main/java/org/mycore/webtools/upload/MCRUploadResource.java
+++ b/mycore-webtools/src/main/java/org/mycore/webtools/upload/MCRUploadResource.java
@@ -162,7 +162,7 @@ public Response commit(@PathParam("buckedID") String buckedID) {
 
     public static MCRUploadHandler getUploadHandler(String uploadHandlerID) {
         Optional<MCRUploadHandler> uploadHandler = MCRConfiguration2.getSingleInstanceOf(MCRUploadHandler.class,
-            "MCR.Upload.Handler." + Optional.ofNullable(uploadHandlerID).orElse("Default"));
+            "MCR.Upload.Handler." + Optional.ofNullable(uploadHandlerID).orElse("Default") + ".Class");
         if (uploadHandler.isEmpty()) {
             throw new BadRequestException("The UploadHandler " + uploadHandlerID + " is invalid!");
         }
diff --git a/mycore-webtools/src/main/resources/components/webtools/config/deprecated.properties b/mycore-webtools/src/main/resources/components/webtools/config/deprecated.properties
new file mode 100644
index 0000000000..121d816023
--- /dev/null
+++ b/mycore-webtools/src/main/resources/components/webtools/config/deprecated.properties
@@ -0,0 +1 @@
+MCR.Upload.Handler.(\S+).Class=MCR.Upload.Handler.$1.Class
diff --git a/mycore-webtools/src/main/resources/components/webtools/config/mycore.properties b/mycore-webtools/src/main/resources/components/webtools/config/mycore.properties
index e861e83ace..f2090a947b 100644
--- a/mycore-webtools/src/main/resources/components/webtools/config/mycore.properties
+++ b/mycore-webtools/src/main/resources/components/webtools/config/mycore.properties
@@ -8,7 +8,7 @@ MCR.URIResolver.xslIncludes.components-3=%MCR.URIResolver.xslIncludes.components
 
 # filetypes that will be ignored for mainfile, if there are others
 MCR.Upload.NotPreferredFiletypeForMainfile=.xml
-MCR.Upload.Handler.Default=org.mycore.webtools.upload.MCRDefaultUploadHandler
+MCR.Upload.Handler.Default.Class=org.mycore.webtools.upload.MCRDefaultUploadHandler
 
 ##############################################################################
 # Pass Vue Properties                                                        #
diff --git a/mycore-xeditor/src/main/java/org/mycore/frontend/xeditor/MCREditorSession.java b/mycore-xeditor/src/main/java/org/mycore/frontend/xeditor/MCREditorSession.java
index ad70bbed09..abb64bb43c 100644
--- a/mycore-xeditor/src/main/java/org/mycore/frontend/xeditor/MCREditorSession.java
+++ b/mycore-xeditor/src/main/java/org/mycore/frontend/xeditor/MCREditorSession.java
@@ -80,7 +80,8 @@ public class MCREditorSession {
     private MCRXEditorPostProcessor postProcessor = getDefaultPostProcessorImplementation();
 
     private static MCRPostProcessorXSL getDefaultPostProcessorImplementation() {
-        return MCRConfiguration2.getInstanceOfOrThrow(MCRPostProcessorXSL.class, "MCR.XEditor.PostProcessor.Default");
+        return MCRConfiguration2.getInstanceOfOrThrow(MCRPostProcessorXSL.class,
+            "MCR.XEditor.PostProcessor.Default.Class");
     }
 
     public MCREditorSession(Map<String, String[]> requestParameters, MCRParameterCollector collector) {
diff --git a/mycore-xeditor/src/main/resources/components/xeditor/config/deprecated.properties b/mycore-xeditor/src/main/resources/components/xeditor/config/deprecated.properties
index 99bf9aacb4..383b4f48fe 100644
--- a/mycore-xeditor/src/main/resources/components/xeditor/config/deprecated.properties
+++ b/mycore-xeditor/src/main/resources/components/xeditor/config/deprecated.properties
@@ -1 +1,2 @@
 MCR.EditorFramework.DocTypes=MCR.XEditor.DocTypes
+MCR.XEditor.PostProcessor.Default=MCR.XEditor.PostProcessor.Default.Class
diff --git a/mycore-xeditor/src/main/resources/components/xeditor/config/mycore.properties b/mycore-xeditor/src/main/resources/components/xeditor/config/mycore.properties
index 49bf608e1a..8b1aa447a8 100644
--- a/mycore-xeditor/src/main/resources/components/xeditor/config/mycore.properties
+++ b/mycore-xeditor/src/main/resources/components/xeditor/config/mycore.properties
@@ -55,7 +55,7 @@ MCR.XEditor.Validation.Marker.success=mcr-valid
 # This marker is set if validation failed
 MCR.XEditor.Validation.Marker.error=mcr-invalid
 # Sets the default post processor if no class is specified in the xed:postprocessor element
-MCR.XEditor.PostProcessor.Default=org.mycore.frontend.xeditor.MCRPostProcessorXSL
+MCR.XEditor.PostProcessor.Default.Class=org.mycore.frontend.xeditor.MCRPostProcessorXSL
 
 # Default rules for XML cleanup after form submission
 # Numbers are required to enforce a certain order of rules to be applied