diff --git a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/config/SchemaConverterPropertiesConfig.java b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/config/SchemaConverterPropertiesConfig.java
index 7ee550a3cb75c73425b91a83e6c6f7697be9f1cf..7cc6a476bf1438bb8660428d0f41d74a936729b4 100644
--- a/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/config/SchemaConverterPropertiesConfig.java
+++ b/indexer-core/src/main/java/org/opengroup/osdu/indexer/schema/converter/config/SchemaConverterPropertiesConfig.java
@@ -5,9 +5,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import org.opengroup.osdu.core.common.feature.IFeatureFlag;
@@ -29,18 +29,15 @@ public class SchemaConverterPropertiesConfig implements SchemaConverterConfig {
     private Set<String> processedArraysTypes;
     private String defaultObjectArraysType;
 
-    @Autowired
-    private IFeatureFlag featureFlagChecker;
-    @Autowired
-    private BooleanFeatureFlagClient partitionFlagChecker;
+    private final IFeatureFlag featureFlagChecker;
+    private final BooleanFeatureFlagClient partitionFlagChecker;
 
-    public SchemaConverterPropertiesConfig(IFeatureFlag flag, BooleanFeatureFlagClient flagClient) {
-        if (flag != null) featureFlagChecker=flag;
-        if (flagClient != null) partitionFlagChecker=flagClient;
+    public SchemaConverterPropertiesConfig(IFeatureFlag featureFlagChecker, BooleanFeatureFlagClient partitionFlagChecker) {
+        this.featureFlagChecker = featureFlagChecker;
+        this.partitionFlagChecker = partitionFlagChecker;
         skippedDefinitions = getDefaultSkippedDefinitions();
         supportedArrayTypes = getDefaultSupportedArrayTypes();
         specialDefinitionsMap = getDefaultSpecialDefinitionsMap();
-        primitiveTypesMap = getDefaultPrimitiveTypesMap();
         processedArraysTypes = getDefaultArraysTypesForProcessing();
         defaultObjectArraysType = getObjectArraysDefaultType();
     }
@@ -112,6 +109,13 @@ public class SchemaConverterPropertiesConfig implements SchemaConverterConfig {
         return defaultPrimitiveTypesMap;
     }
 
+    public Map<String, String> getPrimitiveTypesMap() {
+        if (primitiveTypesMap == null) {
+            primitiveTypesMap = getDefaultPrimitiveTypesMap();
+        }
+        return primitiveTypesMap;
+    }
+
     private Set<String> getDefaultArraysTypesForProcessing() {
         return new HashSet<>(Arrays.asList("nested"));
     }