diff --git a/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java b/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
index 983038c812..f17a7f6417 100644
--- a/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
+++ b/dspace-api/src/main/java/org/dspace/administer/CreateAdministrator.java
@@ -16,7 +16,6 @@ import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.PosixParser;
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.I18nUtil;
 import org.dspace.eperson.EPerson;
@@ -24,6 +23,8 @@ import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * A command-line tool for creating an initial administrator for setting up a
@@ -147,9 +148,10 @@ public final class CreateAdministrator {
                 lastName = lastName.trim();
             }
 
-            if (ConfigurationManager.getProperty("webui.supported.locales") != null) {
-                System.out.println("Select one of the following languages: " + ConfigurationManager
-                    .getProperty("webui.supported.locales"));
+            ConfigurationService cfg = DSpaceServicesFactory.getInstance().getConfigurationService();
+            if (cfg.hasProperty("webui.supported.locales")) {
+                System.out.println("Select one of the following languages: "
+                        + cfg.getProperty("webui.supported.locales"));
                 System.out.print("Language: ");
                 System.out.flush();
 
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
index 869c7d13fc..5d7c6e2914 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
@@ -51,7 +51,6 @@ import org.dspace.content.service.MetadataValueService;
 import org.dspace.content.service.RelationshipService;
 import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
@@ -61,6 +60,8 @@ import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
 import org.dspace.scripts.DSpaceRunnable;
 import org.dspace.scripts.handler.DSpaceRunnableHandler;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.utils.DSpace;
 import org.dspace.workflow.WorkflowException;
 import org.dspace.workflow.WorkflowItem;
@@ -116,7 +117,7 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
     protected static HashMap<UUID, String> entityTypeMap = new HashMap<>();
 
     /**
-     * Map of UUIDs to their relations that are referenced within any import with their referers.
+     * Map of UUIDs to their relations that are referenced within any import with their referrers.
      *
      * @see #populateEntityRelationMap(String, String, String)
      */
@@ -129,7 +130,7 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
     protected ArrayList<String> relationValidationErrors = new ArrayList<>();
 
     /**
-     * Counter of rows proccssed in a CSV.
+     * Counter of rows processed in a CSV.
      */
     protected Integer rowCount = 1;
 
@@ -158,6 +159,8 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
     protected EntityService entityService = ContentServiceFactory.getInstance().getEntityService();
     protected AuthorityValueService authorityValueService = AuthorityServiceFactory.getInstance()
                                                                                    .getAuthorityValueService();
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Create an instance of the metadata importer. Requires a context and an array of CSV lines
@@ -419,7 +422,7 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
                         // Do nothing
                     } else if ("expunge".equals(action)) {
                         // Does the configuration allow deletes?
-                        if (!ConfigurationManager.getBooleanProperty("bulkedit", "allowexpunge", false)) {
+                        if (!configurationService.getBooleanProperty("bulkedit.allowexpunge", false)) {
                             throw new MetadataImportException("'expunge' action denied by configuration");
                         }
 
@@ -1368,12 +1371,12 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
      * Set authority controlled fields
      */
     private void setAuthorizedMetadataFields() {
-        authorityControlled = new HashSet<String>();
-        Enumeration propertyNames = ConfigurationManager.getProperties().propertyNames();
+        authorityControlled = new HashSet<>();
+        Enumeration propertyNames = configurationService.getProperties().propertyNames();
         while (propertyNames.hasMoreElements()) {
             String key = ((String) propertyNames.nextElement()).trim();
             if (key.startsWith(AC_PREFIX)
-                && ConfigurationManager.getBooleanProperty(key, false)) {
+                && configurationService.getBooleanProperty(key, false)) {
                 authorityControlled.add(key.substring(AC_PREFIX.length()));
             }
         }
@@ -1747,11 +1750,11 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
     }
 
     /**
-     * Generates a list of potenital Relationship Types given a typeName and attempts to match the given
+     * Generates a list of potential Relationship Types given a typeName and attempts to match the given
      * targetType and originType to a Relationship Type in the list.
      *
      * @param targetType entity type of target.
-     * @param originType entity type of origin referer.
+     * @param originType entity type of origin referrer.
      * @param typeName left or right typeName of the respective Relationship.
      * @return the UUID of the item.
      */
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
index fc441df26f..7d5e63c127 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
@@ -47,7 +47,6 @@ import org.dspace.content.MetadataValue;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
@@ -57,6 +56,7 @@ import org.dspace.core.Utils;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -93,12 +93,14 @@ public class ItemExportServiceImpl implements ItemExportService {
     protected ItemService itemService;
     @Autowired(required = true)
     protected HandleService handleService;
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
 
 
     /**
      * log4j logger
      */
-    private Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemExportServiceImpl.class);
+    private final Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemExportServiceImpl.class);
 
     protected ItemExportServiceImpl() {
 
@@ -605,7 +607,7 @@ public class ItemExportServiceImpl implements ItemExportService {
 
         // check the size of all the bitstreams against the configuration file
         // entry if it exists
-        String megaBytes = ConfigurationManager
+        String megaBytes = configurationService
             .getProperty("org.dspace.app.itemexport.max.size");
         if (megaBytes != null) {
             float maxSize = 0;
@@ -730,7 +732,7 @@ public class ItemExportServiceImpl implements ItemExportService {
     @Override
     public String getExportDownloadDirectory(EPerson ePerson)
         throws Exception {
-        String downloadDir = ConfigurationManager
+        String downloadDir = configurationService
             .getProperty("org.dspace.app.itemexport.download.dir");
         if (downloadDir == null) {
             throw new Exception(
@@ -747,7 +749,7 @@ public class ItemExportServiceImpl implements ItemExportService {
 
     @Override
     public String getExportWorkDirectory() throws Exception {
-        String exportDir = ConfigurationManager
+        String exportDir = configurationService
             .getProperty("org.dspace.app.itemexport.work.dir");
         if (exportDir == null) {
             throw new Exception(
@@ -853,7 +855,7 @@ public class ItemExportServiceImpl implements ItemExportService {
             return null;
         }
 
-        List<String> fileNames = new ArrayList<String>();
+        List<String> fileNames = new ArrayList<>();
 
         for (String fileName : downloadDir.list()) {
             if (fileName.contains("export") && fileName.endsWith(".zip")) {
@@ -870,7 +872,7 @@ public class ItemExportServiceImpl implements ItemExportService {
 
     @Override
     public void deleteOldExportArchives(EPerson eperson) throws Exception {
-        int hours = ConfigurationManager
+        int hours = configurationService
             .getIntProperty("org.dspace.app.itemexport.life.span.hours");
         Calendar now = Calendar.getInstance();
         now.setTime(new Date());
@@ -891,11 +893,11 @@ public class ItemExportServiceImpl implements ItemExportService {
 
     @Override
     public void deleteOldExportArchives() throws Exception {
-        int hours = ConfigurationManager.getIntProperty("org.dspace.app.itemexport.life.span.hours");
+        int hours = configurationService.getIntProperty("org.dspace.app.itemexport.life.span.hours");
         Calendar now = Calendar.getInstance();
         now.setTime(new Date());
         now.add(Calendar.HOUR, (-hours));
-        File downloadDir = new File(ConfigurationManager.getProperty("org.dspace.app.itemexport.download.dir"));
+        File downloadDir = new File(configurationService.getProperty("org.dspace.app.itemexport.download.dir"));
         if (downloadDir.exists()) {
             // Get a list of all the sub-directories, potentially one for each ePerson.
             File[] dirs = downloadDir.listFiles();
@@ -929,8 +931,8 @@ public class ItemExportServiceImpl implements ItemExportService {
             Locale supportedLocale = I18nUtil.getEPersonLocale(eperson);
             Email email = Email.getEmail(I18nUtil.getEmailFilename(supportedLocale, "export_success"));
             email.addRecipient(eperson.getEmail());
-            email.addArgument(ConfigurationManager.getProperty("dspace.ui.url") + "/exportdownload/" + fileName);
-            email.addArgument(ConfigurationManager.getProperty("org.dspace.app.itemexport.life.span.hours"));
+            email.addArgument(configurationService.getProperty("dspace.ui.url") + "/exportdownload/" + fileName);
+            email.addArgument(configurationService.getProperty("org.dspace.app.itemexport.life.span.hours"));
 
             email.send();
         } catch (Exception e) {
@@ -947,7 +949,7 @@ public class ItemExportServiceImpl implements ItemExportService {
             Email email = Email.getEmail(I18nUtil.getEmailFilename(supportedLocale, "export_error"));
             email.addRecipient(eperson.getEmail());
             email.addArgument(error);
-            email.addArgument(ConfigurationManager.getProperty("dspace.ui.url") + "/feedback");
+            email.addArgument(configurationService.getProperty("dspace.ui.url") + "/feedback");
 
             email.send();
         } catch (Exception e) {
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
index 02fe164af0..367a359bfc 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
@@ -85,7 +85,6 @@ import org.dspace.content.service.ItemService;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.MetadataSchemaService;
 import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
@@ -96,6 +95,7 @@ import org.dspace.eperson.Group;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.utils.DSpace;
 import org.dspace.workflow.WorkflowItem;
 import org.dspace.workflow.WorkflowService;
@@ -157,8 +157,11 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
     protected WorkspaceItemService workspaceItemService;
     @Autowired(required = true)
     protected WorkflowService workflowService;
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
 
-    protected final String tempWorkDir = ConfigurationManager.getProperty("org.dspace.app.batchitemimport.work.dir");
+    protected final String tempWorkDir
+            = configurationService.getProperty("org.dspace.app.batchitemimport.work.dir");
 
     protected boolean isTest = false;
     protected boolean isResume = false;
@@ -217,7 +220,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
         //Determine the folder where BTE will output the results
         String outputFolder = null;
         if (workingDir == null) { //This indicates a command line import, create a random path
-            File importDir = new File(ConfigurationManager.getProperty("org.dspace.app.batchitemimport.work.dir"));
+            File importDir = new File(configurationService.getProperty("org.dspace.app.batchitemimport.work.dir"));
             if (!importDir.exists()) {
                 boolean success = importDir.mkdir();
                 if (!success) {
@@ -1481,7 +1484,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
 
         File tempdir = new File(destinationDir);
         if (!tempdir.isDirectory()) {
-            log.error("'" + ConfigurationManager.getProperty("org.dspace.app.itemexport.work.dir") +
+            log.error("'" + configurationService.getProperty("org.dspace.app.itemexport.work.dir") +
                           "' as defined by the key 'org.dspace.app.itemexport.work.dir' in dspace.cfg " +
                           "is not a valid directory");
         }
@@ -1646,7 +1649,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                         }
                     }
 
-                    importDir = ConfigurationManager.getProperty(
+                    importDir = configurationService.getProperty(
                         "org.dspace.app.batchitemimport.work.dir") + File.separator + "batchuploads" + File.separator
                         + context
                         .getCurrentUser()
@@ -1804,7 +1807,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
             Email email = Email.getEmail(I18nUtil.getEmailFilename(supportedLocale, "bte_batch_import_error"));
             email.addRecipient(eperson.getEmail());
             email.addArgument(error);
-            email.addArgument(ConfigurationManager.getProperty("dspace.ui.url") + "/feedback");
+            email.addArgument(configurationService.getProperty("dspace.ui.url") + "/feedback");
 
             email.send();
         } catch (Exception e) {
@@ -1842,7 +1845,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
     @Override
     public String getImportUploadableDirectory(EPerson ePerson)
         throws Exception {
-        String uploadDir = ConfigurationManager.getProperty("org.dspace.app.batchitemimport.work.dir");
+        String uploadDir = configurationService.getProperty("org.dspace.app.batchitemimport.work.dir");
         if (uploadDir == null) {
             throw new Exception(
                 "A dspace.cfg entry for 'org.dspace.app.batchitemimport.work.dir' does not exist.");
diff --git a/dspace-api/src/main/java/org/dspace/app/itemupdate/MetadataUtilities.java b/dspace-api/src/main/java/org/dspace/app/itemupdate/MetadataUtilities.java
index b51212ea2f..5c2138a590 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemupdate/MetadataUtilities.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemupdate/MetadataUtilities.java
@@ -38,8 +38,8 @@ import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -226,7 +226,9 @@ public class MetadataUtilities {
             if (language == null) {
                 language = "en";
             } else if ("".equals(language)) {
-                language = ConfigurationManager.getProperty("default.language");
+                language = DSpaceServicesFactory.getInstance()
+                        .getConfigurationService()
+                        .getProperty("default.language");
             }
 
             DtoMetadata dtom = DtoMetadata.create(schema, element, qualifier, language, value);
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java
index dadd8f2a92..7b082c6c21 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java
@@ -12,7 +12,8 @@ import java.io.InputStream;
 import javax.imageio.ImageIO;
 
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Filter image bitstreams, scaling the image to be within the bounds of
@@ -66,17 +67,19 @@ public class BrandedPreviewJPEGFilter extends MediaFilter {
         BufferedImage buf = ImageIO.read(source);
 
         // get config params
-        float xmax = (float) ConfigurationManager
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        float xmax = (float) configurationService
             .getIntProperty("webui.preview.maxwidth");
-        float ymax = (float) ConfigurationManager
+        float ymax = (float) configurationService
             .getIntProperty("webui.preview.maxheight");
-        boolean blurring = (boolean) ConfigurationManager
+        boolean blurring = (boolean) configurationService
             .getBooleanProperty("webui.preview.blurring");
-        boolean hqscaling = (boolean) ConfigurationManager
+        boolean hqscaling = (boolean) configurationService
             .getBooleanProperty("webui.preview.hqscaling");
-        int brandHeight = ConfigurationManager.getIntProperty("webui.preview.brand.height");
-        String brandFont = ConfigurationManager.getProperty("webui.preview.brand.font");
-        int brandFontPoint = ConfigurationManager.getIntProperty("webui.preview.brand.fontpoint");
+        int brandHeight = configurationService.getIntProperty("webui.preview.brand.height");
+        String brandFont = configurationService.getProperty("webui.preview.brand.font");
+        int brandFontPoint = configurationService.getIntProperty("webui.preview.brand.fontpoint");
 
         JPEGFilter jpegFilter = new JPEGFilter();
         return jpegFilter
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
index 27413544b9..a79fd42d59 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
@@ -19,8 +19,9 @@ import org.dspace.content.Bundle;
 import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.im4java.core.ConvertCmd;
 import org.im4java.core.IM4JavaException;
 import org.im4java.core.IMOperation;
@@ -33,36 +34,18 @@ import org.im4java.process.ProcessStarter;
  * no bigger than. Creates only JPEGs.
  */
 public abstract class ImageMagickThumbnailFilter extends MediaFilter {
-    protected static int width = 180;
-    protected static int height = 120;
-    private static boolean flatten = true;
-    static String bitstreamDescription = "IM Thumbnail";
-    static final String defaultPattern = "Generated Thumbnail";
-    static Pattern replaceRegex = Pattern.compile(defaultPattern);
+    private static final int DEFAULT_WIDTH = 180;
+    private static final int DEFAULT_HEIGHT = 120;
+    static final String DEFAULT_PATTERN = "Generated Thumbnail";
     protected final ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+    protected static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
-    static String cmyk_profile;
-    static String srgb_profile;
+    protected static final String PRE = ImageMagickThumbnailFilter.class.getName();
 
     static {
-        String pre = ImageMagickThumbnailFilter.class.getName();
-        String s = ConfigurationManager.getProperty(pre + ".ProcessStarter");
+        String s = configurationService.getProperty(PRE + ".ProcessStarter");
         ProcessStarter.setGlobalSearchPath(s);
-        width = ConfigurationManager.getIntProperty("thumbnail.maxwidth", width);
-        height = ConfigurationManager.getIntProperty("thumbnail.maxheight", height);
-        flatten = ConfigurationManager.getBooleanProperty(pre + ".flatten", flatten);
-        String description = ConfigurationManager.getProperty(pre + ".bitstreamDescription");
-        cmyk_profile = ConfigurationManager.getProperty(pre + ".cmyk_profile");
-        srgb_profile = ConfigurationManager.getProperty(pre + ".srgb_profile");
-        if (description != null) {
-            bitstreamDescription = description;
-        }
-        try {
-            String patt = ConfigurationManager.getProperty(pre + ".replaceRegex");
-            replaceRegex = Pattern.compile(patt == null ? defaultPattern : patt);
-        } catch (PatternSyntaxException e) {
-            System.err.println("Invalid thumbnail replacement pattern: " + e.getMessage());
-        }
     }
 
     public ImageMagickThumbnailFilter() {
@@ -94,7 +77,7 @@ public abstract class ImageMagickThumbnailFilter extends MediaFilter {
      */
     @Override
     public String getDescription() {
-        return bitstreamDescription;
+        return configurationService.getProperty(PRE + ".bitstreamDescription", "IM Thumbnail");
     }
 
     public File inputStreamToTempFile(InputStream source, String prefix, String suffix) throws IOException {
@@ -120,7 +103,8 @@ public abstract class ImageMagickThumbnailFilter extends MediaFilter {
         IMOperation op = new IMOperation();
         op.autoOrient();
         op.addImage(f.getAbsolutePath());
-        op.thumbnail(width, height);
+        op.thumbnail(configurationService.getIntProperty("thumbnail.maxwidth", DEFAULT_WIDTH),
+                        configurationService.getIntProperty("thumbnail.maxheight", DEFAULT_HEIGHT));
         op.addImage(f2.getAbsolutePath());
         if (verbose) {
             System.out.println("IM Thumbnail Param: " + op);
@@ -137,11 +121,14 @@ public abstract class ImageMagickThumbnailFilter extends MediaFilter {
         IMOperation op = new IMOperation();
         String s = "[" + page + "]";
         op.addImage(f.getAbsolutePath() + s);
-        if (flatten) {
+        if (configurationService.getBooleanProperty(PRE + ".flatten", true)) {
             op.flatten();
         }
+
         // PDFs using the CMYK color system can be handled specially if
         // profiles are defined
+        String cmyk_profile = configurationService.getProperty(PRE + ".cmyk_profile");
+        String srgb_profile = configurationService.getProperty(PRE + ".srgb_profile");
         if (cmyk_profile != null && srgb_profile != null) {
             Info imageInfo = new Info(f.getAbsolutePath() + s, true);
             String imageClass = imageInfo.getImageClass();
@@ -174,24 +161,32 @@ public abstract class ImageMagickThumbnailFilter extends MediaFilter {
                 String description = bit.getDescription();
                 // If anything other than a generated thumbnail
                 // is found, halt processing
+                Pattern replaceRegex;
+                try {
+                    String patt = configurationService.getProperty(PRE + ".replaceRegex", DEFAULT_PATTERN);
+                    replaceRegex = Pattern.compile(patt == null ? DEFAULT_PATTERN : patt);
+                } catch (PatternSyntaxException e) {
+                    System.err.println("Invalid thumbnail replacement pattern: " + e.getMessage());
+                    throw e;
+                }
                 if (description != null) {
                     if (replaceRegex.matcher(description).matches()) {
                         if (verbose) {
-                            System.out.println(description + " " + nsrc
-                                                   + " matches pattern and is replacable.");
+                            System.out.format("%s %s matches pattern and is replacable.%n",
+                                    description, nsrc);
                         }
                         continue;
                     }
-                    if (description.equals(bitstreamDescription)) {
+                    if (description.equals(getDescription())) {
                         if (verbose) {
-                            System.out.println(bitstreamDescription + " " + nsrc
-                                                   + " is replacable.");
+                            System.out.format("%s %s is replaceable.%n",
+                                    getDescription(), nsrc);
                         }
                         continue;
                     }
                 }
-                System.out.println("Custom Thumbnail exists for " + nsrc + " for item "
-                                       + item.getHandle() + ".  Thumbnail will not be generated. ");
+                System.out.format("Custom Thumbnail exists for %s for item %s.  Thumbnail will not be generated.%n",
+                        nsrc, item.getHandle());
                 return false;
             }
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/JPEGFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/JPEGFilter.java
index 67a266ea26..502f71eb5c 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/JPEGFilter.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/JPEGFilter.java
@@ -22,7 +22,8 @@ import java.io.InputStream;
 import javax.imageio.ImageIO;
 
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Filter image bitstreams, scaling the image to be within the bounds of
@@ -80,13 +81,15 @@ public class JPEGFilter extends MediaFilter implements SelfRegisterInputFormats
     public InputStream getThumb(Item currentItem, BufferedImage buf, boolean verbose)
         throws Exception {
         // get config params
-        float xmax = (float) ConfigurationManager
+        final ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        float xmax = (float) configurationService
             .getIntProperty("thumbnail.maxwidth");
-        float ymax = (float) ConfigurationManager
+        float ymax = (float) configurationService
             .getIntProperty("thumbnail.maxheight");
-        boolean blurring = (boolean) ConfigurationManager
+        boolean blurring = (boolean) configurationService
             .getBooleanProperty("thumbnail.blurring");
-        boolean hqscaling = (boolean) ConfigurationManager
+        boolean hqscaling = (boolean) configurationService
             .getBooleanProperty("thumbnail.hqscaling");
 
         return getThumbDim(currentItem, buf, verbose, xmax, ymax, blurring, hqscaling, 0, 0, null);
@@ -169,9 +172,11 @@ public class JPEGFilter extends MediaFilter implements SelfRegisterInputFormats
         g2d.drawImage(buf, 0, 0, (int) xsize, (int) ysize, null);
 
         if (brandHeight != 0) {
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
             Brand brand = new Brand((int) xsize, brandHeight, new Font(brandFont, Font.PLAIN, brandFontPoint), 5);
-            BufferedImage brandImage = brand.create(ConfigurationManager.getProperty("webui.preview.brand"),
-                                                    ConfigurationManager.getProperty("webui.preview.brand.abbrev"),
+            BufferedImage brandImage = brand.create(configurationService.getProperty("webui.preview.brand"),
+                                                    configurationService.getProperty("webui.preview.brand.abbrev"),
                                                     currentItem == null ? "" : "hdl:" + currentItem.getHandle());
 
             g2d.drawImage(brandImage, (int) 0, (int) ysize, (int) xsize, (int) 20, null);
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/PDFFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/PDFFilter.java
index 21d120dd4c..c90d7c5a6e 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/PDFFilter.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/PDFFilter.java
@@ -21,7 +21,8 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /*
  *
@@ -72,8 +73,10 @@ public class PDFFilter extends MediaFilter {
     @Override
     public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
         throws Exception {
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
         try {
-            boolean useTemporaryFile = ConfigurationManager.getBooleanProperty("pdffilter.largepdfs", false);
+            boolean useTemporaryFile = configurationService.getBooleanProperty("pdffilter.largepdfs", false);
 
             // get input stream from bitstream
             // pass to filter, get string back
@@ -124,7 +127,7 @@ public class PDFFilter extends MediaFilter {
             }
         } catch (OutOfMemoryError oome) {
             log.error("Error parsing PDF document " + oome.getMessage(), oome);
-            if (!ConfigurationManager.getBooleanProperty("pdffilter.skiponmemoryexception", false)) {
+            if (!configurationService.getBooleanProperty("pdffilter.skiponmemoryexception", false)) {
                 throw oome;
             }
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategy.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategy.java
index 5d22efaa7a..7b63d3ea8d 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategy.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategy.java
@@ -10,13 +10,13 @@ package org.dspace.app.requestitem;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.I18nUtil;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -30,9 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author Peter Dietz
  */
 public class RequestItemHelpdeskStrategy extends RequestItemSubmitterStrategy {
-
-    private Logger log = org.apache.logging.log4j.LogManager.getLogger(RequestItemHelpdeskStrategy.class);
-
     @Autowired(required = true)
     protected EPersonService ePersonService;
 
@@ -41,9 +38,11 @@ public class RequestItemHelpdeskStrategy extends RequestItemSubmitterStrategy {
 
     @Override
     public RequestItemAuthor getRequestItemAuthor(Context context, Item item) throws SQLException {
-        boolean helpdeskOverridesSubmitter = ConfigurationManager
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        boolean helpdeskOverridesSubmitter = configurationService
             .getBooleanProperty("request.item.helpdesk.override", false);
-        String helpDeskEmail = ConfigurationManager.getProperty("mail.helpdesk");
+        String helpDeskEmail = configurationService.getProperty("mail.helpdesk");
 
         if (helpdeskOverridesSubmitter && StringUtils.isNotBlank(helpDeskEmail)) {
             return getHelpDeskPerson(context, helpDeskEmail);
@@ -64,10 +63,8 @@ public class RequestItemHelpdeskStrategy extends RequestItemSubmitterStrategy {
      * @throws SQLException if database error
      */
     public RequestItemAuthor getHelpDeskPerson(Context context, String helpDeskEmail) throws SQLException {
-        EPerson helpdeskEPerson = null;
-
         context.turnOffAuthorisationSystem();
-        helpdeskEPerson = ePersonService.findByEmail(context, helpDeskEmail);
+        EPerson helpdeskEPerson = ePersonService.findByEmail(context, helpDeskEmail);
         context.restoreAuthSystemState();
 
         if (helpdeskEPerson != null) {
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java b/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
index 36c0c70f6d..4cc2de7589 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
@@ -16,8 +16,10 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 public class SHERPAService {
     private CloseableHttpClient client = null;
@@ -29,7 +31,7 @@ public class SHERPAService {
     /**
      * log4j category
      */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SHERPAService.class);
+    private static final Logger log = LogManager.getLogger(SHERPAService.class);
 
     public SHERPAService() {
         HttpClientBuilder builder = HttpClientBuilder.create();
@@ -43,8 +45,10 @@ public class SHERPAService {
 
 
     public SHERPAResponse searchByJournalISSN(String query) {
-        String endpoint = ConfigurationManager.getProperty("sherpa.romeo.url");
-        String apiKey = ConfigurationManager.getProperty("sherpa.romeo.apikey");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String endpoint = configurationService.getProperty("sherpa.romeo.url");
+        String apiKey = configurationService.getProperty("sherpa.romeo.apikey");
 
         HttpGet method = null;
         SHERPAResponse sherpaResponse = null;
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/CreateStatReport.java b/dspace-api/src/main/java/org/dspace/app/statistics/CreateStatReport.java
index 29e9065a15..0ed78d6120 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/CreateStatReport.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/CreateStatReport.java
@@ -18,8 +18,9 @@ import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.PosixParser;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * This class allows the running of the DSpace statistic tools
@@ -56,7 +57,7 @@ public class CreateStatReport {
     /**
      * File suffix for log files
      */
-    private static String outputSuffix = ".dat";
+    private static final String outputSuffix = ".dat";
 
     /**
      * User context
@@ -66,9 +67,6 @@ public class CreateStatReport {
     /**
      * the config file from which to configure the analyser
      */
-    private static String configFile = ConfigurationManager.getProperty("dspace.dir") +
-        File.separator + "config" + File.separator +
-        "dstat.cfg";
 
     /**
      * Default constructor
@@ -81,8 +79,12 @@ public class CreateStatReport {
      * Usage: java CreateStatReport -r <statistic to run>
      */
     public static void main(String[] argv) throws Exception {
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
 
         // Open the statistics config file
+        final String configFile = configurationService.getProperty("dspace.dir")
+                + File.separator + "config" + File.separator + "dstat.cfg";
         FileInputStream fis = new java.io.FileInputStream(new File(configFile));
         Properties config = new Properties();
         config.load(fis);
@@ -108,8 +110,8 @@ public class CreateStatReport {
         context.turnOffAuthorisationSystem();
 
         //get paths to directories
-        outputLogDirectory = ConfigurationManager.getProperty("log.report.dir") + File.separator;
-        outputReportDirectory = ConfigurationManager.getProperty("report.dir") + File.separator;
+        outputLogDirectory = configurationService.getProperty("log.report.dir") + File.separator;
+        outputReportDirectory = configurationService.getProperty("report.dir") + File.separator;
 
         //read in command line variable to determine which statistic to run
         CommandLineParser parser = new PosixParser();
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java b/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java
index a555ae55e7..368f3dea5e 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java
@@ -20,7 +20,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * This class provides HTML reports for the ReportGenerator class
@@ -34,7 +35,7 @@ public class HTMLReport implements Report {
     /**
      * a list of the statistic blocks being managed by this class
      */
-    private List<Statistics> blocks = new ArrayList<Statistics>();
+    private final List<Statistics> blocks = new ArrayList<>();
 
     /**
      * the title for the page
@@ -59,7 +60,9 @@ public class HTMLReport implements Report {
     /**
      * the output file to which to write aggregation data
      */
-    private String output = ConfigurationManager.getProperty("dspace.dir") +
+    ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private String output = configurationService.getProperty("dspace.dir") +
         File.separator + "log" + File.separator + "report";
 
     /**
@@ -82,7 +85,7 @@ public class HTMLReport implements Report {
      */
     @Override
     public String render() {
-        StringBuffer frag = new StringBuffer();
+        StringBuilder frag = new StringBuilder();
 
         // get the page headings
         frag.append(header(pageTitle));
@@ -140,7 +143,7 @@ public class HTMLReport implements Report {
      * @return an HTML string providing internal page navigation
      */
     public String navigation() {
-        StringBuffer frag = new StringBuffer();
+        StringBuilder frag = new StringBuilder();
 
         frag.append("<div class=\"reportNavigation\">");
         frag.append("<a href=\"#general_overview\">General Overview</a>");
@@ -173,7 +176,6 @@ public class HTMLReport implements Report {
     @Override
     public void addBlock(Statistics stat) {
         blocks.add(stat);
-        return;
     }
 
 
@@ -207,7 +209,7 @@ public class HTMLReport implements Report {
      */
     @Override
     public String dateRange() {
-        StringBuffer frag = new StringBuffer();
+        StringBuilder frag = new StringBuilder();
         DateFormat df = DateFormat.getDateInstance();
 
         frag.append("<div class=\"reportDate\">");
@@ -255,7 +257,6 @@ public class HTMLReport implements Report {
         if (pageTitle == null) {
             pageTitle = mainTitle;
         }
-        return;
     }
 
 
@@ -280,7 +281,7 @@ public class HTMLReport implements Report {
         // FIXME: this need to be figured out to integrate nicely into the
         // whole JSTL thing, but for the moment it's just going to deliver
         // some styles
-        StringBuffer frag = new StringBuffer();
+        StringBuilder frag = new StringBuilder();
 
         frag.append("<style type=\"text/css\">\n");
         frag.append("body { font-family: Arial, Helvetica, sans-serif }");
@@ -334,7 +335,7 @@ public class HTMLReport implements Report {
      */
     @Override
     public String statBlock(Statistics content) {
-        StringBuffer frag = new StringBuffer();
+        StringBuilder frag = new StringBuilder();
         Stat[] stats = content.getStats();
 
         // start the table
@@ -405,7 +406,7 @@ public class HTMLReport implements Report {
     @Override
     public String floorInfo(int floor) {
         if (floor > 0) {
-            StringBuffer frag = new StringBuffer();
+            StringBuilder frag = new StringBuilder();
             frag.append("<div class=\"reportFloor\">");
             frag.append("(more than " + ReportTools.numberFormat(floor) + " times)");
             frag.append("</div>\n");
@@ -419,12 +420,12 @@ public class HTMLReport implements Report {
      * output the explanation of the report block in HTML format
      *
      * @param explanation some text explaining the coming report block
-     * @return a string containing an explanaton HTML formatted
+     * @return a string containing an explanation HTML formatted
      */
     @Override
     public String blockExplanation(String explanation) {
         if (explanation != null) {
-            StringBuffer frag = new StringBuffer();
+            StringBuilder frag = new StringBuilder();
             frag.append("<div class=\"reportExplanation\">");
             frag.append(explanation);
             frag.append("</div>\n\n");
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java b/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
index c378f15543..0ece47d32d 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
@@ -30,13 +30,14 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.core.Utils;
 import org.dspace.discovery.DiscoverQuery;
 import org.dspace.discovery.SearchServiceException;
 import org.dspace.discovery.SearchUtils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * This class performs all the actual analysis of a given set of DSpace log
@@ -268,7 +269,7 @@ public class LogAnalyser {
     /**
      * the log directory to be analysed
      */
-    private static String logDir = ConfigurationManager.getProperty("log.report.dir");
+    private static String logDir;
 
     /**
      * the regex to describe the file name format
@@ -276,16 +277,14 @@ public class LogAnalyser {
     private static String fileTemplate = "dspace\\.log.*";
 
     /**
-     * the config file from which to configure the analyser
+     * the configuration file from which to configure the analyser
      */
-    private static String configFile = ConfigurationManager.getProperty("dspace.dir") +
-        File.separator + "config" + File.separator +
-        "dstat.cfg";
+    private static String configFile;
 
     /**
      * the output file to which to write aggregation data
      */
-    private static String outFile = ConfigurationManager.getProperty("log.report.dir") + File.separator + "dstat.dat";
+    private static String outFile;
 
     /**
      * the starting date of the report
@@ -582,9 +581,11 @@ public class LogAnalyser {
         }
 
         // now do the host name and url lookup
-        hostName = Utils.getHostName(ConfigurationManager.getProperty("dspace.ui.url"));
-        name = ConfigurationManager.getProperty("dspace.name").trim();
-        url = ConfigurationManager.getProperty("dspace.ui.url").trim();
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        hostName = Utils.getHostName(configurationService.getProperty("dspace.ui.url"));
+        name = configurationService.getProperty("dspace.name").trim();
+        url = configurationService.getProperty("dspace.ui.url").trim();
         if ((url != null) && (!url.endsWith("/"))) {
             url = url + "/";
         }
@@ -622,8 +623,13 @@ public class LogAnalyser {
                                      String myConfigFile, String myOutFile,
                                      Date myStartDate, Date myEndDate,
                                      boolean myLookUp) {
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+
         if (myLogDir != null) {
             logDir = myLogDir;
+        } else {
+            logDir = configurationService.getProperty("log.report.dir");
         }
 
         if (myFileTemplate != null) {
@@ -632,6 +638,9 @@ public class LogAnalyser {
 
         if (myConfigFile != null) {
             configFile = myConfigFile;
+        } else {
+            configFile = configurationService.getProperty("dspace.dir")
+                    + File.separator + "config" + File.separator + "dstat.cfg";
         }
 
         if (myStartDate != null) {
@@ -644,9 +653,9 @@ public class LogAnalyser {
 
         if (myOutFile != null) {
             outFile = myOutFile;
+        } else {
+            outFile = configurationService.getProperty("log.report.dir") + File.separator + "dstat.dat";
         }
-
-        return;
     }
 
 
@@ -657,7 +666,7 @@ public class LogAnalyser {
      */
     public static String createOutput() {
         // start a string buffer to hold the final output
-        StringBuffer summary = new StringBuffer();
+        StringBuilder summary = new StringBuilder();
 
         // define an iterator that will be used to go over the hashmap keys
         Iterator<String> keys = null;
@@ -820,7 +829,7 @@ public class LogAnalyser {
      */
     public static void setRegex(String fileTemplate) {
         // build the exclude characters regular expression
-        StringBuffer charRegEx = new StringBuffer();
+        StringBuilder charRegEx = new StringBuilder();
         charRegEx.append("[");
         for (int i = 0; i < excludeChars.size(); i++) {
             charRegEx.append("\\").append(excludeChars.get(i));
@@ -864,7 +873,7 @@ public class LogAnalyser {
         logRegex = Pattern.compile(fileTemplate);
 
         // set up the pattern for matching any of the query types
-        StringBuffer typeRXString = new StringBuffer();
+        StringBuilder typeRXString = new StringBuilder();
         typeRXString.append("(");
         for (int i = 0; i < excludeTypes.size(); i++) {
             if (i > 0) {
@@ -876,7 +885,7 @@ public class LogAnalyser {
         typeRX = Pattern.compile(typeRXString.toString());
 
         // set up the pattern for matching any of the words to exclude
-        StringBuffer wordRXString = new StringBuffer();
+        StringBuilder wordRXString = new StringBuilder();
         wordRXString.append("(");
         for (int i = 0; i < excludeWords.size(); i++) {
             if (i > 0) {
@@ -890,8 +899,6 @@ public class LogAnalyser {
         }
         wordRXString.append(")");
         wordRX = Pattern.compile(wordRXString.toString());
-
-        return;
     }
 
     /**
@@ -920,18 +927,18 @@ public class LogAnalyser {
      */
     public static void readConfig(String configFile) throws IOException {
         //instantiate aggregators
-        actionAggregator = new HashMap<String, Integer>();
-        searchAggregator = new HashMap<String, Integer>();
-        userAggregator = new HashMap<String, Integer>();
-        itemAggregator = new HashMap<String, Integer>();
-        archiveStats = new HashMap<String, Integer>();
+        actionAggregator = new HashMap<>();
+        searchAggregator = new HashMap<>();
+        userAggregator = new HashMap<>();
+        itemAggregator = new HashMap<>();
+        archiveStats = new HashMap<>();
 
         //instantiate lists
-        generalSummary = new ArrayList<String>();
-        excludeWords = new ArrayList<String>();
-        excludeTypes = new ArrayList<String>();
-        excludeChars = new ArrayList<String>();
-        itemTypes = new ArrayList<String>();
+        generalSummary = new ArrayList<>();
+        excludeWords = new ArrayList<>();
+        excludeTypes = new ArrayList<>();
+        excludeChars = new ArrayList<>();
+        itemTypes = new ArrayList<>();
 
         // prepare our standard file readers and buffered readers
         FileReader fr = null;
@@ -1002,8 +1009,6 @@ public class LogAnalyser {
         // close the inputs
         br.close();
         fr.close();
-
-        return;
     }
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java b/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
index 7e9b438547..25c6d8cb9c 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
@@ -32,10 +32,11 @@ import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * This class performs the action of coordinating a usage report being
@@ -161,7 +162,7 @@ public class ReportGenerator {
     /**
      * pattern that matches an unqualified aggregator property
      */
-    private static Pattern real = Pattern.compile("^(.+)=(.+)");
+    private static final Pattern real = Pattern.compile("^(.+)=(.+)");
 
     //////////////////////////
     // Miscellaneous variables
@@ -189,11 +190,12 @@ public class ReportGenerator {
     /**
      * the log file action to human readable action map
      */
-    private static String map = ConfigurationManager.getProperty("dspace.dir") +
-        File.separator + "config" + File.separator + "dstat.map";
+    private static String map;
 
     private static final ItemService itemService = ContentServiceFactory.getInstance().getItemService();
     private static final HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Default constructor
@@ -268,6 +270,9 @@ public class ReportGenerator {
         throws Exception, SQLException {
         if (myMap != null) {
             map = myMap;
+        } else {
+            map = configurationService.getProperty("dspace.dir")
+                    + File.separator + "config" + File.separator + "dstat.map";
         }
 
         // create the relevant report type
@@ -302,15 +307,15 @@ public class ReportGenerator {
         startTime = new GregorianCalendar();
 
         /** instantiate aggregators */
-        actionAggregator = new HashMap<String, String>();
-        searchAggregator = new HashMap<String, String>();
-        userAggregator = new HashMap<String, String>();
-        itemAggregator = new HashMap<String, String>();
-        archiveStats = new HashMap<String, String>();
-        actionMap = new HashMap<String, String>();
+        actionAggregator = new HashMap<>();
+        searchAggregator = new HashMap<>();
+        userAggregator = new HashMap<>();
+        itemAggregator = new HashMap<>();
+        archiveStats = new HashMap<>();
+        actionMap = new HashMap<>();
 
-        /** instantite lists */
-        generalSummary = new ArrayList<String>();
+        /** instantiate lists */
+        generalSummary = new ArrayList<>();
 
         // set the parameters for this analysis
         setParameters(myInput);
@@ -486,8 +491,6 @@ public class ReportGenerator {
         report.addBlock(process);
 
         report.render();
-
-        return;
     }
 
 
@@ -612,8 +615,6 @@ public class ReportGenerator {
         if (myInput != null) {
             input = myInput;
         }
-
-        return;
     }
 
 
@@ -768,9 +769,9 @@ public class ReportGenerator {
         List<MetadataValue> author = itemService
             .getMetadata(item, MetadataSchemaEnum.DC.getName(), "contributor", "author", Item.ANY);
 
-        StringBuffer authors = new StringBuffer();
+        StringBuilder authors = new StringBuilder();
         if (author.size() > 0) {
-            authors.append("(" + author.get(0).getValue());
+            authors.append("(").append(author.get(0).getValue());
         }
         if (author.size() > 1) {
             authors.append(" et al");
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java b/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
index a151892db7..fd72b3b805 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
@@ -22,7 +22,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.time.DateUtils;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Helper class for loading the analysis / report files from the reports directory
@@ -219,8 +220,8 @@ public class StatisticsLoader {
         }
 
         // Create new maps for the monthly analysis / reports
-        Map<String, StatsFile> newMonthlyAnalysis = new HashMap<String, StatsFile>();
-        Map<String, StatsFile> newMonthlyReports = new HashMap<String, StatsFile>();
+        Map<String, StatsFile> newMonthlyAnalysis = new HashMap<>();
+        Map<String, StatsFile> newMonthlyReports = new HashMap<>();
 
         StatsFile newGeneralAnalysis = null;
         StatsFile newGeneralReport = null;
@@ -320,7 +321,9 @@ public class StatisticsLoader {
      * @return array of files
      */
     private static File[] getAnalysisAndReportFileList() {
-        File reportDir = new File(ConfigurationManager.getProperty("log.report.dir"));
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        File reportDir = new File(configurationService.getProperty("log.report.dir"));
         if (reportDir != null) {
             return reportDir.listFiles(new AnalysisAndReportFilter());
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/util/AbstractDSpaceWebapp.java b/dspace-api/src/main/java/org/dspace/app/util/AbstractDSpaceWebapp.java
index a27107a81a..c0cb5d226c 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/AbstractDSpaceWebapp.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/AbstractDSpaceWebapp.java
@@ -14,8 +14,9 @@ import java.util.Date;
 
 import org.dspace.app.util.factory.UtilServiceFactory;
 import org.dspace.app.util.service.WebAppService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,7 +58,9 @@ abstract public class AbstractDSpaceWebapp
 
         started = new Date();
 
-        url = ConfigurationManager.getProperty("dspace.ui.url");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        url = configurationService.getProperty("dspace.ui.url");
         if (null == url) {
             throw new IllegalStateException("dspace.ui.url is undefined");
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/util/CollectionDropDown.java b/dspace-api/src/main/java/org/dspace/app/util/CollectionDropDown.java
index 025e061b50..218d96bcce 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/CollectionDropDown.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/CollectionDropDown.java
@@ -16,8 +16,9 @@ import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CommunityService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Utility class for lists of collections.
@@ -55,8 +56,11 @@ public class CollectionDropDown {
      * @return Full path to the collection (truncated)
      * @throws SQLException if database error
      */
-    public static String collectionPath(Context context, Collection col, int maxchars) throws SQLException {
-        String separator = ConfigurationManager.getProperty("subcommunity.separator");
+    public static String collectionPath(Context context, Collection col, int maxchars)
+            throws SQLException {
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String separator = configurationService.getProperty("subcommunity.separator");
         if (separator == null) {
             separator = " > ";
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java b/dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java
index 4d7e078e1d..20262fefd7 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/GoogleMetadata.java
@@ -26,6 +26,7 @@ import java.util.Properties;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.content.Bitstream;
@@ -36,10 +37,11 @@ import org.dspace.content.MetadataSchema;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Element;
 
 /**
@@ -51,7 +53,7 @@ import org.jdom.Element;
 @SuppressWarnings("deprecation")
 public class GoogleMetadata {
 
-    private final static Logger log = org.apache.logging.log4j.LogManager.getLogger(GoogleMetadata.class);
+    private final static Logger log = LogManager.getLogger(GoogleMetadata.class);
 
     protected static final String GOOGLE_PREFIX = "google.";
 
@@ -62,7 +64,7 @@ public class GoogleMetadata {
     protected String itemURL;
 
     // Configuration keys and fields
-    protected static Map<String, String> googleScholarSettings = new HashMap<String, String>();
+    protected static Map<String, String> googleScholarSettings = new HashMap<>();
 
     // Google field names (e.g. citation_fieldname) and formatted metadata
     // values
@@ -132,35 +134,39 @@ public class GoogleMetadata {
 
     private static GoogleBitstreamComparator googleBitstreamComparator = null;
 
-    // Load configured fields from google-metadata.properties
-    static {
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
-        File loadedFile = null;
-        URL url = null;
-        InputStream is = null;
-
-        String googleConfigFile = ConfigurationManager
+    /**
+     * Load configured fields from google-metadata.properties.
+     */
+    private void loadGoogleScholarSettings()
+            throws MalformedURLException, IOException {
+        String googleConfigFile = configurationService
             .getProperty("google-metadata.config");
-        log.info("Using [" + googleConfigFile
-                     + "] for Google Metadata configuration");
+        log.info("Using [{}] for Google Metadata configuration", googleConfigFile);
 
-        loadedFile = new File(googleConfigFile);
+        File loadedFile = new File(googleConfigFile);
+        URL url;
         try {
-            url = loadedFile.toURL();
+            url = loadedFile.toURI().toURL();
 
         } catch (MalformedURLException mux) {
-            log.error("Can't find Google Metadata configuration file: "
-                          + googleConfigFile, mux);
+            log.error("Can't find Google Metadata configuration file: {}",
+                          googleConfigFile, mux);
+            throw mux;
         }
 
         Properties properties = new Properties();
+        InputStream is;
         try {
             is = url.openStream();
             properties.load(is);
 
         } catch (IOException iox) {
-            log.error("Could not read Google Metadata configuration file: "
-                          + googleConfigFile, iox);
+            log.error("Could not read Google Metadata configuration file: {}",
+                          googleConfigFile, iox);
+            throw iox;
         }
 
         Enumeration propertyNames = properties.propertyNames();
@@ -180,9 +186,7 @@ public class GoogleMetadata {
             }
         }
 
-        if (log.isDebugEnabled()) {
-            logConfiguration();
-        }
+        logConfiguration();
     }
 
     /**
@@ -192,7 +196,7 @@ public class GoogleMetadata {
         log.debug("Google Metadata Configuration Mapping:");
 
         for (String name : googleScholarSettings.keySet()) {
-            log.debug("  " + name + " => " + googleScholarSettings.get(name));
+            log.debug("  {} => {}", name, googleScholarSettings.get(name));
         }
     }
 
@@ -202,9 +206,14 @@ public class GoogleMetadata {
      *
      * @param context context
      * @param item    The item being viewed to extract metadata from
-     * @throws SQLException if database error
+     * @throws SQLException if database error.
+     * @throws java.io.IOException passed through.
      */
-    public GoogleMetadata(Context context, Item item) throws SQLException {
+    public GoogleMetadata(Context context, Item item)
+            throws SQLException, IOException {
+        if (googleScholarSettings.isEmpty()) {
+            loadGoogleScholarSettings();
+        }
 
         // Hold onto the item in case we need to refresh a stale parse
         this.item = item;
@@ -336,7 +345,7 @@ public class GoogleMetadata {
             int optionMatches = 0;
             String[] components;
             List<MetadataValue> values;
-            ArrayList<MetadataValue> resolvedFields = new ArrayList<MetadataValue>();
+            ArrayList<MetadataValue> resolvedFields = new ArrayList<>();
 
             for (String field : optionFields) {
 
@@ -399,8 +408,8 @@ public class GoogleMetadata {
      */
     protected ArrayList<ArrayList<String>> parseOptions(String configFilter) {
 
-        ArrayList<String> options = new ArrayList<String>();
-        ArrayList<ArrayList<String>> parsedOptions = new ArrayList<ArrayList<String>>();
+        ArrayList<String> options = new ArrayList<>();
+        ArrayList<ArrayList<String>> parsedOptions = new ArrayList<>();
 
         if (null == configFilter || configFilter.equals("")) {
             return null;
@@ -414,7 +423,7 @@ public class GoogleMetadata {
                 options.add(option.trim());
             }
         } else {
-            options = new ArrayList<String>();
+            options = new ArrayList<>();
             options.add(configFilter);
         }
 
@@ -426,12 +435,12 @@ public class GoogleMetadata {
         for (String option : options) {
 
             ArrayList<String> fields;
-            parsedFields = new ArrayList<String>();
+            parsedFields = new ArrayList<>();
 
             if (option.contains(",")) {
                 fields = parseFields(option);
             } else {
-                fields = new ArrayList<String>();
+                fields = new ArrayList<>();
                 fields.add(option);
             }
 
@@ -472,7 +481,7 @@ public class GoogleMetadata {
      */
     protected ArrayList<String> parseFields(String configString) {
 
-        ArrayList<String> fields = new ArrayList<String>();
+        ArrayList<String> fields = new ArrayList<>();
 
         for (String field : configString.split("\\,")) {
             fields.add(field.trim());
@@ -523,7 +532,7 @@ public class GoogleMetadata {
             List<MetadataValue> allMD = itemService.getMetadata(item, components[0], components[1],
                                                                 components[2], Item.ANY);
 
-            ArrayList<String> expandedDC = new ArrayList<String>();
+            ArrayList<String> expandedDC = new ArrayList<>();
             for (MetadataValue v : allMD) {
 
                 // De-dup multiple occurrences of field names in item
@@ -558,7 +567,7 @@ public class GoogleMetadata {
         MetadataSchema metadataSchema = v.getMetadataField().getMetadataSchema();
         name.append(metadataSchema.getName()).append(".").append(metadataField.getElement());
         if (null != metadataField.getQualifier()) {
-            name.append("." + metadataField.getQualifier());
+            name.append(".").append(metadataField.getQualifier());
         }
 
         return name.toString();
@@ -687,7 +696,7 @@ public class GoogleMetadata {
      * @return List of elements
      */
     public List<Element> disseminateList() {
-        List<Element> metas = new ArrayList<Element>();
+        List<Element> metas = new ArrayList<>();
 
         for (Entry<String, String> m : getMappings()) {
             Element e = new Element("meta");
@@ -889,7 +898,7 @@ public class GoogleMetadata {
             Bitstream bitstream = findLinkableFulltext(item);
             if (bitstream != null) {
                 StringBuilder path = new StringBuilder();
-                path.append(ConfigurationManager.getProperty("dspace.ui.url"));
+                path.append(configurationService.getProperty("dspace.ui.url"));
 
                 if (item.getHandle() != null) {
                     path.append("/bitstream/");
@@ -1075,7 +1084,7 @@ public class GoogleMetadata {
         // FIXME: Shouldn't have to parse identifiers for every identification.
 
         ArrayList<ArrayList<String>> options = parseOptions(dConfig);
-        HashMap<String, ArrayList<String>> mdPairs = new HashMap<String, ArrayList<String>>();
+        HashMap<String, ArrayList<String>> mdPairs = new HashMap<>();
 
         // Parse field/value pairs from field identifier string
         for (ArrayList<String> option : options) {
@@ -1092,7 +1101,7 @@ public class GoogleMetadata {
                     }
                 } else {
                     // Otherwise, add it as the first occurrence of this field
-                    ArrayList<String> newField = new ArrayList<String>();
+                    ArrayList<String> newField = new ArrayList<>();
                     newField.add(parsedPair[1].trim());
                     mdPairs.put(parsedPair[0].trim(), newField);
 
@@ -1113,7 +1122,7 @@ public class GoogleMetadata {
 
         // Check resolved/present metadata fields against configured values
         ArrayList<MetadataValue> presentMD = resolveMetadataFields(sb.toString());
-        if (null != presentMD && presentMD.size() != 0) {
+        if (null != presentMD && !presentMD.isEmpty()) {
             for (MetadataValue v : presentMD) {
                 String fieldName = buildFieldName(v);
                 if (mdPairs.containsKey(fieldName)) {
diff --git a/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java b/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
index 4bb798ad8d..8743e1a7d2 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
@@ -8,6 +8,7 @@
 package org.dspace.app.util;
 
 import java.io.IOException;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -49,7 +50,6 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.discovery.IndexableObject;
 import org.dspace.discovery.indexobject.IndexableCollection;
@@ -102,7 +102,7 @@ public class SyndicationFeed {
         };
     protected String defaultExternalMedia = "dc.source.uri";
 
-    private final ConfigurationService configurationService =
+    private static final ConfigurationService configurationService =
         DSpaceServicesFactory.getInstance().getConfigurationService();
 
     // metadata field for Item title in entry:
@@ -196,10 +196,10 @@ public class SyndicationFeed {
 
         // dso is null for the whole site, or a search without scope
         if (dso == null) {
-            defaultTitle = ConfigurationManager.getProperty("dspace.name");
+            defaultTitle = configurationService.getProperty("dspace.name");
             feed.setDescription(localize(labels, MSG_FEED_DESCRIPTION));
             objectURL = resolveURL(request, null);
-            logoURL = ConfigurationManager.getProperty("webui.feed.logo.url");
+            logoURL = configurationService.getProperty("webui.feed.logo.url");
         } else {
             Bitstream logo = null;
             if (dso instanceof IndexableCollection) {
@@ -207,7 +207,7 @@ public class SyndicationFeed {
                 defaultTitle = col.getName();
                 feed.setDescription(collectionService.getMetadata(col, "short_description"));
                 logo = col.getLogo();
-                String cols = ConfigurationManager.getProperty("webui.feed.podcast.collections");
+                String cols = configurationService.getProperty("webui.feed.podcast.collections");
                 if (cols != null && cols.length() > 1 && cols.contains(col.getHandle())) {
                     podcastFeed = true;
                 }
@@ -217,7 +217,7 @@ public class SyndicationFeed {
                 defaultTitle = comm.getName();
                 feed.setDescription(communityService.getMetadata(comm, "short_description"));
                 logo = comm.getLogo();
-                String comms = ConfigurationManager.getProperty("webui.feed.podcast.communities");
+                String comms = configurationService.getProperty("webui.feed.podcast.communities");
                 if (comms != null && comms.length() > 1 && comms.contains(comm.getHandle())) {
                     podcastFeed = true;
                 }
@@ -251,7 +251,7 @@ public class SyndicationFeed {
 
         // add entries for items
         if (items != null) {
-            List<SyndEntry> entries = new ArrayList<SyndEntry>();
+            List<SyndEntry> entries = new ArrayList<>();
             for (IndexableObject idxObj : items) {
                 if (!(idxObj instanceof IndexableItem)) {
                     continue;
@@ -277,7 +277,7 @@ public class SyndicationFeed {
                 // date of last change to Item
                 entry.setUpdatedDate(item.getLastModified());
 
-                StringBuffer db = new StringBuffer();
+                StringBuilder db = new StringBuilder();
                 for (String df : descriptionFields) {
                     // Special Case: "(date)" in field name means render as date
                     boolean isDate = df.indexOf("(date)") > 0;
@@ -313,7 +313,7 @@ public class SyndicationFeed {
                 // This gets the authors into an ATOM feed
                 List<MetadataValue> authors = itemService.getMetadataByMetadataString(item, authorField);
                 if (authors.size() > 0) {
-                    List<SyndPerson> creators = new ArrayList<SyndPerson>();
+                    List<SyndPerson> creators = new ArrayList<>();
                     for (MetadataValue author : authors) {
                         SyndPerson sp = new SyndPersonImpl();
                         sp.setName(author.getValue());
@@ -329,7 +329,7 @@ public class SyndicationFeed {
                     if (dcCreatorField != null) {
                         List<MetadataValue> dcAuthors = itemService.getMetadataByMetadataString(item, dcCreatorField);
                         if (dcAuthors.size() > 0) {
-                            List<String> creators = new ArrayList<String>();
+                            List<String> creators = new ArrayList<>();
                             for (MetadataValue author : dcAuthors) {
                                 creators.add(author.getValue());
                             }
@@ -345,7 +345,7 @@ public class SyndicationFeed {
                     if (dcDescriptionField != null) {
                         List<MetadataValue> v = itemService.getMetadataByMetadataString(item, dcDescriptionField);
                         if (v.size() > 0) {
-                            StringBuffer descs = new StringBuffer();
+                            StringBuilder descs = new StringBuilder();
                             for (MetadataValue d : v) {
                                 if (descs.length() > 0) {
                                     descs.append("\n\n");
@@ -374,8 +374,6 @@ public class SyndicationFeed {
                                     enc.setLength(bit.getSizeBytes());
                                     enc.setUrl(urlOfBitstream(request, bit));
                                     enclosures.add(enc);
-                                } else {
-                                    continue;
                                 }
                             }
                         }
@@ -395,7 +393,7 @@ public class SyndicationFeed {
                             }
                         }
 
-                    } catch (Exception e) {
+                    } catch (SQLException e) {
                         System.out.println(e.getMessage());
                     }
                     entry.setEnclosures(enclosures);
@@ -501,7 +499,7 @@ public class SyndicationFeed {
 
     // utility to get config property with default value when not set.
     protected static String getDefaultedConfiguration(String key, String dfl) {
-        String result = ConfigurationManager.getProperty(key);
+        String result = configurationService.getProperty(key);
         return (result == null) ? dfl : result;
     }
 
@@ -531,14 +529,14 @@ public class SyndicationFeed {
         if (dso == null) {
             if (baseURL == null) {
                 if (request == null) {
-                    baseURL = ConfigurationManager.getProperty("dspace.ui.url");
+                    baseURL = configurationService.getProperty("dspace.ui.url");
                 } else {
-                    baseURL = ConfigurationManager.getProperty("dspace.ui.url");
+                    baseURL = configurationService.getProperty("dspace.ui.url");
                     baseURL += request.getContextPath();
                 }
             }
             return baseURL;
-        } else if (ConfigurationManager.getBooleanProperty("webui.feed.localresolve")) {
+        } else if (configurationService.getBooleanProperty("webui.feed.localresolve")) {
             // return a link to handle in repository
             return resolveURL(request, null) + "/handle/" + dso.getHandle();
         } else {
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
index ae793ec433..8e9ccf5245 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
@@ -33,7 +33,6 @@ import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.factory.AuthenticateServiceFactory;
 import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.authorize.AuthorizeException;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.eperson.EPerson;
@@ -41,19 +40,28 @@ import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * This combined LDAP authentication method supersedes both the 'LDAPAuthentication'
  * and the 'LDAPHierarchicalAuthentication' methods. It's capable of both:
- * - authenticaton  against a flat LDAP tree where all users are in the same unit
- * (if search.user or search.password is not set)
- * - authentication against structured hierarchical LDAP trees of users.
+ * <ul>
+ *   <li>authentication against a flat LDAP tree where all users are in the same unit
+ *       (if {@code search.user} or {@code search.password} is not set)</li>
+ *   <li>authentication against structured hierarchical LDAP trees of users.</li>
+ * </ul>
  * An initial bind is required using a user name and password in order to
  * search the tree and find the DN of the user. A second bind is then required to
  * check the credentials of the user by binding directly to their DN.
  *
- * @author Stuart Lewis, Chris Yates, Alex Barbieri, Flavio Botelho, Reuben Pasquini, Samuel Ottenhoff, Ivan Masár
- * @version $Revision$
+ * @author Stuart Lewis
+ * @author Chris Yates
+ * @author Alex Barbieri
+ * @author Flavio Botelho
+ * @author Reuben Pasquini
+ * @author Samuel Ottenhoff
+ * @author Ivan Masár
  */
 public class LDAPAuthentication
     implements AuthenticationMethod {
@@ -61,13 +69,17 @@ public class LDAPAuthentication
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(LDAPAuthentication.class);
-
-    protected AuthenticationService authenticationService = AuthenticateServiceFactory.getInstance()
-                                                                                      .getAuthenticationService();
-    protected EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
-    protected GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+    private static final Logger log
+            = org.apache.logging.log4j.LogManager.getLogger(LDAPAuthentication.class);
 
+    protected AuthenticationService authenticationService
+            = AuthenticateServiceFactory.getInstance().getAuthenticationService();
+    protected EPersonService ePersonService
+            = EPersonServiceFactory.getInstance().getEPersonService();
+    protected GroupService groupService
+            = EPersonServiceFactory.getInstance().getGroupService();
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Let a real auth method return true if it wants.
@@ -80,7 +92,7 @@ public class LDAPAuthentication
                                    String username)
         throws SQLException {
         // Looks to see if autoregister is set or not
-        return ConfigurationManager.getBooleanProperty("authentication-ldap", "autoregister");
+        return configurationService.getBooleanProperty("authentication-ldap.autoregister");
     }
 
     /**
@@ -128,7 +140,7 @@ public class LDAPAuthentication
         // ensures they are LDAP users
         try {
             if (!context.getCurrentUser().getNetid().equals("")) {
-                String groupName = ConfigurationManager.getProperty("authentication-ldap", "login.specialgroup");
+                String groupName = configurationService.getProperty("authentication-ldap.login.specialgroup");
                 if ((groupName != null) && (!groupName.trim().equals(""))) {
                     Group ldapGroup = groupService.findByName(context, groupName);
                     if (ldapGroup == null) {
@@ -142,7 +154,7 @@ public class LDAPAuthentication
                     }
                 }
             }
-        } catch (Exception npe) {
+        } catch (SQLException ex) {
             // The user is not an LDAP user, so we don't need to worry about them
         }
         return Collections.EMPTY_LIST;
@@ -205,11 +217,11 @@ public class LDAPAuthentication
         SpeakerToLDAP ldap = new SpeakerToLDAP(log);
 
         // Get the DN of the user
-        boolean anonymousSearch = ConfigurationManager.getBooleanProperty("authentication-ldap", "search.anonymous");
-        String adminUser = ConfigurationManager.getProperty("authentication-ldap", "search.user");
-        String adminPassword = ConfigurationManager.getProperty("authentication-ldap", "search.password");
-        String objectContext = ConfigurationManager.getProperty("authentication-ldap", "object_context");
-        String idField = ConfigurationManager.getProperty("authentication-ldap", "id_field");
+        boolean anonymousSearch = configurationService.getBooleanProperty("authentication-ldap.search.anonymous");
+        String adminUser = configurationService.getProperty("authentication-ldap.search.user");
+        String adminPassword = configurationService.getProperty("authentication-ldap.search.password");
+        String objectContext = configurationService.getProperty("authentication-ldap.object_context");
+        String idField = configurationService.getProperty("authentication-ldap.id_field");
         String dn = "";
 
         // If adminUser is blank and anonymous search is not allowed, then we can't search so construct the DN
@@ -263,9 +275,8 @@ public class LDAPAuthentication
                 if (StringUtils.isEmpty(email)) {
                     // If no email, check if we have a "netid_email_domain". If so, append it to the netid to create
                     // email
-                    if (StringUtils
-                        .isNotEmpty(ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain"))) {
-                        email = netid + ConfigurationManager.getProperty("authentication-ldap", "netid_email_domain");
+                    if (configurationService.hasProperty("authentication-ldap.netid_email_domain")) {
+                        email = netid + configurationService.getProperty("authentication-ldap.netid_email_domain");
                     } else {
                         // We don't have a valid email address. We'll default it to 'netid' but log a warning
                         log.warn(LogManager.getHeader(context, "autoregister",
@@ -365,21 +376,34 @@ public class LDAPAuthentication
         /**
          * LDAP settings
          */
-        String ldap_provider_url = ConfigurationManager.getProperty("authentication-ldap", "provider_url");
-        String ldap_id_field = ConfigurationManager.getProperty("authentication-ldap", "id_field");
-        String ldap_search_context = ConfigurationManager.getProperty("authentication-ldap", "search_context");
-        String ldap_search_scope = ConfigurationManager.getProperty("authentication-ldap", "search_scope");
+        final String ldap_provider_url;
+        final String ldap_id_field;
+        final String ldap_search_context;
+        final String ldap_search_scope;
 
-        String ldap_email_field = ConfigurationManager.getProperty("authentication-ldap", "email_field");
-        String ldap_givenname_field = ConfigurationManager.getProperty("authentication-ldap", "givenname_field");
-        String ldap_surname_field = ConfigurationManager.getProperty("authentication-ldap", "surname_field");
-        String ldap_phone_field = ConfigurationManager.getProperty("authentication-ldap", "phone_field");
-        String ldap_group_field = ConfigurationManager.getProperty("authentication-ldap", "login.groupmap.attribute");
+        final String ldap_email_field;
+        final String ldap_givenname_field;
+        final String ldap_surname_field;
+        final String ldap_phone_field;
+        final String ldap_group_field;
 
-        boolean useTLS = ConfigurationManager.getBooleanProperty("authentication-ldap", "starttls", false);
+        final boolean useTLS;
 
         SpeakerToLDAP(Logger thelog) {
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
             log = thelog;
+
+            ldap_provider_url = configurationService.getProperty("authentication-ldap.provider_url");
+            ldap_id_field = configurationService.getProperty("authentication-ldap.id_field");
+            ldap_search_context = configurationService.getProperty("authentication-ldap.search_context");
+            ldap_search_scope = configurationService.getProperty("authentication-ldap.search_scope");
+            ldap_email_field = configurationService.getProperty("authentication-ldap.email_field");
+            ldap_givenname_field = configurationService.getProperty("authentication-ldap.givenname_field");
+            ldap_surname_field = configurationService.getProperty("authentication-ldap.surname_field");
+            ldap_phone_field = configurationService.getProperty("authentication-ldap.phone_field");
+            ldap_group_field = configurationService.getProperty("authentication-ldap.login.groupmap.attribute");
+            useTLS = configurationService.getBooleanProperty("authentication-ldap.starttls", false);
         }
 
         protected String getDNOfUser(String adminUser, String adminPassword, Context context, String netid) {
@@ -399,7 +423,8 @@ public class LDAPAuthentication
             }
 
             // Set up environment for creating initial context
-            Hashtable<String, String> env = new Hashtable<String, String>();
+            @SuppressWarnings("UseOfObsoleteCollectionType")
+            Hashtable<String, String> env = new Hashtable<>();
             env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
             env.put(javax.naming.Context.PROVIDER_URL, ldap_provider_url);
 
@@ -447,7 +472,7 @@ public class LDAPAuthentication
                     SearchControls ctrls = new SearchControls();
                     ctrls.setSearchScope(ldap_search_scope_value);
 
-                    String searchName = "";
+                    String searchName;
                     if (useTLS) {
                         searchName = ldap_search_context;
                     } else {
@@ -555,7 +580,8 @@ public class LDAPAuthentication
 
 
                 // Set up environment for creating initial context
-                Hashtable<String, String> env = new Hashtable<String, String>();
+                @SuppressWarnings("UseOfObsoleteCollectionType")
+                Hashtable<String, String> env = new Hashtable<>();
                 env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
                         "com.sun.jndi.ldap.LdapCtxFactory");
                 env.put(javax.naming.Context.PROVIDER_URL, ldap_provider_url);
@@ -652,7 +678,7 @@ public class LDAPAuthentication
         if (StringUtils.isNotBlank(dn)) {
             System.out.println("dn:" + dn);
             int i = 1;
-            String groupMap = ConfigurationManager.getProperty("authentication-ldap", "login.groupmap." + i);
+            String groupMap = configurationService.getProperty("authentication-ldap", "login.groupmap." + i);
 
             boolean cmp;
 
@@ -692,7 +718,7 @@ public class LDAPAuthentication
                     }
                 }
 
-                groupMap = ConfigurationManager.getProperty("authentication-ldap", "login.groupmap." + ++i);
+                groupMap = configurationService.getProperty("authentication-ldap", "login.groupmap." + ++i);
             }
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java b/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
index b214ead594..8d9ab0c5fc 100644
--- a/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
@@ -12,6 +12,7 @@ import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -21,7 +22,8 @@ import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrInputDocument;
 import org.dspace.authority.indexer.AuthorityIndexingService;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * @author Antoine Snyers (antoine at atmire.com)
@@ -31,7 +33,7 @@ import org.dspace.core.ConfigurationManager;
  */
 public class AuthoritySolrServiceImpl implements AuthorityIndexingService, AuthoritySearchService {
 
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(AuthoritySolrServiceImpl.class);
+    private static final Logger log = LogManager.getLogger(AuthoritySolrServiceImpl.class);
 
     protected AuthoritySolrServiceImpl() {
 
@@ -46,7 +48,9 @@ public class AuthoritySolrServiceImpl implements AuthorityIndexingService, Autho
             throws MalformedURLException, SolrServerException, IOException {
         if (solr == null) {
 
-            String solrService = ConfigurationManager.getProperty("solr.authority.server");
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String solrService = configurationService.getProperty("solr.authority.server");
 
             log.debug("Solr authority URL: " + solrService);
 
@@ -153,7 +157,7 @@ public class AuthoritySolrServiceImpl implements AuthorityIndexingService, Autho
 
         QueryResponse response = getSolr().query(solrQuery);
 
-        List<String> results = new ArrayList<String>();
+        List<String> results = new ArrayList<>();
         FacetField facetField = response.getFacetField("field");
         if (facetField != null) {
             List<FacetField.Count> values = facetField.getValues();
diff --git a/dspace-api/src/main/java/org/dspace/authority/UpdateAuthorities.java b/dspace-api/src/main/java/org/dspace/authority/UpdateAuthorities.java
index db008c9db6..a100fda764 100644
--- a/dspace-api/src/main/java/org/dspace/authority/UpdateAuthorities.java
+++ b/dspace-api/src/main/java/org/dspace/authority/UpdateAuthorities.java
@@ -8,6 +8,7 @@
 package org.dspace.authority;
 
 import java.io.PrintWriter;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -19,15 +20,18 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authority.factory.AuthorityServiceFactory;
 import org.dspace.authority.service.AuthorityValueService;
+import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * @author Antoine Snyers (antoine at atmire.com)
@@ -40,21 +44,23 @@ public class UpdateAuthorities {
     /**
      * log4j logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(UpdateAuthorities.class);
+    private static final Logger log = LogManager.getLogger(UpdateAuthorities.class);
 
     protected PrintWriter print = null;
 
-    private Context context;
+    private final Context context;
     private List<String> selectedIDs;
 
     protected final ItemService itemService;
     protected final AuthorityValueService authorityValueService;
+    protected final ConfigurationService configurationService;
 
     public UpdateAuthorities(Context context) {
         print = new PrintWriter(System.out);
         this.context = context;
         this.authorityValueService = AuthorityServiceFactory.getInstance().getAuthorityValueService();
         this.itemService = ContentServiceFactory.getInstance().getItemService();
+        this.configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
     }
 
     public static void main(String[] args) throws ParseException {
@@ -102,7 +108,7 @@ public class UpdateAuthorities {
     }
 
     private void setSelectedIDs(String b) {
-        this.selectedIDs = new ArrayList<String>();
+        this.selectedIDs = new ArrayList<>();
         String[] orcids = b.split(",");
         for (String orcid : orcids) {
             this.selectedIDs.add(orcid.trim());
@@ -125,7 +131,7 @@ public class UpdateAuthorities {
         List<AuthorityValue> authorities;
 
         if (selectedIDs != null && !selectedIDs.isEmpty()) {
-            authorities = new ArrayList<AuthorityValue>();
+            authorities = new ArrayList<>();
             for (String selectedID : selectedIDs) {
                 AuthorityValue byUID = authorityValueService.findByUID(context, selectedID);
                 authorities.add(byUID);
@@ -149,7 +155,7 @@ public class UpdateAuthorities {
     protected void followUp(AuthorityValue authority) {
         print.println("Updated: " + authority.getValue() + " - " + authority.getId());
 
-        boolean updateItems = ConfigurationManager.getBooleanProperty("solrauthority", "auto-update-items");
+        boolean updateItems = configurationService.getBooleanProperty("solrauthority.auto-update-items");
         if (updateItems) {
             updateItems(authority);
         }
@@ -169,7 +175,7 @@ public class UpdateAuthorities {
                     print.println("Updated item with handle " + next.getHandle());
                 }
             }
-        } catch (Exception e) {
+        } catch (SQLException | AuthorizeException e) {
             log.error("Error updating item", e);
             print.println("Error updating item. " + Arrays.toString(e.getStackTrace()));
         }
diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseDAOFactory.java b/dspace-api/src/main/java/org/dspace/browse/BrowseDAOFactory.java
index b8b3bbff94..94d547bdb2 100644
--- a/dspace-api/src/main/java/org/dspace/browse/BrowseDAOFactory.java
+++ b/dspace-api/src/main/java/org/dspace/browse/BrowseDAOFactory.java
@@ -7,8 +7,11 @@
  */
 package org.dspace.browse;
 
-import org.dspace.core.ConfigurationManager;
+import java.lang.reflect.InvocationTargetException;
+
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Factory class to generate DAOs based on the configuration
@@ -33,16 +36,21 @@ public class BrowseDAOFactory {
      */
     public static BrowseDAO getInstance(Context context)
         throws BrowseException {
-        String className = ConfigurationManager.getProperty("browseDAO.class");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String className = configurationService.getProperty("browseDAO.class");
         if (className == null) {
             // SOLR implementation is the default since DSpace 4.0
             return new SolrBrowseDAO(context);
         }
         try {
             return (BrowseDAO) Class
-                .forName(ConfigurationManager.getProperty("browseDAO.class"))
+                .forName(configurationService.getProperty("browseDAO.class"))
                 .getConstructor(Context.class).newInstance(context);
-        } catch (Exception e) {
+        } catch (ClassNotFoundException | IllegalAccessException
+                | IllegalArgumentException | InstantiationException
+                | NoSuchMethodException | SecurityException |
+                InvocationTargetException e) {
             throw new BrowseException("The configuration for browseDAO is invalid: " + className, e);
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java b/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
index 334e651e1c..859063272a 100644
--- a/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
+++ b/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
@@ -13,7 +13,8 @@ import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.sort.SortException;
 import org.dspace.sort.SortOption;
 
@@ -414,6 +415,7 @@ public final class BrowseIndex {
      * @return the name of the table
      * @deprecated 1.5
      */
+    @Deprecated
     public static String getTableName(int number, boolean isCommunity, boolean isCollection, boolean isDistinct,
                                       boolean isMap) {
         return BrowseIndex.getTableName(makeTableBaseName(number), isCommunity, isCollection, isDistinct, isMap);
@@ -462,6 +464,7 @@ public final class BrowseIndex {
      * @return the name of the table
      * @deprecated 1.5
      */
+    @Deprecated
     public String getTableName(boolean isCommunity, boolean isCollection, boolean isDistinct, boolean isMap) {
         if (isDistinct || isMap) {
             return BrowseIndex.getTableName(number, isCommunity, isCollection, isDistinct, isMap);
@@ -482,6 +485,7 @@ public final class BrowseIndex {
      * @return the name of the table
      * @deprecated 1.5
      */
+    @Deprecated
     public String getTableName(boolean isCommunity, boolean isCollection) {
         return getTableName(isCommunity, isCollection, false, false);
     }
@@ -514,6 +518,7 @@ public final class BrowseIndex {
      * @return table name
      * @deprecated 1.5
      */
+    @Deprecated
     public String getTableName(boolean isDistinct, boolean isCommunity, boolean isCollection) {
         return getTableName(isCommunity, isCollection, isDistinct, false);
     }
@@ -649,6 +654,7 @@ public final class BrowseIndex {
      * @throws BrowseException if browse error
      * @deprecated
      */
+    @Deprecated
     public static String[] tables()
         throws BrowseException {
         BrowseIndex[] bis = getBrowseIndices();
@@ -670,13 +676,14 @@ public final class BrowseIndex {
         throws BrowseException {
         int idx = 1;
         String definition;
-        ArrayList<BrowseIndex> browseIndices = new ArrayList<BrowseIndex>();
+        ArrayList<BrowseIndex> browseIndices = new ArrayList<>();
 
-        while (((definition = ConfigurationManager.getProperty("webui.browse.index." + idx))) != null) {
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        while (((definition = configurationService.getProperty("webui.browse.index." + idx))) != null) {
             BrowseIndex bi = new BrowseIndex(definition, idx);
-            bi.displayFrequencies = Boolean.valueOf(ConfigurationManager
-                                                        .getBooleanProperty("webui.browse.metadata.show-freq."
-                                                                                + idx, true));
+            bi.displayFrequencies = configurationService
+                    .getBooleanProperty("webui.browse.metadata.show-freq." + idx, true);
 
             browseIndices.add(bi);
             idx++;
@@ -804,8 +811,8 @@ public final class BrowseIndex {
      * @return true or false
      */
     public boolean isTagCloudEnabled() {
-
-        return ConfigurationManager.getBooleanProperty("webui.browse.index.tagcloud." + number);
-
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        return configurationService.getBooleanProperty("webui.browse.index.tagcloud." + number);
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/browse/CrossLinks.java b/dspace-api/src/main/java/org/dspace/browse/CrossLinks.java
index a2447b812b..aa30862e3c 100644
--- a/dspace-api/src/main/java/org/dspace/browse/CrossLinks.java
+++ b/dspace-api/src/main/java/org/dspace/browse/CrossLinks.java
@@ -10,7 +10,8 @@ package org.dspace.browse;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Class to represent the configuration of the cross-linking between browse
@@ -23,7 +24,7 @@ public class CrossLinks {
     /**
      * a map of the desired links
      */
-    private Map<String, String> links = new HashMap<String, String>();
+    private Map<String, String> links = new HashMap<>();
 
     /**
      * Construct a new object which will obtain the configuration for itself.
@@ -35,7 +36,9 @@ public class CrossLinks {
         int i = 1;
         while (true) {
             String field = "webui.browse.link." + i;
-            String config = ConfigurationManager.getProperty(field);
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String config = configurationService.getProperty(field);
             if (config == null) {
                 break;
             }
diff --git a/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOFactory.java b/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOFactory.java
index 697dc5bb22..7670ddfad9 100644
--- a/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOFactory.java
+++ b/dspace-api/src/main/java/org/dspace/browse/ItemCountDAOFactory.java
@@ -7,8 +7,9 @@
  */
 package org.dspace.browse;
 
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Factory class to allow us to load the correct DAO for registering
@@ -38,7 +39,9 @@ public class ItemCountDAOFactory {
         /** Log4j logger */
         ItemCountDAO dao = null;
 
-        String className = ConfigurationManager.getProperty("ItemCountDAO.class");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String className = configurationService.getProperty("ItemCountDAO.class");
 
         // SOLR implementation is the default since DSpace 4.0
         if (className == null) {
@@ -47,7 +50,8 @@ public class ItemCountDAOFactory {
             try {
                 dao = (ItemCountDAO) Class
                     .forName(className.trim()).newInstance();
-            } catch (Exception e) {
+            } catch (ClassNotFoundException | IllegalAccessException
+                    | InstantiationException e) {
                 throw new ItemCountException("The configuration for ItemCountDAO is invalid: " + className, e);
             }
         }
diff --git a/dspace-api/src/main/java/org/dspace/browse/LocaleOrderingFilter.java b/dspace-api/src/main/java/org/dspace/browse/LocaleOrderingFilter.java
index c2a2bd9804..23d5d7a3ff 100644
--- a/dspace-api/src/main/java/org/dspace/browse/LocaleOrderingFilter.java
+++ b/dspace-api/src/main/java/org/dspace/browse/LocaleOrderingFilter.java
@@ -12,8 +12,10 @@ import java.util.Locale;
 import com.ibm.icu.text.CollationElementIterator;
 import com.ibm.icu.text.Collator;
 import com.ibm.icu.text.RuleBasedCollator;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.text.filter.TextFilter;
 
 /**
@@ -32,7 +34,7 @@ import org.dspace.text.filter.TextFilter;
  * @author Graham Triggs
  */
 public class LocaleOrderingFilter implements TextFilter {
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(LocaleOrderingFilter.class);
+    private static final Logger log = LogManager.getLogger(LocaleOrderingFilter.class);
 
     /**
      * Uses a Locale dependent Collator to generate a sort string
@@ -47,7 +49,7 @@ public class LocaleOrderingFilter implements TextFilter {
         // Have we got a collator?
         if (collator != null) {
             int element;
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
 
             // Iterate through the elements of the collator
             CollationElementIterator iter = collator.getCollationElementIterator(str);
@@ -107,7 +109,9 @@ public class LocaleOrderingFilter implements TextFilter {
         Locale theLocale = null;
 
         // Get a Locale configuration from the dspace.cfg
-        String locale = ConfigurationManager.getProperty("webui.browse.sort.locale");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String locale = configurationService.getProperty("webui.browse.sort.locale");
 
         if (locale != null) {
             // Attempt to create Locale for the configured value
diff --git a/dspace-api/src/main/java/org/dspace/checker/DailyReportEmailer.java b/dspace-api/src/main/java/org/dspace/checker/DailyReportEmailer.java
index b4688c4807..5ac9b614f2 100644
--- a/dspace-api/src/main/java/org/dspace/checker/DailyReportEmailer.java
+++ b/dspace-api/src/main/java/org/dspace/checker/DailyReportEmailer.java
@@ -21,13 +21,15 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.checker.factory.CheckerServiceFactory;
 import org.dspace.checker.service.SimpleReporterService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
 import org.dspace.core.Utils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * <p>
@@ -44,7 +46,7 @@ public class DailyReportEmailer {
     /**
      * log4j logger.
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(DailyReportEmailer.class);
+    private static final Logger log = LogManager.getLogger(DailyReportEmailer.class);
 
     /**
      * Default constructor.
@@ -63,14 +65,16 @@ public class DailyReportEmailer {
     public void sendReport(File attachment, int numberOfBitstreams)
         throws IOException, javax.mail.MessagingException {
         if (numberOfBitstreams > 0) {
-            String hostname = Utils.getHostName(ConfigurationManager.getProperty("dspace.ui.url"));
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String hostname = Utils.getHostName(configurationService.getProperty("dspace.ui.url"));
             Email email = new Email();
-            email.setSubject(
-                "Checksum checker Report - " + numberOfBitstreams + " Bitstreams found with POSSIBLE issues on " +
-                    hostname);
+            email.setSubject(String.format(
+                "Checksum checker Report - %d Bitstreams found with POSSIBLE issues on %s",
+                    numberOfBitstreams, hostname));
             email.setContent("Checker Report", "report is attached ...");
             email.addAttachment(attachment, "checksum_checker_report.txt");
-            email.addRecipient(ConfigurationManager.getProperty("mail.admin"));
+            email.addRecipient(configurationService.getProperty("mail.admin"));
             email.send();
         }
     }
@@ -164,7 +168,9 @@ public class DailyReportEmailer {
             int numBitstreams = 0;
 
             // create a temporary file in the log directory
-            String dirLocation = ConfigurationManager.getProperty("log.report.dir");
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String dirLocation = configurationService.getProperty("log.report.dir");
             File directory = new File(dirLocation);
 
             if (directory.exists() && directory.isDirectory()) {
@@ -247,7 +253,7 @@ public class DailyReportEmailer {
             if (writer != null) {
                 try {
                     writer.close();
-                } catch (Exception e) {
+                } catch (IOException e) {
                     log.fatal("Could not close writer", e);
                 }
             }
diff --git a/dspace-api/src/main/java/org/dspace/checker/ResultsPruner.java b/dspace-api/src/main/java/org/dspace/checker/ResultsPruner.java
index d3c0b130da..03d3af1af6 100644
--- a/dspace-api/src/main/java/org/dspace/checker/ResultsPruner.java
+++ b/dspace-api/src/main/java/org/dspace/checker/ResultsPruner.java
@@ -19,12 +19,14 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.checker.factory.CheckerServiceFactory;
 import org.dspace.checker.service.ChecksumHistoryService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.Utils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Manages the deletion of results from the checksum history. It uses the
@@ -40,7 +42,7 @@ public final class ResultsPruner {
     /**
      * Default logger.
      */
-    private static final Logger LOG = org.apache.logging.log4j.LogManager.getLogger(ResultsPruner.class);
+    private static final Logger LOG = LogManager.getLogger(ResultsPruner.class);
 
     /**
      * Factory method for the default results pruner configuration using
@@ -51,12 +53,13 @@ public final class ResultsPruner {
      */
     public static ResultsPruner getDefaultPruner(Context context) {
         try {
-            return getPruner(context, ConfigurationManager.getProperties());
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            return getPruner(context, configurationService.getProperties());
         } catch (FileNotFoundException e) {
             throw new IllegalStateException(
                 "VeryExceptionalException - config file not there! ", e);
         }
-
     }
 
 
diff --git a/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
index 559b95edb8..b73fe88b5f 100644
--- a/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
@@ -36,7 +36,6 @@ import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.I18nUtil;
@@ -55,6 +54,7 @@ import org.dspace.eperson.service.SubscribeService;
 import org.dspace.event.Event;
 import org.dspace.harvest.HarvestedCollection;
 import org.dspace.harvest.service.HarvestedCollectionService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.workflow.factory.WorkflowServiceFactory;
 import org.dspace.xmlworkflow.WorkflowConfigurationException;
 import org.dspace.xmlworkflow.factory.XmlWorkflowFactory;
@@ -111,6 +111,9 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
     @Autowired(required = true)
     protected SearchService searchService;
 
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
+
     protected CollectionServiceImpl() {
         super();
     }
@@ -189,7 +192,7 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
 
     @Override
     public List<Collection> findAuthorizedOptimized(Context context, int actionID) throws SQLException {
-        if (!ConfigurationManager
+        if (!configurationService
             .getBooleanProperty("org.dspace.content.Collection.findAuthorizedPerformanceOptimize", false)) {
             // Fallback to legacy query if config says so. The rationale could be that a site found a bug.
             return findAuthorized(context, null, actionID);
@@ -922,7 +925,7 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
     public List<Collection> findCollectionsWithSubmit(String q, Context context, Community community,
         int offset, int limit) throws SQLException, SearchServiceException {
 
-        List<Collection> collections = new ArrayList<Collection>();
+        List<Collection> collections = new ArrayList<>();
         DiscoverQuery discoverQuery = new DiscoverQuery();
         discoverQuery.setDSpaceObjectFilter(IndexableCollection.TYPE);
         discoverQuery.setStart(offset);
diff --git a/dspace-api/src/main/java/org/dspace/content/Site.java b/dspace-api/src/main/java/org/dspace/content/Site.java
index 2704a3d518..0bdab6ffe5 100644
--- a/dspace-api/src/main/java/org/dspace/content/Site.java
+++ b/dspace-api/src/main/java/org/dspace/content/Site.java
@@ -14,9 +14,10 @@ import javax.persistence.Transient;
 
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.SiteService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 /**
@@ -56,7 +57,9 @@ public class Site extends DSpaceObject {
     }
 
     public String getURL() {
-        return ConfigurationManager.getProperty("dspace.ui.url");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        return configurationService.getProperty("dspace.ui.url");
     }
 
     private SiteService getSiteService() {
diff --git a/dspace-api/src/main/java/org/dspace/content/SiteServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/SiteServiceImpl.java
index 44077c491c..2f53ed0928 100644
--- a/dspace-api/src/main/java/org/dspace/content/SiteServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/SiteServiceImpl.java
@@ -15,7 +15,6 @@ import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.dao.SiteDAO;
 import org.dspace.content.service.SiteService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.event.Event;
@@ -94,7 +93,7 @@ public class SiteServiceImpl extends DSpaceObjectServiceImpl<Site> implements Si
 
     @Override
     public String getName(Site dso) {
-        return ConfigurationManager.getProperty("dspace.name");
+        return configurationService.getProperty("dspace.name");
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/MetadataAuthorityServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/authority/MetadataAuthorityServiceImpl.java
index c542c6a89e..c6a97e92fa 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/MetadataAuthorityServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/MetadataAuthorityServiceImpl.java
@@ -9,23 +9,23 @@ package org.dspace.content.authority;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.MetadataField;
 import org.dspace.content.authority.service.MetadataAuthorityService;
 import org.dspace.content.service.MetadataFieldService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Broker for metadata authority settings configured for each metadata field.
  *
- * Configuration keys, per metadata field (e.g. "dc.contributer.author")
+ * Configuration keys, per metadata field (e.g. "dc.contributor.author")
  *
  * {@code
  * # is field authority controlled (i.e. store authority, confidence values)?
@@ -52,13 +52,16 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @see Choices
  */
 public class MetadataAuthorityServiceImpl implements MetadataAuthorityService {
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(MetadataAuthorityServiceImpl.class);
+    private static final Logger log = LogManager.getLogger(MetadataAuthorityServiceImpl.class);
 
     @Autowired(required = true)
     protected MetadataFieldService metadataFieldService;
 
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
+
     // map of field key to authority plugin
-    protected Map<String, Boolean> controlled = new HashMap<String, Boolean>();
+    protected Map<String, Boolean> controlled = new HashMap<>();
 
     // map of field key to answer of whether field is required to be controlled
     protected Map<String, Boolean> isAuthorityRequired = null;
@@ -67,7 +70,7 @@ public class MetadataAuthorityServiceImpl implements MetadataAuthorityService {
      * map of field key to answer of which is the min acceptable confidence
      * value for a field with authority
      */
-    protected Map<String, Integer> minConfidence = new HashMap<String, Integer>();
+    protected Map<String, Integer> minConfidence = new HashMap<>();
 
     /**
      * fallback default value unless authority.minconfidence = X is configured.
@@ -81,13 +84,12 @@ public class MetadataAuthorityServiceImpl implements MetadataAuthorityService {
     public void init() {
 
         if (isAuthorityRequired == null) {
-            isAuthorityRequired = new HashMap<String, Boolean>();
-            Enumeration pn = ConfigurationManager.propertyNames();
+            isAuthorityRequired = new HashMap<>();
+            List<String> pn = configurationService.getPropertyKeys();
             final String authPrefix = "authority.controlled.";
             Context context = new Context();
             try {
-                while (pn.hasMoreElements()) {
-                    String key = (String) pn.nextElement();
+                for (String key : pn) {
                     if (key.startsWith(authPrefix)) {
                         // field is expected to be "schema.element.qualifier"
                         String field = key.substring(authPrefix.length());
@@ -115,8 +117,8 @@ public class MetadataAuthorityServiceImpl implements MetadataAuthorityService {
                                 "Error while configuring authority control, metadata field: " + field + " could not " +
                                     "be found");
                         }
-                        boolean ctl = ConfigurationManager.getBooleanProperty(key, true);
-                        boolean req = ConfigurationManager.getBooleanProperty("authority.required." + field, false);
+                        boolean ctl = configurationService.getBooleanProperty(key, true);
+                        boolean req = configurationService.getBooleanProperty("authority.required." + field, false);
                         controlled.put(metadataField.toString(), ctl);
                         isAuthorityRequired.put(metadataField.toString(), req);
 
@@ -143,7 +145,7 @@ public class MetadataAuthorityServiceImpl implements MetadataAuthorityService {
     }
 
     private int readConfidence(String key) {
-        String mc = ConfigurationManager.getProperty(key);
+        String mc = configurationService.getProperty(key);
         if (mc != null) {
             int mci = Choices.getConfidenceValue(mc.trim(), Choices.CF_UNSET - 1);
             if (mci == Choices.CF_UNSET - 1) {
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/SolrAuthority.java b/dspace-api/src/main/java/org/dspace/content/authority/SolrAuthority.java
index c93e6db786..41f06f41d5 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/SolrAuthority.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/SolrAuthority.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.content.authority;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -14,8 +15,10 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
@@ -25,7 +28,6 @@ import org.dspace.authority.AuthorityValue;
 import org.dspace.authority.SolrAuthorityInterface;
 import org.dspace.authority.factory.AuthorityServiceFactory;
 import org.dspace.authority.service.AuthorityValueService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.NameAwarePlugin;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
@@ -49,13 +51,16 @@ public class SolrAuthority implements ChoiceAuthority {
         DSpaceServicesFactory.getInstance().getServiceManager()
                              .getServiceByName("AuthoritySource", SolrAuthorityInterface.class);
 
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SolrAuthority.class);
+    private static final Logger log = LogManager.getLogger(SolrAuthority.class);
 
     protected boolean externalResults = false;
-    protected final AuthorityValueService authorityValueService = AuthorityServiceFactory.getInstance()
-                                                                                         .getAuthorityValueService();
-    protected final ConfigurationService configurationService = DSpaceServicesFactory.getInstance()
-            .getConfigurationService();
+
+    protected final AuthorityValueService authorityValueService
+            = AuthorityServiceFactory.getInstance().getAuthorityValueService();
+
+    protected final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     public Choices getMatches(String text, int start, int limit, String locale,
                               boolean bestMatch) {
         if (limit == 0) {
@@ -91,7 +96,7 @@ public class SolrAuthority implements ChoiceAuthority {
         //We add one to our facet limit so that we know if there are more matches
         int maxNumberOfSolrResults = limit + 1;
         if (externalResults) {
-            maxNumberOfSolrResults = ConfigurationManager.getIntProperty("xmlui.lookup.select.size", 12);
+            maxNumberOfSolrResults = configurationService.getIntProperty("xmlui.lookup.select.size", 12);
         }
         queryArgs.set(CommonParams.ROWS, maxNumberOfSolrResults);
 
@@ -144,7 +149,7 @@ public class SolrAuthority implements ChoiceAuthority {
 
 
             int confidence;
-            if (choices.size() == 0) {
+            if (choices.isEmpty()) {
                 confidence = Choices.CF_NOTFOUND;
             } else if (choices.size() == 1) {
                 confidence = Choices.CF_UNCERTAIN;
@@ -154,7 +159,7 @@ public class SolrAuthority implements ChoiceAuthority {
 
             result = new Choices(choices.toArray(new Choice[choices.size()]), start,
                                  hasMore ? max : choices.size() + start, confidence, hasMore);
-        } catch (Exception e) {
+        } catch (IOException | SolrServerException e) {
             log.error("Error while retrieving authority values {field: " + field + ", prefix:" + text + "}", e);
             result = new Choices(true);
         }
@@ -269,7 +274,7 @@ public class SolrAuthority implements ChoiceAuthority {
                     return label;
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException | SolrServerException e) {
             log.error("error occurred while trying to get label for key " + key, e);
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java
index 9cada27cb2..8ffddf715f 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/AIPTechMDCrosswalk.java
@@ -31,7 +31,6 @@ import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.SiteService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
@@ -39,6 +38,8 @@ import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Element;
 import org.jdom.Namespace;
 
@@ -51,29 +52,34 @@ import org.jdom.Namespace;
  * a complete and accurate image of all of the attributes an object
  * has in the RDBMS.
  *
+ * <p>
  * It encodes the following common properties of all archival objects:
+ * <dl>
+ *   <dt>identifier.uri</dt> <dd>persistent identifier of object in URI form (e.g. Handle URN)</dd>
+ *   <dt>relation.isPartOf</dt> <dd>persistent identifier of object's parent in URI form (e.g. Handle URN)</dd>
+ *   <dt>relation.isReferencedBy</dt> <dd>if relevant, persistent identifier of
+ *       other objects that map this one as a child.  May repeat.</dd>
+ * </dl>
  *
- * identifier.uri -- persistent identifier of object in URI form (e.g. Handle URN)
- * relation.isPartOf -- persistent identifier of object's parent in URI form (e.g. Handle URN)
- * relation.isReferencedBy -- if relevant, persistent identifier of other objects that map this one as a child.  May
- * repeat.
- *
+ * <p>
  * There may also be other fields, depending on the type of object,
  * which encode attributes that are not part of the descriptive metadata and
  * are not adequately covered by other technical MD formats (i.e. PREMIS).
  *
+ * <p>
  * Configuration entries:
- * aip.ingest.createEperson -- boolean, create EPerson for Submitter
- * automatically, on ingest, if it doesn't exist.
+ * <dl>
+ *   <dt>aip.ingest.createEperson</dt> <dd>boolean, create EPerson for Submitter
+ * automatically, on ingest, if it doesn't exist.</dd>
+ * </dl>
  *
  * @author Larry Stone
- * @version $Revision: 1.2 $
  */
 public class AIPTechMDCrosswalk implements IngestionCrosswalk, DisseminationCrosswalk {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(AIPTechMDCrosswalk.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(AIPTechMDCrosswalk.class);
     protected final BitstreamFormatService bitstreamFormatService = ContentServiceFactory.getInstance()
                                                                                          .getBitstreamFormatService();
     protected final SiteService siteService = ContentServiceFactory.getInstance().getSiteService();
@@ -81,6 +87,8 @@ public class AIPTechMDCrosswalk implements IngestionCrosswalk, DisseminationCros
     protected final EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
     protected final ItemService itemService = ContentServiceFactory.getInstance().getItemService();
     protected final HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
+    protected final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Get XML namespaces of the elements this crosswalk may return.
@@ -391,7 +399,7 @@ public class AIPTechMDCrosswalk implements IngestionCrosswalk, DisseminationCros
                                 String configName = new DSpaceAIPIngester().getConfigurationName();
 
                                 //Create the EPerson if specified and person doesn't already exit
-                                if (ConfigurationManager.getBooleanProperty(
+                                if (configurationService.getBooleanProperty(
                                     METSManifest.CONFIG_METS_PREFIX + configName + ".ingest.createSubmitter")) {
                                     sub = ePersonService.create(context);
                                     sub.setEmail(value);
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/CrosswalkMetadataValidator.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/CrosswalkMetadataValidator.java
index d68eff3df7..b1be458a25 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/CrosswalkMetadataValidator.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/CrosswalkMetadataValidator.java
@@ -21,8 +21,9 @@ import org.dspace.content.NonUniqueMetadataException;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.MetadataSchemaService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 public class CrosswalkMetadataValidator {
 
@@ -32,21 +33,23 @@ public class CrosswalkMetadataValidator {
     private String schemaChoice;
     private String fieldChoice;
 
-    private Map<Triple<String, String, String>, MetadataField> validatedMetadataFields;
+    private final Map<Triple<String, String, String>, MetadataField> validatedMetadataFields;
 
     public CrosswalkMetadataValidator() {
         metadataSchemaService = ContentServiceFactory.getInstance().getMetadataSchemaService();
         metadataFieldService = ContentServiceFactory.getInstance().getMetadataFieldService();
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
 
         validatedMetadataFields = new HashMap<>();
 
         // The two options, with three possibilities each: add, ignore, fail
-        schemaChoice = ConfigurationManager.getProperty("oai", "harvester.unknownSchema");
+        schemaChoice = configurationService.getProperty("oai.harvester.unknownSchema");
         if (schemaChoice == null) {
             schemaChoice = "fail";
         }
 
-        fieldChoice = ConfigurationManager.getProperty("oai", "harvester.unknownField");
+        fieldChoice = configurationService.getProperty("oai.harvester.unknownField");
         if (fieldChoice == null) {
             fieldChoice = "fail";
         }
@@ -123,6 +126,6 @@ public class CrosswalkMetadataValidator {
 
     private ImmutableTriple<String, String, String> createKey(final String schema, final String element,
                                                               final String qualifier) {
-        return new ImmutableTriple<String, String, String>(schema, element, qualifier);
+        return new ImmutableTriple<>(schema, element, qualifier);
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/METSDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/METSDisseminationCrosswalk.java
index c3b20bccb1..e44774a672 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/METSDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/METSDisseminationCrosswalk.java
@@ -19,10 +19,11 @@ import org.dspace.content.DSpaceObject;
 import org.dspace.content.packager.PackageDisseminator;
 import org.dspace.content.packager.PackageException;
 import org.dspace.content.packager.PackageParameters;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
@@ -85,7 +86,7 @@ public class METSDisseminationCrosswalk
     public List<Element> disseminateList(Context context, DSpaceObject dso)
         throws CrosswalkException,
         IOException, SQLException, AuthorizeException {
-        List<Element> result = new ArrayList<Element>(1);
+        List<Element> result = new ArrayList<>(1);
         result.add(disseminateElement(context, dso));
         return result;
     }
@@ -114,8 +115,11 @@ public class METSDisseminationCrosswalk
             pparams.put("manifestOnly", "true");
 
             // Create a temporary file to disseminate into
-            String tempDirectory = (ConfigurationManager.getProperty("upload.temp.dir") != null)
-                ? ConfigurationManager.getProperty("upload.temp.dir") : System.getProperty("java.io.tmpdir");
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String tempDirectory = (configurationService.hasProperty("upload.temp.dir"))
+                ? configurationService.getProperty("upload.temp.dir")
+                    : System.getProperty("java.io.tmpdir");
 
             File tempFile = File.createTempFile("METSDissemination" + dso.hashCode(), null, new File(tempDirectory));
             tempFile.deleteOnExit();
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
index e1505a79d2..abef24c247 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
@@ -34,12 +35,13 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.SelfNamedPlugin;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Attribute;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -84,14 +86,13 @@ import org.jdom.xpath.XPath;
  *
  * @author Larry Stone
  * @author Scott Phillips
- * @version $Revision$
  */
 public class MODSDisseminationCrosswalk extends SelfNamedPlugin
     implements DisseminationCrosswalk {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(MODSDisseminationCrosswalk.class);
+    private static final Logger log = LogManager.getLogger(MODSDisseminationCrosswalk.class);
 
     private static final String CONFIG_PREFIX = "crosswalk.mods.properties.";
 
@@ -99,6 +100,8 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
     protected final CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
     protected final ItemService itemService = ContentServiceFactory.getInstance().getItemService();
     protected final HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
+    protected static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Fill in the plugin alias table from DSpace configuration entries
@@ -107,10 +110,9 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
     private static String aliases[] = null;
 
     static {
-        List<String> aliasList = new ArrayList<String>();
-        Enumeration<String> pe = (Enumeration<String>) ConfigurationManager.propertyNames();
-        while (pe.hasMoreElements()) {
-            String key = pe.nextElement();
+        List<String> aliasList = new ArrayList<>();
+        List<String> pe = configurationService.getPropertyKeys();
+        for (String key : pe) {
             if (key.startsWith(CONFIG_PREFIX)) {
                 aliasList.add(key.substring(CONFIG_PREFIX.length()));
             }
@@ -142,8 +144,8 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
     private static final String schemaLocation =
         MODS_NS.getURI() + " " + MODS_XSD;
 
-    private static XMLOutputter outputUgly = new XMLOutputter();
-    private static SAXBuilder builder = new SAXBuilder();
+    private static final XMLOutputter outputUgly = new XMLOutputter();
+    private static final SAXBuilder builder = new SAXBuilder();
 
     private Map<String, modsTriple> modsMap = null;
 
@@ -176,11 +178,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
                 result.xpath.addNamespace(XLINK_NS);
                 Document d = builder.build(new StringReader(prolog + xml + postlog));
                 result.xml = (Element) d.getRootElement().getContent(0);
-            } catch (JDOMException je) {
-                log.error("Error initializing modsTriple(\"" + qdc + "\",\"" + xml + "\",\"" + xpath + "\"): got " + je
-                    .toString());
-                return null;
-            } catch (IOException je) {
+            } catch (JDOMException | IOException je) {
                 log.error("Error initializing modsTriple(\"" + qdc + "\",\"" + xml + "\",\"" + xpath + "\"): got " + je
                     .toString());
                 return null;
@@ -226,14 +224,14 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
             return;
         }
         String cmPropName = CONFIG_PREFIX + myAlias;
-        String propsFilename = ConfigurationManager.getProperty(cmPropName);
+        String propsFilename = configurationService.getProperty(cmPropName);
         if (propsFilename == null) {
             String msg = "MODS crosswalk missing " +
                 "configuration file for crosswalk named \"" + myAlias + "\"";
             log.error(msg);
             throw new CrosswalkInternalException(msg);
         } else {
-            String parent = ConfigurationManager.getProperty("dspace.dir") +
+            String parent = configurationService.getProperty("dspace.dir") +
                 File.separator + "config" + File.separator;
             File propsFile = new File(parent, propsFilename);
             Properties modsConfig = new Properties();
@@ -256,7 +254,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
                 }
             }
 
-            modsMap = new HashMap<String, modsTriple>();
+            modsMap = new HashMap<>();
             Enumeration<String> pe = (Enumeration<String>) modsConfig.propertyNames();
             while (pe.hasMoreElements()) {
                 String qdc = pe.nextElement();
@@ -343,7 +341,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
         }
         initMap();
 
-        List<Element> result = new ArrayList<Element>(dcvs.size());
+        List<Element> result = new ArrayList<>(dcvs.size());
 
         for (MetadataValueDTO dcv : dcvs) {
             String qdc = dcv.getSchema() + "." + dcv.getElement();
@@ -579,7 +577,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
             if (log.isDebugEnabled()) {
                 log.debug("Filtering out non-XML characters in string, reason=" + reason);
             }
-            StringBuffer result = new StringBuffer(value.length());
+            StringBuilder result = new StringBuilder(value.length());
             for (int i = 0; i < value.length(); ++i) {
                 char c = value.charAt(i);
                 if (Verifier.isXMLCharacter((int) c)) {
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java
index 7bb7b38b43..e4e387a3ec 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/PREMISCrosswalk.java
@@ -15,6 +15,7 @@ import java.util.List;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
@@ -25,9 +26,10 @@ import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Element;
 import org.jdom.Namespace;
 
@@ -41,27 +43,29 @@ import org.jdom.Namespace;
  * specification for both ingest and dissemination.
  *
  * @author Larry Stone
- * @version $Revision$
  */
 public class PREMISCrosswalk
     implements IngestionCrosswalk, DisseminationCrosswalk {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(PREMISCrosswalk.class);
+    private static final Logger log = LogManager.getLogger(PREMISCrosswalk.class);
 
     private static final Namespace PREMIS_NS =
         Namespace.getNamespace("premis", "http://www.loc.gov/standards/premis");
 
     // XML schemaLocation fragment for this crosswalk, from config.
-    private String schemaLocation =
+    private final String schemaLocation =
         PREMIS_NS.getURI() + " http://www.loc.gov/standards/premis/PREMIS-v1-0.xsd";
 
     private static final Namespace namespaces[] = {PREMIS_NS};
 
-    protected BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
-    protected BitstreamFormatService bitstreamFormatService = ContentServiceFactory.getInstance()
-                                                                                   .getBitstreamFormatService();
+    protected BitstreamService bitstreamService
+            = ContentServiceFactory.getInstance().getBitstreamService();
+    protected BitstreamFormatService bitstreamFormatService
+            = ContentServiceFactory.getInstance().getBitstreamFormatService();
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /*----------- Submission functions -------------------*/
 
@@ -219,7 +223,7 @@ public class PREMISCrosswalk
         //  b. name of bitstream, if any
         //  c. made-up name based on sequence ID and extension.
         String sid = String.valueOf(bitstream.getSequenceID());
-        String baseUrl = ConfigurationManager.getProperty("dspace.ui.url");
+        String baseUrl = configurationService.getProperty("dspace.ui.url");
         String handle = null;
         // get handle of parent Item of this bitstream, if there is one:
         List<Bundle> bn = bitstream.getBundles();
@@ -308,7 +312,7 @@ public class PREMISCrosswalk
     public List<Element> disseminateList(Context context, DSpaceObject dso)
         throws CrosswalkException,
         IOException, SQLException, AuthorizeException {
-        List<Element> result = new ArrayList<Element>(1);
+        List<Element> result = new ArrayList<>(1);
         result.add(disseminateElement(context, dso));
         return result;
     }
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
index edb3c27bef..22ef80e3b2 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
@@ -20,6 +20,7 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
@@ -30,10 +31,11 @@ import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.SelfNamedPlugin;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
@@ -91,20 +93,19 @@ import org.jdom.input.SAXBuilder;
  *  http://dublincore.org/schemas/xmls/qdc/2003/04/02/qualifieddc.xsd</pre>
  *
  * @author Larry Stone
- * @version $Revision$
  */
 public class QDCCrosswalk extends SelfNamedPlugin
     implements DisseminationCrosswalk, IngestionCrosswalk {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(QDCCrosswalk.class);
+    private static final Logger log = LogManager.getLogger(QDCCrosswalk.class);
 
     // map of qdc to JDOM Element
-    private Map<String, Element> qdc2element = new HashMap<String, Element>();
+    private final Map<String, Element> qdc2element = new HashMap<>();
 
     // map of JDOM Element to qdc Metadatum
-    private Map<String, String> element2qdc = new HashMap<String, String>();
+    private final Map<String, String> element2qdc = new HashMap<>();
 
     // the XML namespaces from config file for this name.
     private Namespace namespaces[] = null;
@@ -124,11 +125,14 @@ public class QDCCrosswalk extends SelfNamedPlugin
     // XML schemaLocation fragment for this crosswalk, from config.
     private String schemaLocation = null;
 
-    private static SAXBuilder builder = new SAXBuilder();
+    private static final SAXBuilder builder = new SAXBuilder();
 
     protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
 
-    private CrosswalkMetadataValidator metadataValidator = new CrosswalkMetadataValidator();
+    protected static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    private final CrosswalkMetadataValidator metadataValidator = new CrosswalkMetadataValidator();
 
     /**
      * Fill in the plugin-name table from DSpace configuration entries
@@ -137,11 +141,10 @@ public class QDCCrosswalk extends SelfNamedPlugin
     private static String aliases[] = null;
 
     static {
-        List<String> aliasList = new ArrayList<String>();
-        Enumeration<String> pe = (Enumeration<String>) ConfigurationManager.propertyNames();
+        List<String> aliasList = new ArrayList<>();
+        List<String> configKeys = configurationService.getPropertyKeys();
         String propname = CONFIG_PREFIX + ".properties.";
-        while (pe.hasMoreElements()) {
-            String key = pe.nextElement();
+        for (String key : configKeys) {
             if (key.startsWith(propname)) {
                 aliasList.add(key.substring(propname.length()));
             }
@@ -218,32 +221,31 @@ public class QDCCrosswalk extends SelfNamedPlugin
         }
 
         // grovel DSpace configuration for namespaces
-        List<Namespace> nsList = new ArrayList<Namespace>();
-        Enumeration<String> pe = (Enumeration<String>) ConfigurationManager.propertyNames();
+        List<Namespace> nsList = new ArrayList<>();
+        List<String> configKeys = configurationService.getPropertyKeys();
         String propname = CONFIG_PREFIX + ".namespace." + myName + ".";
-        while (pe.hasMoreElements()) {
-            String key = pe.nextElement();
+        for (String key : configKeys) {
             if (key.startsWith(propname)) {
                 nsList.add(Namespace.getNamespace(key.substring(propname.length()),
-                                                  ConfigurationManager.getProperty(key)));
+                                                  configurationService.getProperty(key)));
             }
         }
         nsList.add(Namespace.XML_NAMESPACE);
         namespaces = (Namespace[]) nsList.toArray(new Namespace[nsList.size()]);
 
         // get XML schemaLocation fragment from config
-        schemaLocation = ConfigurationManager.getProperty(CONFIG_PREFIX + ".schemaLocation." + myName);
+        schemaLocation = configurationService.getProperty(CONFIG_PREFIX + ".schemaLocation." + myName);
 
         // read properties
         String cmPropName = CONFIG_PREFIX + ".properties." + myName;
-        String propsFilename = ConfigurationManager.getProperty(cmPropName);
+        String propsFilename = configurationService.getProperty(cmPropName);
         if (propsFilename == null) {
             throw new CrosswalkInternalException("Configuration error: " +
                                                      "No properties file configured for QDC crosswalk named \"" +
                                                      myName + "\"");
         }
 
-        String parent = ConfigurationManager.getProperty("dspace.dir") +
+        String parent = configurationService.getProperty("dspace.dir") +
             File.separator + "config" + File.separator;
         File propsFile = new File(parent, propsFilename);
         Properties qdcProps = new Properties();
@@ -264,7 +266,7 @@ public class QDCCrosswalk extends SelfNamedPlugin
         // grovel properties to initialize qdc->element and element->qdc maps.
         // evaluate the XML fragment with a wrapper including namespaces.
         String postlog = "</wrapper>";
-        StringBuffer prologb = new StringBuffer("<wrapper");
+        StringBuilder prologb = new StringBuilder("<wrapper");
         for (int i = 0; i < namespaces.length; ++i) {
             prologb.append(" xmlns:");
             prologb.append(namespaces[i].getPrefix());
@@ -274,9 +276,9 @@ public class QDCCrosswalk extends SelfNamedPlugin
         }
         prologb.append(">");
         String prolog = prologb.toString();
-        pe = (Enumeration<String>) qdcProps.propertyNames();
-        while (pe.hasMoreElements()) {
-            String qdc = pe.nextElement();
+        Enumeration<String> qdcKeys = (Enumeration<String>) qdcProps.propertyNames();
+        while (qdcKeys.hasMoreElements()) {
+            String qdc = qdcKeys.nextElement();
             String val = qdcProps.getProperty(qdc);
             try {
                 Document d = builder.build(new StringReader(prolog + val + postlog));
@@ -296,7 +298,7 @@ public class QDCCrosswalk extends SelfNamedPlugin
     public Namespace[] getNamespaces() {
         try {
             init();
-        } catch (Exception e) {
+        } catch (IOException | CrosswalkException e) {
             // ignore
         }
         return (Namespace[]) ArrayUtils.clone(namespaces);
@@ -306,7 +308,7 @@ public class QDCCrosswalk extends SelfNamedPlugin
     public String getSchemaLocation() {
         try {
             init();
-        } catch (Exception e) {
+        } catch (IOException | CrosswalkException e) {
             // ignore
         }
         return schemaLocation;
@@ -338,7 +340,7 @@ public class QDCCrosswalk extends SelfNamedPlugin
         init();
 
         List<MetadataValue> dc = itemService.getMetadata(item, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
-        List<Element> result = new ArrayList<Element>(dc.size());
+        List<Element> result = new ArrayList<>(dc.size());
         for (int i = 0; i < dc.size(); i++) {
             MetadataValue metadataValue = dc.get(i);
             MetadataField metadataField = metadataValue.getMetadataField();
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/RoleCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/RoleCrosswalk.java
index 072939060a..d36ff3edf5 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/RoleCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/RoleCrosswalk.java
@@ -20,10 +20,11 @@ import org.dspace.content.packager.PackageException;
 import org.dspace.content.packager.PackageIngester;
 import org.dspace.content.packager.PackageParameters;
 import org.dspace.content.packager.RoleDisseminator;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.workflow.WorkflowException;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -179,8 +180,11 @@ public class RoleCrosswalk
             }
 
             // Create a temporary file to disseminate into
-            String tempDirectory = (ConfigurationManager.getProperty("upload.temp.dir") != null)
-                ? ConfigurationManager.getProperty("upload.temp.dir") : System.getProperty("java.io.tmpdir");
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String tempDirectory = (configurationService.hasProperty("upload.temp.dir"))
+                    ? configurationService.getProperty("upload.temp.dir")
+                    : System.getProperty("java.io.tmpdir");
             File tempFile = File
                 .createTempFile("RoleCrosswalkDisseminate" + dso.hashCode(), null, new File(tempDirectory));
             tempFile.deleteOnExit();
@@ -292,8 +296,11 @@ public class RoleCrosswalk
         }
 
         // Create a temporary file to ingest from
-        String tempDirectory = (ConfigurationManager.getProperty("upload.temp.dir") != null)
-            ? ConfigurationManager.getProperty("upload.temp.dir") : System.getProperty("java.io.tmpdir");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String tempDirectory = (configurationService.hasProperty("upload.temp.dir"))
+                ? configurationService.getProperty("upload.temp.dir")
+                : System.getProperty("java.io.tmpdir");
         File tempFile = File.createTempFile("RoleCrosswalkIngest" + dso.hashCode(), null, new File(tempDirectory));
         tempFile.deleteOnExit();
         FileOutputStream fileOutStream = null;
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
index bc153e9426..d03d2dd887 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
@@ -29,10 +29,11 @@ import org.dspace.content.MetadataSchema;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.SelfNamedPlugin;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Element;
 import org.jdom.Namespace;
 import org.jdom.Verifier;
@@ -59,29 +60,32 @@ import org.jdom.Verifier;
  * collections.
  *
  * @author Robert Tansley
- * @version $Revision$
  */
-public class XHTMLHeadDisseminationCrosswalk extends SelfNamedPlugin implements
-                                                                     DisseminationCrosswalk {
+public class XHTMLHeadDisseminationCrosswalk
+        extends SelfNamedPlugin
+        implements DisseminationCrosswalk {
     /**
      * log4j logger
      */
-    private static Logger log = LogManager.getLogger(XHTMLHeadDisseminationCrosswalk.class);
+    private static final Logger log = LogManager.getLogger(XHTMLHeadDisseminationCrosswalk.class);
+
+    private static final String XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
+
+    protected final ItemService itemService
+            = ContentServiceFactory.getInstance().getItemService();
+    protected final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
-     * Location of config file
+     * Location of configuration file
      */
-    private final String config = ConfigurationManager
-        .getProperty("dspace.dir")
+    private final String config = configurationService.getProperty("dspace.dir")
         + File.separator
         + "config"
         + File.separator
         + "crosswalks"
         + File.separator + "xhtml-head-item.properties";
 
-    private static final String XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
-    protected final ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-
     /**
      * Maps DSpace metadata field to name to use in XHTML head element, e.g.
      * dc.creator or dc.description.abstract
@@ -99,9 +103,9 @@ public class XHTMLHeadDisseminationCrosswalk extends SelfNamedPlugin implements
     private Map<String, String> schemaURLs;
 
     public XHTMLHeadDisseminationCrosswalk() throws IOException {
-        names = new HashMap<String, String>();
-        schemes = new HashMap<String, String>();
-        schemaURLs = new HashMap<String, String>();
+        names = new HashMap<>();
+        schemes = new HashMap<>();
+        schemaURLs = new HashMap<>();
 
         // Read in configuration
         Properties crosswalkProps = new Properties();
@@ -189,7 +193,7 @@ public class XHTMLHeadDisseminationCrosswalk extends SelfNamedPlugin implements
 
         Item item = (Item) dso;
         String handle = item.getHandle();
-        List<Element> metas = new ArrayList<Element>();
+        List<Element> metas = new ArrayList<>();
         List<MetadataValue> values = itemService.getMetadata(item, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
 
         // Add in schema URLs e.g. <link rel="schema.DC" href="...." />
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
index 8f0f342b2e..d79ed06ee5 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
@@ -11,7 +11,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -19,8 +18,9 @@ import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
 
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.SelfNamedPlugin;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Namespace;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -83,7 +83,6 @@ import org.slf4j.LoggerFactory;
  * does this automatically.
  *
  * @author Larry Stone
- * @version $Revision$
  */
 public abstract class XSLTCrosswalk extends SelfNamedPlugin {
     /**
@@ -98,7 +97,7 @@ public abstract class XSLTCrosswalk extends SelfNamedPlugin {
         Namespace.getNamespace("dim", "http://www.dspace.org/xmlns/dspace/dim");
 
     /**
-     * Prefix for all lines in the config file for XSLT plugins.
+     * Prefix for all lines in the configuration file for XSLT plugins.
      */
     protected static final String CONFIG_PREFIX = "crosswalk.";
 
@@ -117,11 +116,12 @@ public abstract class XSLTCrosswalk extends SelfNamedPlugin {
         String suffix = CONFIG_STYLESHEET;
 
         List<String> aliasList = new ArrayList<>();
-        Enumeration<String> pe = (Enumeration<String>) ConfigurationManager.propertyNames();
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        List<String> configKeys = configurationService.getPropertyKeys();
 
         LOG.debug("XSLTCrosswalk: Looking for config prefix = {}", prefix);
-        while (pe.hasMoreElements()) {
-            String key = pe.nextElement();
+        for (String key : configKeys) {
             if (key.startsWith(prefix) && key.endsWith(suffix)) {
                 LOG.debug("Getting XSLT plugin name from config line: {}", key);
                 aliasList.add(key.substring(prefix.length(), key.length() - suffix.length()));
@@ -155,13 +155,15 @@ public abstract class XSLTCrosswalk extends SelfNamedPlugin {
                 return null;
             }
             String cmPropName = CONFIG_PREFIX + direction + "." + myAlias + CONFIG_STYLESHEET;
-            String fname = ConfigurationManager.getProperty(cmPropName);
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String fname = configurationService.getProperty(cmPropName);
             if (fname == null) {
                 LOG.error("Missing configuration filename for XSLT-based crosswalk: no " +
                               "value for property = {}", cmPropName);
                 return null;
             } else {
-                String parent = ConfigurationManager.getProperty("dspace.dir") +
+                String parent = configurationService.getProperty("dspace.dir") +
                     File.separator + "config" + File.separator;
                 transformFile = new File(parent, fname);
             }
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
index b068b3b166..ed0f024dca 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
@@ -15,7 +15,6 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,11 +35,12 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.handle.factory.HandleServiceFactory;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
@@ -95,11 +95,14 @@ public class XSLTDisseminationCrosswalk
 
     private static final String DIRECTION = "dissemination";
 
-    protected static final CommunityService communityService = ContentServiceFactory.getInstance()
-                                                                                    .getCommunityService();
-    protected static final CollectionService collectionService = ContentServiceFactory.getInstance()
-                                                                                      .getCollectionService();
-    protected static final ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+    protected static final CommunityService communityService
+            = ContentServiceFactory.getInstance().getCommunityService();
+    protected static final CollectionService collectionService
+            = ContentServiceFactory.getInstance().getCollectionService();
+    protected static final ItemService itemService
+            = ContentServiceFactory.getInstance().getItemService();
+    protected static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     private static final String aliases[] = makeAliases(DIRECTION);
 
@@ -133,7 +136,7 @@ public class XSLTDisseminationCrosswalk
 
         // get the schema location string, should already be in the
         // right format for value of "schemaLocation" attribute.
-        schemaLocation = ConfigurationManager.getProperty(prefix + "schemaLocation");
+        schemaLocation = configurationService.getProperty(prefix + "schemaLocation");
         if (schemaLocation == null) {
             LOG.warn("No schemaLocation for crosswalk=" + myAlias + ", key=" + prefix + "schemaLocation");
         } else if (schemaLocation.length() > 0 && schemaLocation.indexOf(' ') < 0) {
@@ -146,18 +149,17 @@ public class XSLTDisseminationCrosswalk
         // grovel for namespaces of the form:
         //  crosswalk.diss.{PLUGIN_NAME}.namespace.{PREFIX} = {URI}
         String nsPrefix = prefix + "namespace.";
-        Enumeration<String> pe = (Enumeration<String>) ConfigurationManager.propertyNames();
+        List<String> configKeys = configurationService.getPropertyKeys();
         List<Namespace> nsList = new ArrayList<>();
-        while (pe.hasMoreElements()) {
-            String key = pe.nextElement();
+        for (String key : configKeys) {
             if (key.startsWith(nsPrefix)) {
                 nsList.add(Namespace.getNamespace(key.substring(nsPrefix.length()),
-                                                  ConfigurationManager.getProperty(key)));
+                                                  configurationService.getProperty(key)));
             }
         }
         namespaces = nsList.toArray(new Namespace[nsList.size()]);
 
-        preferList = ConfigurationManager.getBooleanProperty(prefix + "preferList", false);
+        preferList = configurationService.getBooleanProperty(prefix + "preferList", false);
     }
 
     /**
@@ -463,7 +465,7 @@ public class XSLTDisseminationCrosswalk
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Filtering out non-XML characters in string, reason=" + reason);
             }
-            StringBuffer result = new StringBuffer(value.length());
+            StringBuilder result = new StringBuilder(value.length());
             for (int i = 0; i < value.length(); ++i) {
                 char c = value.charAt(i);
                 if (Verifier.isXMLCharacter((int) c)) {
@@ -558,7 +560,7 @@ public class XSLTDisseminationCrosswalk
         try {
             XMLOutputter xmlout = new XMLOutputter(Format.getPrettyFormat());
             xmlout.output(new Document(root), out);
-        } catch (Exception e) {
+        } catch (IOException e) {
             // as this script is for testing dissemination crosswalks, we want
             // verbose information in case of an exception.
             System.err.println("An error occurred after processing the dissemination crosswalk.");
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java b/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java
index 9cf6a7ca9f..0db9a98b9a 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSIngester.java
@@ -41,12 +41,13 @@ import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.workflow.WorkflowException;
 import org.dspace.workflow.factory.WorkflowServiceFactory;
 import org.jdom.Element;
@@ -100,7 +101,6 @@ import org.jdom.Element;
  *
  * @author Larry Stone
  * @author Tim Donohue
- * @version $Revision$
  * @see org.dspace.content.packager.METSManifest
  * @see AbstractPackageIngester
  * @see PackageIngester
@@ -109,7 +109,7 @@ public abstract class AbstractMETSIngester extends AbstractPackageIngester {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(AbstractMETSIngester.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(AbstractMETSIngester.class);
 
     protected final BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
     protected final BitstreamFormatService bitstreamFormatService = ContentServiceFactory.getInstance()
@@ -121,6 +121,8 @@ public abstract class AbstractMETSIngester extends AbstractPackageIngester {
     protected final HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
     protected final WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance()
                                                                                      .getWorkspaceItemService();
+    protected final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * <p>
@@ -135,7 +137,7 @@ public abstract class AbstractMETSIngester extends AbstractPackageIngester {
     protected static final class MdrefManager implements METSManifest.Mdref {
         private File packageFile = null;
 
-        private PackageParameters params;
+        private final PackageParameters params;
 
         // constructor initializes from package file
         private MdrefManager(File packageFile, PackageParameters params) {
@@ -1133,22 +1135,22 @@ public abstract class AbstractMETSIngester extends AbstractPackageIngester {
 
     // whether or not to save manifest as a bitstream in METADATA bundle.
     protected boolean preserveManifest() {
-        return ConfigurationManager.getBooleanProperty("mets."
-                                                           + getConfigurationName() + ".ingest.preserveManifest",
-                                                       false);
+        return configurationService.getBooleanProperty(
+                "mets." + getConfigurationName() + ".ingest.preserveManifest",
+                false);
     }
 
     // return short name of manifest bitstream format
     protected String getManifestBitstreamFormat() {
-        return ConfigurationManager.getProperty("mets."
-                                                    + getConfigurationName() + ".ingest.manifestBitstreamFormat");
+        return configurationService.getProperty(
+                "mets." + getConfigurationName() + ".ingest.manifestBitstreamFormat");
     }
 
     // whether or not to use Collection Templates when creating a new item
     protected boolean useCollectionTemplate() {
-        return ConfigurationManager.getBooleanProperty("mets."
-                                                           + getConfigurationName() + ".ingest.useCollectionTemplate",
-                                                       false);
+        return configurationService.getBooleanProperty(
+                "mets." + getConfigurationName() + ".ingest.useCollectionTemplate",
+                false);
     }
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSDisseminator.java b/dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSDisseminator.java
index 74f763729c..9db31b382a 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSDisseminator.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSDisseminator.java
@@ -25,7 +25,6 @@ import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bundle;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 
@@ -45,7 +44,6 @@ import org.dspace.core.Context;
  * plugin, and a way to create packages acceptable to the METS SIP importer.
  *
  * @author Larry Stone
- * @version $Revision$
  */
 public class DSpaceMETSDisseminator
     extends AbstractMETSDisseminator {
@@ -115,8 +113,7 @@ public class DSpaceMETSDisseminator
         agent.setTYPE(Type.ORGANIZATION);
         Name name = new Name();
         name.getContent()
-            .add(new PCData(ConfigurationManager
-                                .getProperty("dspace.name")));
+            .add(new PCData(configurationService.getProperty("dspace.name")));
         agent.getContent().add(name);
         metsHdr.getContent().add(agent);
         return metsHdr;
@@ -198,7 +195,7 @@ public class DSpaceMETSDisseminator
     @Override
     public String[] getRightsMdTypes(Context context, DSpaceObject dso, PackageParameters params)
         throws SQLException, IOException, AuthorizeException {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
 
         if (dso.getType() == Constants.ITEM) {
             Item item = (Item) dso;
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java b/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
index 002f87d08f..4c566c77ca 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
@@ -13,11 +13,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.codec.binary.Base64;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
@@ -29,10 +29,11 @@ import org.dspace.content.crosswalk.CrosswalkObjectNotSupported;
 import org.dspace.content.crosswalk.IngestionCrosswalk;
 import org.dspace.content.crosswalk.MetadataValidationException;
 import org.dspace.content.crosswalk.StreamIngestionCrosswalk;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Content;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -117,8 +118,10 @@ public class METSManifest {
     /**
      * log4j category
      */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(METSManifest.class);
+    private static final Logger log = LogManager.getLogger(METSManifest.class);
 
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
     /**
      * Canonical filename of METS manifest within a package or as a bitstream.
      */
@@ -131,7 +134,7 @@ public class METSManifest {
     public static final String CONFIG_METS_PREFIX = "mets.";
 
     /**
-     * prefix of config lines identifying local XML Schema (XSD) files
+     * prefix of configuration lines identifying local XML Schema (XSD) files
      */
     protected static final String CONFIG_XSD_PREFIX = CONFIG_METS_PREFIX + "xsd.";
 
@@ -190,21 +193,20 @@ public class METSManifest {
     protected static String localSchemas;
 
     static {
-        String dspace_dir = ConfigurationManager.getProperty("dspace.dir");
+        String dspace_dir = configurationService.getProperty("dspace.dir");
         File xsdPath1 = new File(dspace_dir + "/config/schemas/");
         File xsdPath2 = new File(dspace_dir + "/config/");
 
-        Enumeration<String> pe = (Enumeration<String>) ConfigurationManager.propertyNames();
-        StringBuffer result = new StringBuffer();
-        while (pe.hasMoreElements()) {
+        List<String> configKeys = configurationService.getPropertyKeys();
+        StringBuilder result = new StringBuilder();
+        for (String key : configKeys) {
             // config lines have the format:
             //  mets.xsd.{identifier} = {namespace} {xsd-URL}
             // e.g.
             //  mets.xsd.dc =  http://purl.org/dc/elements/1.1/ dc.xsd
             // (filename is relative to {dspace_dir}/config/schemas/)
-            String key = pe.nextElement();
             if (key.startsWith(CONFIG_XSD_PREFIX)) {
-                String spec = ConfigurationManager.getProperty(key);
+                String spec = configurationService.getProperty(key);
                 String val[] = spec.trim().split("\\s+");
                 if (val.length == 2) {
                     File xsd = new File(xsdPath1, val[1]);
@@ -240,7 +242,7 @@ public class METSManifest {
      *
      * @param builder    XML parser (for parsing mdRef'd files and binData)
      * @param mets       parsed METS document
-     * @param configName config name
+     * @param configName configuration name
      */
     protected METSManifest(SAXBuilder builder, Element mets, String configName) {
         super();
@@ -337,7 +339,7 @@ public class METSManifest {
             return bundleFiles;
         }
 
-        bundleFiles = new ArrayList<Element>();
+        bundleFiles = new ArrayList<>();
         Element fileSec = mets.getChild("fileSec", metsNS);
 
         if (fileSec != null) {
@@ -356,7 +358,7 @@ public class METSManifest {
             return contentFiles;
         }
 
-        contentFiles = new ArrayList<Element>();
+        contentFiles = new ArrayList<>();
         Element fileSec = mets.getChild("fileSec", metsNS);
 
         if (fileSec != null) {
@@ -637,7 +639,7 @@ public class METSManifest {
                 //  XML parser stupidly includes newlines in prettyprinting
                 //  as text content objects..
                 String id = mdSec.getAttributeValue("ID");
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 for (Iterator mi = mdc.iterator(); mi.hasNext(); ) {
                     sb.append(", ").append(((Content) mi.next()).toString());
                 }
@@ -661,12 +663,12 @@ public class METSManifest {
                         if (mimeType != null && mimeType.equalsIgnoreCase("text/xml")) {
                             byte value[] = Base64.decodeBase64(bin.getText().getBytes());
                             Document mdd = parser.build(new ByteArrayInputStream(value));
-                            List<Element> result = new ArrayList<Element>(1);
+                            List<Element> result = new ArrayList<>(1);
                             result.add(mdd.getRootElement());
                             return result;
                         } else {
                             log.warn("Ignoring binData section because MIMETYPE is not XML, but: " + mimeType);
-                            return new ArrayList<Element>(0);
+                            return new ArrayList<>(0);
                         }
                     }
                 } else {
@@ -680,12 +682,12 @@ public class METSManifest {
                         // This next line triggers a false-positive XXE warning from LGTM, even though we disallow DTD
                         // parsing during initialization of parser in create()
                         Document mdd = parser.build(callback.getInputStream(mdRef)); // lgtm [java/xxe]
-                        List<Element> result = new ArrayList<Element>(1);
+                        List<Element> result = new ArrayList<>(1);
                         result.add(mdd.getRootElement());
                         return result;
                     } else {
                         log.warn("Ignoring mdRef section because MIMETYPE is not XML, but: " + mimeType);
-                        return new ArrayList<Element>(0);
+                        return new ArrayList<>(0);
                     }
 
                 } else {
@@ -805,7 +807,7 @@ public class METSManifest {
         //get our child object <div>s
         List childObjDivs = getChildObjDivs();
 
-        List<String> childPathList = new ArrayList<String>();
+        List<String> childPathList = new ArrayList<>();
 
         if (childObjDivs != null && !childObjDivs.isEmpty()) {
             Iterator childIterator = childObjDivs.iterator();
@@ -917,10 +919,10 @@ public class METSManifest {
          * then try
          *   mets.default.ingest.crosswalk.MDNAME = XWALKNAME
          */
-        String xwalkName = ConfigurationManager.getProperty(
+        String xwalkName = configurationService.getProperty(
             CONFIG_METS_PREFIX + configName + ".ingest.crosswalk." + type);
         if (xwalkName == null) {
-            xwalkName = ConfigurationManager.getProperty(
+            xwalkName = configurationService.getProperty(
                 CONFIG_METS_PREFIX + "default.ingest.crosswalk." + type);
             if (xwalkName == null) {
                 xwalkName = type;
@@ -993,7 +995,7 @@ public class METSManifest {
             return new Element[0];
         }
         String amdID[] = amds.split("\\s+");
-        List<Element> resultList = new ArrayList<Element>();
+        List<Element> resultList = new ArrayList<>();
         for (int i = 0; i < amdID.length; ++i) {
             List rmds = getElementByXPath("mets:amdSec[@ID=\"" + amdID[i] + "\"]", false).
                                                                                              getChildren("rightsMD",
diff --git a/dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java b/dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java
deleted file mode 100644
index 8f2e92e2f0..0000000000
--- a/dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.core;
-
-import java.util.Enumeration;
-import java.util.Properties;
-
-import org.apache.commons.configuration2.Configuration;
-import org.apache.commons.configuration2.ConfigurationConverter;
-import org.apache.logging.log4j.Logger;
-import org.dspace.services.factory.DSpaceServicesFactory;
-
-/**
- * Class for reading the DSpace system configuration. The main configuration is
- * read in as properties from a standard properties file.
- * <P>
- * To specify a different configuration, the system property
- * <code>dspace.dir</code> should be set to the DSpace installation directory.
- * <P>
- * Other configuration files are read from the <code>config</code> directory
- * of the DSpace installation directory.
- *
- * @author Robert Tansley
- * @author Larry Stone - Interpolated values.
- * @author Mark Diggory - General Improvements to detection, logging and loading.
- * @author Tim Donohue - Refactored to wrap ConfigurationService
- * @version $Revision$
- * @deprecated Please use org.dspace.services.ConfigurationService. See examples below.
- */
-public class ConfigurationManager {
-    /**
-     * log4j category
-     */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(ConfigurationManager.class);
-
-    protected ConfigurationManager() {
-
-    }
-
-    /**
-     * Identify if DSpace is properly configured
-     *
-     * @return boolean true if configured, false otherwise
-     */
-    public static boolean isConfigured() {
-        return DSpaceServicesFactory.getInstance().getConfigurationService() != null;
-    }
-
-    /**
-     * Returns all properties in main configuration
-     *
-     * @return properties - all non-modular properties
-     */
-    public static Properties getProperties() {
-        return DSpaceServicesFactory.getInstance().getConfigurationService().getProperties();
-    }
-
-    /**
-     * Returns all properties for a given module
-     *
-     * @param module the name of the module
-     * @return properties - all module's properties
-     */
-    public static Properties getProperties(String module) {
-        // Find subset of Configurations which have been prefixed with the module name
-        Configuration subset = DSpaceServicesFactory.getInstance().getConfigurationService().getConfiguration()
-                                                    .subset(module);
-
-        // Convert to a Properties object and return it
-        return ConfigurationConverter.getProperties(subset);
-    }
-
-    /**
-     * Get a configuration property
-     *
-     * @param property the name of the property
-     * @return the value of the property, or <code>null</code> if the property
-     * does not exist.
-     */
-    public static String getProperty(String property) {
-        return DSpaceServicesFactory.getInstance().getConfigurationService().getProperty(property);
-    }
-
-    /**
-     * Get a module configuration property value.
-     *
-     * @param module   the name of the module, or <code>null</code> for regular configuration
-     *                 property
-     * @param property the name (key) of the property
-     * @return the value of the property, or <code>null</code> if the
-     * property does not exist
-     */
-    public static String getProperty(String module, String property) {
-        if (module == null) {
-            return getProperty(property);
-        }
-
-        // Assume "module" properties are always prefixed with the module name
-        return getProperty(module + "." + property);
-    }
-
-    /**
-     * Get a configuration property as an integer
-     *
-     * @param property the name of the property
-     * @return the value of the property. <code>0</code> is returned if the
-     * property does not exist. To differentiate between this case and
-     * when the property actually is zero, use <code>getProperty</code>.
-     */
-    public static int getIntProperty(String property) {
-        return DSpaceServicesFactory.getInstance().getConfigurationService().getIntProperty(property);
-    }
-
-    /**
-     * Get a module configuration property as an integer
-     *
-     * @param module   the name of the module
-     * @param property the name of the property
-     * @return the value of the property. <code>0</code> is returned if the
-     * property does not exist. To differentiate between this case and
-     * when the property actually is zero, use <code>getProperty</code>.
-     */
-    public static int getIntProperty(String module, String property) {
-        if (module == null) {
-            return getIntProperty(property);
-        }
-
-        // Assume "module" properties are always prefixed with the module name
-        return getIntProperty(module + "." + property);
-    }
-
-    /**
-     * Get a configuration property as an integer, with default
-     *
-     * @param property     the name of the property
-     * @param defaultValue value to return if property is not found or is not an Integer.
-     * @return the value of the property. <code>default</code> is returned if
-     * the property does not exist or is not an Integer. To differentiate between this case
-     * and when the property actually is false, use
-     * <code>getProperty</code>.
-     */
-    public static int getIntProperty(String property, int defaultValue) {
-        return DSpaceServicesFactory.getInstance().getConfigurationService().getIntProperty(property, defaultValue);
-    }
-
-    /**
-     * Get a module configuration property as an integer, with default
-     *
-     * @param module       the name of the module
-     * @param property     the name of the property
-     * @param defaultValue value to return if property is not found or is not an Integer.
-     * @return the value of the property. <code>default</code> is returned if
-     * the property does not exist or is not an Integer. To differentiate between this case
-     * and when the property actually is false, use
-     * <code>getProperty</code>.
-     */
-    public static int getIntProperty(String module, String property, int defaultValue) {
-        if (module == null) {
-            return getIntProperty(property, defaultValue);
-        }
-
-        // Assume "module" properties are always prefixed with the module name
-        return getIntProperty(module + "." + property, defaultValue);
-    }
-
-    /**
-     * Get a configuration property as a long
-     *
-     * @param property the name of the property
-     * @return the value of the property. <code>0</code> is returned if the
-     * property does not exist. To differentiate between this case and
-     * when the property actually is zero, use <code>getProperty</code>.
-     */
-    public static long getLongProperty(String property) {
-        return DSpaceServicesFactory.getInstance().getConfigurationService().getLongProperty(property);
-    }
-
-    /**
-     * Get a module configuration property as a long
-     *
-     * @param module   the name of the module
-     * @param property the name of the property
-     * @return the value of the property. <code>0</code> is returned if the
-     * property does not exist. To differentiate between this case and
-     * when the property actually is zero, use <code>getProperty</code>.
-     */
-    public static long getLongProperty(String module, String property) {
-        if (module == null) {
-            return getLongProperty(property);
-        }
-
-        // Assume "module" properties are always prefixed with the module name
-        return getLongProperty(module + "." + property);
-    }
-
-    /**
-     * Get a configuration property as an long, with default
-     *
-     * @param property     the name of the property
-     * @param defaultValue value to return if property is not found or is not a Long.
-     * @return the value of the property. <code>default</code> is returned if
-     * the property does not exist or is not an Integer. To differentiate between this case
-     * and when the property actually is false, use
-     * <code>getProperty</code>.
-     */
-    public static long getLongProperty(String property, int defaultValue) {
-        return DSpaceServicesFactory.getInstance().getConfigurationService().getLongProperty(property, defaultValue);
-    }
-
-    /**
-     * Get a configuration property as an long, with default
-     *
-     * @param module       the module, or <code>null</code> for regular property
-     * @param property     the name of the property
-     * @param defaultValue value to return if property is not found or is not a Long.
-     * @return the value of the property. <code>default</code> is returned if
-     * the property does not exist or is not an Integer. To differentiate between this case
-     * and when the property actually is false, use
-     * <code>getProperty</code>.
-     */
-    public static long getLongProperty(String module, String property, int defaultValue) {
-        if (module == null) {
-            return getLongProperty(property, defaultValue);
-        }
-
-        // Assume "module" properties are always prefixed with the module name
-        return getLongProperty(module + "." + property, defaultValue);
-    }
-
-    /**
-     * Get a configuration property as a boolean. True is indicated if the value
-     * of the property is <code>TRUE</code> or <code>YES</code> (case
-     * insensitive.)
-     *
-     * @param property the name of the property
-     * @return the value of the property. <code>false</code> is returned if
-     * the property does not exist. To differentiate between this case
-     * and when the property actually is false, use
-     * <code>getProperty</code>.
-     */
-    public static boolean getBooleanProperty(String property) {
-        return DSpaceServicesFactory.getInstance().getConfigurationService().getBooleanProperty(property);
-    }
-
-    /**
-     * Get a module configuration property as a boolean. True is indicated if
-     * the value of the property is <code>TRUE</code> or <code>YES</code> (case
-     * insensitive.)
-     *
-     * @param module   the module, or <code>null</code> for regular property
-     * @param property the name of the property
-     * @return the value of the property. <code>false</code> is returned if
-     * the property does not exist. To differentiate between this case
-     * and when the property actually is false, use
-     * <code>getProperty</code>.
-     */
-    public static boolean getBooleanProperty(String module, String property) {
-        if (module == null) {
-            return getBooleanProperty(property);
-        }
-
-        // Assume "module" properties are always prefixed with the module name
-        return getBooleanProperty(module + "." + property);
-    }
-
-    /**
-     * Get a configuration property as a boolean, with default.
-     * True is indicated if the value
-     * of the property is <code>TRUE</code> or <code>YES</code> (case
-     * insensitive.)
-     *
-     * @param property     the name of the property
-     * @param defaultValue value to return if property is not found.
-     * @return the value of the property. <code>default</code> is returned if
-     * the property does not exist. To differentiate between this case
-     * and when the property actually is false, use
-     * <code>getProperty</code>.
-     */
-    public static boolean getBooleanProperty(String property, boolean defaultValue) {
-        return DSpaceServicesFactory.getInstance().getConfigurationService().getBooleanProperty(property, defaultValue);
-    }
-
-    /**
-     * Get a module configuration property as a boolean, with default.
-     * True is indicated if the value
-     * of the property is <code>TRUE</code> or <code>YES</code> (case
-     * insensitive.)
-     *
-     * @param module       module, or <code>null</code> for regular property
-     * @param property     the name of the property
-     * @param defaultValue value to return if property is not found.
-     * @return the value of the property. <code>default</code> is returned if
-     * the property does not exist. To differentiate between this case
-     * and when the property actually is false, use
-     * <code>getProperty</code>.
-     */
-    public static boolean getBooleanProperty(String module, String property, boolean defaultValue) {
-        if (module == null) {
-            return getBooleanProperty(property, defaultValue);
-        }
-
-        // Assume "module" properties are always prefixed with the module name
-        return getBooleanProperty(module + "." + property, defaultValue);
-    }
-
-    /**
-     * Returns an enumeration of all the keys in the DSpace configuration
-     * <P>
-     * As ConfigurationManager is now deprecated, older code using this method
-     * should consider using ConfigurationService.getPropertyKeys() directly.
-     *
-     * @return an enumeration of all the keys in the DSpace configuration
-     */
-    public static Enumeration<?> propertyNames() {
-        // Get a list of all property keys, and convert into an Enumeration
-        return java.util.Collections
-            .enumeration(DSpaceServicesFactory.getInstance().getConfigurationService().getPropertyKeys());
-    }
-
-    /**
-     * Returns an enumeration of all the keys in a module configuration
-     * <P>
-     * As ConfigurationManager is now deprecated, older code using this method
-     * should consider using ConfigurationService.getPropertyKeys(String prefix) directly.
-     *
-     * @param module module, or <code>null</code> for regular property
-     * @return an enumeration of all the keys in the module configuration,
-     * or <code>null</code> if the module does not exist.
-     */
-    public static Enumeration<?> propertyNames(String module) {
-        // Get property keys beginning with this prefix, and convert into an Enumeration
-        return java.util.Collections
-            .enumeration(DSpaceServicesFactory.getInstance().getConfigurationService().getPropertyKeys(module));
-    }
-}
diff --git a/dspace-api/src/main/java/org/dspace/ctask/general/MicrosoftTranslator.java b/dspace-api/src/main/java/org/dspace/ctask/general/MicrosoftTranslator.java
index 43f61d13f8..803a431df6 100644
--- a/dspace-api/src/main/java/org/dspace/ctask/general/MicrosoftTranslator.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/general/MicrosoftTranslator.java
@@ -16,8 +16,10 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * MicrosoftTranslator translates metadata fields using Microsoft Translation API v2
@@ -36,12 +38,14 @@ public class MicrosoftTranslator extends AbstractTranslator {
 
     protected final String baseUrl = "http://api.microsofttranslator.com/V2/Http.svc/Translate";
 
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(MicrosoftTranslator.class);
+    private static final Logger log = LogManager.getLogger(MicrosoftTranslator.class);
 
 
     @Override
     protected void initApi() {
-        apiKey = ConfigurationManager.getProperty(PLUGIN_PREFIX, "api.key.microsoft");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        apiKey = configurationService.getProperty(PLUGIN_PREFIX, "api.key.microsoft");
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
index 88e32d0aaf..e1f3e1e175 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.TimeZone;
 import java.util.UUID;
+import javax.mail.MessagingException;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -55,7 +56,6 @@ import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
@@ -73,6 +73,7 @@ import org.dspace.discovery.indexobject.factory.IndexObjectFactoryFactory;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.GroupService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -110,6 +111,8 @@ public class SolrServiceImpl implements SearchService, IndexingService {
     protected IndexObjectFactoryFactory indexObjectServiceFactory;
     @Autowired
     protected SolrSearchCore solrSearchCore;
+    @Autowired
+    protected ConfigurationService configurationService;
 
     protected SolrServiceImpl() {
 
@@ -140,7 +143,6 @@ public class SolrServiceImpl implements SearchService, IndexingService {
      * @param context Users Context
      * @param indexableObject     The object we want to index
      * @param force   Force update even if not stale.
-     * @throws SQLException if error
      */
     @Override
     public void indexContent(Context context, IndexableObject indexableObject,
@@ -153,7 +155,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                 update(context, indexableObjectFactory, indexableObject);
                 log.info(LogManager.getHeader(context, "indexed_object", indexableObject.getUniqueIndexID()));
             }
-        } catch (Exception e) {
+        } catch (IOException | SQLException | SolrServerException | SearchServiceException e) {
             log.error(e.getMessage(), e);
         }
     }
@@ -200,7 +202,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             if (commit) {
                 solrSearchCore.getSolr().commit();
             }
-        } catch (Exception exception) {
+        } catch (IOException | SolrServerException exception) {
             log.error(exception.getMessage(), exception);
             emailException(exception);
         }
@@ -223,6 +225,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
      *
      * @param context the dspace context
      * @param searchUniqueID the search uniqueID of the document to be deleted
+     * @param commit commit the update immediately.
      * @throws IOException  if IO error
      */
     @Override
@@ -246,13 +249,15 @@ public class SolrServiceImpl implements SearchService, IndexingService {
      *
      * @param context context object
      * @param dso     object to re-index
+     * @throws java.sql.SQLException passed through.
+     * @throws java.io.IOException passed through.
      */
     @Override
     public void reIndexContent(Context context, IndexableObject dso)
         throws SQLException, IOException {
         try {
             indexContent(context, dso);
-        } catch (Exception exception) {
+        } catch (SQLException exception) {
             log.error(exception.getMessage(), exception);
             emailException(exception);
         }
@@ -262,6 +267,8 @@ public class SolrServiceImpl implements SearchService, IndexingService {
      * create full index - wiping old index
      *
      * @param c context to use
+     * @throws java.sql.SQLException passed through.
+     * @throws java.io.IOException passed through.
      */
     @Override
     public void createIndex(Context c) throws SQLException, IOException {
@@ -321,7 +328,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                 solrSearchCore.getSolr().commit();
             }
 
-        } catch (Exception e) {
+        } catch (IOException | SQLException | SolrServerException e) {
             log.error(e.getMessage(), e);
         }
     }
@@ -391,7 +398,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                     start += batch;
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException | SQLException | SolrServerException e) {
             log.error("Error cleaning discovery index: " + e.getMessage(), e);
         } finally {
             context.abort();
@@ -414,10 +421,8 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             long finish = System.currentTimeMillis();
             System.out.println("SOLR Search Optimize -- Process Finished:" + finish);
             System.out.println("SOLR Search Optimize -- Total time taken:" + (finish - start) + " (ms).");
-        } catch (SolrServerException sse) {
+        } catch (SolrServerException | IOException sse) {
             System.err.println(sse.getMessage());
-        } catch (IOException ioe) {
-            System.err.println(ioe.getMessage());
         }
     }
 
@@ -446,16 +451,14 @@ public class SolrServiceImpl implements SearchService, IndexingService {
     protected void emailException(Exception exception) {
         // Also email an alert, system admin may need to check for stale lock
         try {
-            String recipient = ConfigurationManager
-                .getProperty("alert.recipient");
+            String recipient = configurationService.getProperty("alert.recipient");
 
             if (StringUtils.isNotBlank(recipient)) {
                 Email email = Email
                     .getEmail(I18nUtil.getEmailFilename(
                         Locale.getDefault(), "internal_error"));
                 email.addRecipient(recipient);
-                email.addArgument(ConfigurationManager
-                                      .getProperty("dspace.ui.url"));
+                email.addArgument(configurationService.getProperty("dspace.ui.url"));
                 email.addArgument(new Date());
 
                 String stackTrace;
@@ -473,7 +476,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                 email.addArgument(stackTrace);
                 email.send();
             }
-        } catch (Exception e) {
+        } catch (IOException | MessagingException e) {
             // Not much we can do here!
             log.warn("Unable to send email alert", e);
         }
@@ -718,7 +721,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             QueryResponse queryResponse = solrSearchCore.getSolr().query(solrQuery, SolrRequest.METHOD.POST);
             return retrieveResult(context, discoveryQuery, queryResponse);
 
-        } catch (Exception e) {
+        } catch (IOException | SQLException | SolrServerException | SearchServiceException e) {
             throw new org.dspace.discovery.SearchServiceException(e.getMessage(), e);
         }
     }
@@ -879,7 +882,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                 DiscoverResult.SearchDocument resultDoc = new DiscoverResult.SearchDocument();
                 //Add information about our search fields
                 for (String field : searchFields) {
-                    List<String> valuesAsString = new ArrayList<String>();
+                    List<String> valuesAsString = new ArrayList<>();
                     for (Object o : doc.getFieldValues(field)) {
                         valuesAsString.add(String.valueOf(o));
                     }
@@ -892,10 +895,10 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                         indexableObject.getUniqueIndexID());
                     if (MapUtils.isNotEmpty(highlightedFields)) {
                         //We need to remove all the "_hl" appendix strings from our keys
-                        Map<String, List<String>> resultMap = new HashMap<String, List<String>>();
+                        Map<String, List<String>> resultMap = new HashMap<>();
                         for (String key : highlightedFields.keySet()) {
                             List<String> highlightOriginalValue = highlightedFields.get(key);
-                            List<String[]> resultHighlightOriginalValue = new ArrayList<String[]>();
+                            List<String[]> resultHighlightOriginalValue = new ArrayList<>();
                             for (String highlightValue : highlightOriginalValue) {
                                 String[] splitted = highlightValue.split("###");
                                 resultHighlightOriginalValue.add(splitted);
@@ -952,7 +955,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                 // just retrieve the facets in the order they where requested!
                 // also for the date we ask it in proper (reverse) order
                 // At the moment facet queries are only used for dates
-                LinkedHashMap<String, Integer> sortedFacetQueries = new LinkedHashMap<String, Integer>(
+                LinkedHashMap<String, Integer> sortedFacetQueries = new LinkedHashMap<>(
                     solrQueryResponse.getFacetQuery());
                 for (String facetQuery : sortedFacetQueries.keySet()) {
                     //TODO: do not assume this, people may want to use it for other ends, use a regex to make sure
@@ -1046,7 +1049,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             SolrDocumentList docs = rsp.getResults();
 
             Iterator iter = docs.iterator();
-            List<IndexableObject> result = new ArrayList<IndexableObject>();
+            List<IndexableObject> result = new ArrayList<>();
             while (iter.hasNext()) {
                 SolrDocument doc = (SolrDocument) iter.next();
                 IndexableObject o = findIndexableObject(context, doc);
@@ -1055,7 +1058,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                 }
             }
             return result;
-        } catch (Exception e) {
+        } catch (IOException | SQLException | SolrServerException e) {
             // Any acception that we get ignore it.
             // We do NOT want any crashed to shown by the user
             log.error(LogManager.getHeader(context, "Error while quering solr", "Query: " + query), e);
@@ -1158,7 +1161,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
                     }
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException | SQLException | SolrServerException e) {
             log.error(
                 LogManager.getHeader(context, "Error while retrieving related items", "Handle: "
                     + item.getHandle()), e);
@@ -1233,7 +1236,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             //Escape any regex chars
             separator = java.util.regex.Pattern.quote(separator);
             String[] fqParts = value.split(separator);
-            StringBuffer valueBuffer = new StringBuffer();
+            StringBuilder valueBuffer = new StringBuilder();
             int start = fqParts.length / 2;
             for (int i = start; i < fqParts.length; i++) {
                 String[] split = fqParts[i].split(SearchUtils.AUTHORITY_SEPARATOR, 2);
@@ -1265,7 +1268,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             //Escape any regex chars
             separator = java.util.regex.Pattern.quote(separator);
             String[] fqParts = value.split(separator);
-            StringBuffer authorityBuffer = new StringBuffer();
+            StringBuilder authorityBuffer = new StringBuilder();
             int start = fqParts.length / 2;
             for (int i = start; i < fqParts.length; i++) {
                 String[] split = fqParts[i].split(SearchUtils.AUTHORITY_SEPARATOR, 2);
@@ -1297,7 +1300,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             //Escape any regex chars
             separator = java.util.regex.Pattern.quote(separator);
             String[] fqParts = value.split(separator);
-            StringBuffer valueBuffer = new StringBuffer();
+            StringBuilder valueBuffer = new StringBuilder();
             int end = fqParts.length / 2;
             for (int i = 0; i < end; i++) {
                 valueBuffer.append(fqParts[i]);
@@ -1325,7 +1328,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
             if (solrSearchCore.getSolr() != null) {
                 solrSearchCore.getSolr().commit();
             }
-        } catch (Exception e) {
+        } catch (IOException | SolrServerException e) {
             throw new SearchServiceException(e.getMessage(), e);
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
index 40da31a0f9..25c61f511a 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
@@ -13,9 +13,9 @@ import java.util.Locale;
 import javax.mail.MessagingException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
 import org.dspace.core.I18nUtil;
@@ -44,7 +44,7 @@ public class AccountServiceImpl implements AccountService {
     /**
      * log4j log
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(AccountServiceImpl.class);
+    private static final Logger log = LogManager.getLogger(AccountServiceImpl.class);
     @Autowired(required = true)
     protected EPersonService ePersonService;
     @Autowired(required = true)
@@ -58,14 +58,20 @@ public class AccountServiceImpl implements AccountService {
 
     /**
      * Email registration info to the given email address.
-     *
-     * Potential error conditions: Cannot create registration data in database
-     * (throws SQLException) Error sending email (throws MessagingException)
-     * Error reading email template (throws IOException) Authorization error
-     * (throws AuthorizeException)
+     * Potential error conditions:
+     * <ul>
+     *   <li>Cannot create registration data in database (throws SQLException).</li>
+     *   <li>Error sending email (throws MessagingException).</li>
+     *   <li>Error reading email template (throws IOException).</li>
+     *   <li>Authorization error (throws AuthorizeException).</li>
+     * </ul>
      *
      * @param context DSpace context
      * @param email   Email address to send the registration email to
+     * @throws java.sql.SQLException passed through.
+     * @throws java.io.IOException passed through.
+     * @throws javax.mail.MessagingException passed through.
+     * @throws org.dspace.authorize.AuthorizeException passed through.
      */
     @Override
     public void sendRegistrationInfo(Context context, String email)
@@ -79,14 +85,22 @@ public class AccountServiceImpl implements AccountService {
 
     /**
      * Email forgot password info to the given email address.
+     * Potential error conditions:
+     * <ul>
+     *   <li>No EPerson with that email (returns null).</li>
+     *   <li>Cannot create registration data in database (throws SQLException).</li>
+     *   <li>Error sending email (throws MessagingException).</li>
+     *   <li>Error reading email template (throws IOException).</li>
+     *   <li>Authorization error (throws AuthorizeException).</li>
+     * </ul>
      *
-     * Potential error conditions: No EPerson with that email (returns null)
-     * Cannot create registration data in database (throws SQLException) Error
-     * sending email (throws MessagingException) Error reading email template
-     * (throws IOException) Authorization error (throws AuthorizeException)
      *
      * @param context DSpace context
      * @param email   Email address to send the forgot-password email to
+     * @throws java.sql.SQLException passed through.
+     * @throws java.io.IOException passed through.
+     * @throws javax.mail.MessagingException passed through.
+     * @throws org.dspace.authorize.AuthorizeException passed through.
      */
     @Override
     public void sendForgotPasswordInfo(Context context, String email)
@@ -111,6 +125,7 @@ public class AccountServiceImpl implements AccountService {
      * @return The EPerson corresponding to token, or null.
      * @throws SQLException If the token or eperson cannot be retrieved from the
      *                      database.
+     * @throws AuthorizeException passed through.
      */
     @Override
     public EPerson getEPerson(Context context, String token)
@@ -131,6 +146,7 @@ public class AccountServiceImpl implements AccountService {
      * @param context DSpace context
      * @param token   Account token
      * @return The email address corresponding to token, or null.
+     * @throws java.sql.SQLException passed through.
      */
     @Override
     public String getEmail(Context context, String token)
@@ -243,7 +259,7 @@ public class AccountServiceImpl implements AccountService {
      */
     protected void sendEmail(Context context, String email, boolean isRegister, RegistrationData rd)
         throws MessagingException, IOException, SQLException {
-        String base = ConfigurationManager.getProperty("dspace.ui.url");
+        String base = configurationService.getProperty("dspace.ui.url");
 
         //  Note change from "key=" to "token="
         String specialLink = new StringBuffer().append(base).append(
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java b/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
index 319dcad65c..5a67ee5889 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
@@ -12,7 +12,6 @@ import java.util.UUID;
 import javax.mail.MessagingException;
 
 import org.apache.logging.log4j.Logger;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
@@ -22,6 +21,8 @@ import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.event.Consumer;
 import org.dspace.event.Event;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Class for handling updates to EPersons
@@ -35,9 +36,12 @@ public class EPersonConsumer implements Consumer {
     /**
      * log4j logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(EPersonConsumer.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(EPersonConsumer.class);
 
-    protected EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+    protected EPersonService ePersonService
+            = EPersonServiceFactory.getInstance().getEPersonService();
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Initalise the consumer
@@ -69,7 +73,7 @@ public class EPersonConsumer implements Consumer {
             case Constants.EPERSON:
                 if (et == Event.CREATE) {
                     // Notify of new user registration
-                    String notifyRecipient = ConfigurationManager.getProperty("registration.notify");
+                    String notifyRecipient = configurationService.getProperty("registration.notify");
                     if (notifyRecipient == null) {
                         notifyRecipient = "";
                     }
@@ -82,8 +86,8 @@ public class EPersonConsumer implements Consumer {
                                 .getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(), "registration_notify"));
                             adminEmail.addRecipient(notifyRecipient);
 
-                            adminEmail.addArgument(ConfigurationManager.getProperty("dspace.name"));
-                            adminEmail.addArgument(ConfigurationManager.getProperty("dspace.ui.url"));
+                            adminEmail.addArgument(configurationService.getProperty("dspace.name"));
+                            adminEmail.addArgument(configurationService.getProperty("dspace.ui.url"));
                             adminEmail.addArgument(eperson.getFirstName() + " " + eperson.getLastName()); // Name
                             adminEmail.addArgument(eperson.getEmail());
                             adminEmail.addArgument(new Date());
diff --git a/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java b/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java
index f8c5e6268e..05de4f950f 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java
@@ -34,7 +34,6 @@ import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
 import org.dspace.core.I18nUtil;
@@ -45,6 +44,8 @@ import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
 import org.dspace.search.Harvest;
 import org.dspace.search.HarvestedItemInfo;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * CLI tool used for sending new item e-mail alerts to users
@@ -56,9 +57,14 @@ public class SubscribeCLITool {
 
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SubscribeCLITool.class);
 
-    private static HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
-    private static ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    private static SubscribeService subscribeService = EPersonServiceFactory.getInstance().getSubscribeService();
+    private static final HandleService handleService
+            = HandleServiceFactory.getInstance().getHandleService();
+    private static final ItemService itemService
+            = ContentServiceFactory.getInstance().getItemService();
+    private static final SubscribeService subscribeService
+            = EPersonServiceFactory.getInstance().getSubscribeService();
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Default constructor
@@ -168,14 +174,14 @@ public class SubscribeCLITool {
 
         // FIXME: text of email should be more configurable from an
         // i18n viewpoint
-        StringBuffer emailText = new StringBuffer();
+        StringBuilder emailText = new StringBuilder();
         boolean isFirst = true;
 
         for (int i = 0; i < collections.size(); i++) {
             Collection c = collections.get(i);
 
             try {
-                boolean includeAll = ConfigurationManager
+                boolean includeAll = configurationService
                     .getBooleanProperty("harvest.includerestricted.subscription", true);
 
                 // we harvest all the changed item from yesterday until now
@@ -191,7 +197,7 @@ public class SubscribeCLITool {
                              false, // Or withdrawals
                              includeAll);
 
-                if (ConfigurationManager.getBooleanProperty("eperson.subscription.onlynew", false)) {
+                if (configurationService.getBooleanProperty("eperson.subscription.onlynew", false)) {
                     // get only the items archived yesterday
                     itemInfos = filterOutModified(itemInfos);
                 } else {
@@ -300,7 +306,7 @@ public class SubscribeCLITool {
 
         try {
             line = new PosixParser().parse(options, argv);
-        } catch (Exception e) {
+        } catch (org.apache.commons.cli.ParseException e) {
             // automatically generate the help statement
             formatter.printHelp(usage, e.getMessage(), options, "");
             System.exit(1);
@@ -320,7 +326,7 @@ public class SubscribeCLITool {
             context = new Context(Context.Mode.READ_ONLY);
             processDaily(context, test);
             context.complete();
-        } catch (Exception e) {
+        } catch (IOException | SQLException e) {
             log.fatal(e);
         } finally {
             if (context != null && context.isValid()) {
@@ -333,7 +339,7 @@ public class SubscribeCLITool {
     private static List<HarvestedItemInfo> filterOutToday(List<HarvestedItemInfo> completeList) {
         log.debug("Filtering out all today item to leave new items list size="
                       + completeList.size());
-        List<HarvestedItemInfo> filteredList = new ArrayList<HarvestedItemInfo>();
+        List<HarvestedItemInfo> filteredList = new ArrayList<>();
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String today = sdf.format(new Date());
@@ -384,7 +390,7 @@ public class SubscribeCLITool {
 
     private static List<HarvestedItemInfo> filterOutModified(List<HarvestedItemInfo> completeList) {
         log.debug("Filtering out all modified to leave new items list size=" + completeList.size());
-        List<HarvestedItemInfo> filteredList = new ArrayList<HarvestedItemInfo>();
+        List<HarvestedItemInfo> filteredList = new ArrayList<>();
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         // Get the start and end dates for yesterday
diff --git a/dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java b/dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java
index 01f0d4fc56..a25f4dadc1 100644
--- a/dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java
+++ b/dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java
@@ -10,27 +10,27 @@ package org.dspace.event;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * An instance of this class contains the configuration profile of a specific,
  * named Consumer, <em>in the context of a specific Dispatcher</em>. This
  * includes the name, the class to instantiate and event filters. Note that all
  * characteristics are "global" and the same for all dispatchers.
- *
- * @version $Revision$
  */
 public class ConsumerProfile {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(ConsumerProfile.class);
+    private static final Logger log = LogManager.getLogger(ConsumerProfile.class);
 
     /**
      * Name matching the key in DSpace Configuration
      */
-    private String name;
+    private final String name;
 
     /**
      * Instance of configured consumer class
@@ -82,9 +82,11 @@ public class ConsumerProfile {
     private void readConfiguration()
         throws IllegalArgumentException, ClassNotFoundException,
         InstantiationException, IllegalAccessException {
-        String className = ConfigurationManager.getProperty(CONSUMER_PREFIX
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String className = configurationService.getProperty(CONSUMER_PREFIX
                                                                 + name + ".class");
-        String filterString = ConfigurationManager.getProperty(CONSUMER_PREFIX
+        String filterString = configurationService.getProperty(CONSUMER_PREFIX
                                                                    + name + ".filters");
 
         if (className == null) {
@@ -99,7 +101,7 @@ public class ConsumerProfile {
         consumer = (Consumer) Class.forName(className.trim()).newInstance();
 
         // Each "filter" is <objectTypes> + <eventTypes> : ...
-        filters = new ArrayList<int[]>();
+        filters = new ArrayList<>();
         String part[] = filterString.trim().split(":");
         for (int j = 0; j < part.length; ++j) {
             String fpart[] = part[j].split("\\+");
diff --git a/dspace-api/src/main/java/org/dspace/event/TestConsumer.java b/dspace-api/src/main/java/org/dspace/event/TestConsumer.java
index e40c0d9a36..148d32137d 100644
--- a/dspace-api/src/main/java/org/dspace/event/TestConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/event/TestConsumer.java
@@ -12,10 +12,12 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Demonstration and test consumer for the event system. This consumer only
@@ -27,10 +29,13 @@ import org.dspace.eperson.EPerson;
  */
 public class TestConsumer implements Consumer {
     // Log4j logger
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(TestConsumer.class);
+    private static final Logger log = LogManager.getLogger(TestConsumer.class);
+
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     // Send diagnostic output here - set to null to turn it off.
-    private static PrintStream out = ConfigurationManager
+    private static final PrintStream out = configurationService
         .getBooleanProperty("testConsumer.verbose") ? System.out : null;
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/harvest/HarvestScheduler.java b/dspace-api/src/main/java/org/dspace/harvest/HarvestScheduler.java
index 3942597d34..28aed02e1d 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/HarvestScheduler.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/HarvestScheduler.java
@@ -15,16 +15,18 @@ import java.util.List;
 import java.util.Stack;
 import java.util.UUID;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.harvest.factory.HarvestServiceFactory;
 import org.dspace.harvest.service.HarvestedCollectionService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * The class responsible for scheduling harvesting cycles are regular intervals.
@@ -32,7 +34,7 @@ import org.dspace.harvest.service.HarvestedCollectionService;
  * @author alexey
  */
 public class HarvestScheduler implements Runnable {
-    protected static Logger log = org.apache.logging.log4j.LogManager.getLogger(HarvestScheduler.class);
+    protected static Logger log = LogManager.getLogger(HarvestScheduler.class);
 
 
     protected static EPerson harvestAdmin;
@@ -77,10 +79,12 @@ public class HarvestScheduler implements Runnable {
 
     protected static long maxHeartbeat;
 
-    private static final CollectionService collectionService = ContentServiceFactory.getInstance()
-                                                                                    .getCollectionService();
-    private static final HarvestedCollectionService harvestedCollectionService =
-        HarvestServiceFactory.getInstance().getHarvestedCollectionService();
+    private static final CollectionService collectionService
+            = ContentServiceFactory.getInstance().getCollectionService();
+    private static final HarvestedCollectionService harvestedCollectionService
+            = HarvestServiceFactory.getInstance().getHarvestedCollectionService();
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     public static boolean hasStatus(int statusToCheck) {
         return status == statusToCheck;
@@ -121,25 +125,25 @@ public class HarvestScheduler implements Runnable {
 
     public HarvestScheduler() throws SQLException, AuthorizeException {
         mainContext = new Context();
-        String harvestAdminParam = ConfigurationManager.getProperty("oai", "harvester.eperson");
+        String harvestAdminParam = configurationService.getProperty("oai.harvester.eperson");
         harvestAdmin = null;
         if (harvestAdminParam != null && harvestAdminParam.length() > 0) {
             harvestAdmin = EPersonServiceFactory.getInstance().getEPersonService()
                                                 .findByEmail(mainContext, harvestAdminParam);
         }
 
-        harvestThreads = new Stack<HarvestThread>();
+        harvestThreads = new Stack<>();
 
-        maxActiveThreads = ConfigurationManager.getIntProperty("oai", "harvester.maxThreads");
+        maxActiveThreads = configurationService.getIntProperty("oai.harvester.maxThreads");
         if (maxActiveThreads == 0) {
             maxActiveThreads = 3;
         }
-        minHeartbeat = ConfigurationManager.getIntProperty("oai", "harvester.minHeartbeat");
+        minHeartbeat = configurationService.getIntProperty("oai.harvester.minHeartbeat");
         minHeartbeat = minHeartbeat * 1000; // multiple by 1000 to turn seconds to ms
         if (minHeartbeat == 0) {
             minHeartbeat = 30000;
         }
-        maxHeartbeat = ConfigurationManager.getIntProperty("oai", "harvester.maxHeartbeat");
+        maxHeartbeat = configurationService.getIntProperty("oai.harvester.maxHeartbeat");
         maxHeartbeat = maxHeartbeat * 1000; // multiple by 1000 to turn seconds to ms
         if (maxHeartbeat == 0) {
             maxHeartbeat = 3600000;
@@ -235,7 +239,7 @@ public class HarvestScheduler implements Runnable {
                     mainContext.abort();
                 }
 
-            } catch (Exception e) {
+            } catch (IOException | InterruptedException | SQLException | AuthorizeException e) {
                 log.error("Exception on iteration: " + i);
                 e.printStackTrace();
             }
@@ -245,7 +249,7 @@ public class HarvestScheduler implements Runnable {
                 Context tempContext = new Context();
                 HarvestedCollection hc = harvestedCollectionService.findOldestHarvest(tempContext);
 
-                int harvestInterval = ConfigurationManager.getIntProperty("oai", "harvester.harvestFrequency");
+                int harvestInterval = configurationService.getIntProperty("oai.harvester.harvestFrequency");
                 if (harvestInterval == 0) {
                     harvestInterval = 720;
                 }
diff --git a/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollectionServiceImpl.java b/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollectionServiceImpl.java
index bb3057e0cd..88cec74a58 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollectionServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollectionServiceImpl.java
@@ -12,24 +12,30 @@ import static org.dspace.harvest.OAIHarvester.OAI_DMD_ERROR;
 import static org.dspace.harvest.OAIHarvester.OAI_ORE_ERROR;
 import static org.dspace.harvest.OAIHarvester.OAI_SET_ERROR;
 
+import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
 
 import ORG.oclc.oai.harvester2.verb.Identify;
 import ORG.oclc.oai.harvester2.verb.ListIdentifiers;
 import org.dspace.content.Collection;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.harvest.dao.HarvestedCollectionDAO;
 import org.dspace.harvest.service.HarvestedCollectionService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
 import org.jdom.input.DOMBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.w3c.dom.DOMException;
+import org.xml.sax.SAXException;
 
 /**
  * Service implementation for the HarvestedCollection object.
@@ -108,12 +114,14 @@ public class HarvestedCollectionServiceImpl implements HarvestedCollectionServic
 
     @Override
     public List<HarvestedCollection> findReady(Context context) throws SQLException {
-        int harvestInterval = ConfigurationManager.getIntProperty("oai", "harvester.harvestFrequency");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        int harvestInterval = configurationService.getIntProperty("oai.harvester.harvestFrequency");
         if (harvestInterval == 0) {
             harvestInterval = 720;
         }
 
-        int expirationInterval = ConfigurationManager.getIntProperty("oai", "harvester.threadTimeout");
+        int expirationInterval = configurationService.getIntProperty("oai.harvester.threadTimeout");
         if (expirationInterval == 0) {
             expirationInterval = 24;
         }
@@ -182,14 +190,15 @@ public class HarvestedCollectionServiceImpl implements HarvestedCollectionServic
      * @param testORE    whether the method should also check the PMH provider for ORE support
      * @return list of errors encountered during verification. Empty list indicates a "success" condition.
      */
+    @Override
     public List<String> verifyOAIharvester(String oaiSource,
                                                   String oaiSetId, String metaPrefix, boolean testORE) {
-        List<String> errorSet = new ArrayList<String>();
+        List<String> errorSet = new ArrayList<>();
 
         // First, see if we can contact the target server at all.
         try {
             new Identify(oaiSource);
-        } catch (Exception ex) {
+        } catch (IOException | ParserConfigurationException | TransformerException | SAXException ex) {
             errorSet.add(OAI_ADDRESS_ERROR + ": OAI server could not be reached.");
             return errorSet;
         }
@@ -207,7 +216,7 @@ public class HarvestedCollectionServiceImpl implements HarvestedCollectionServic
         try {
             OREOAIPrefix = OAIHarvester.oaiResolveNamespaceToPrefix(oaiSource, OAIHarvester.getORENamespace().getURI());
             DMDOAIPrefix = OAIHarvester.oaiResolveNamespaceToPrefix(oaiSource, DMD_NS.getURI());
-        } catch (Exception ex) {
+        } catch (IOException | ParserConfigurationException | TransformerException | SAXException ex) {
             errorSet.add(OAI_ADDRESS_ERROR
                 + ": OAI did not respond to ListMetadataFormats query  ("
                 + ORE_NS.getPrefix() + ":" + OREOAIPrefix + " ; "
@@ -251,11 +260,11 @@ public class HarvestedCollectionServiceImpl implements HarvestedCollectionServic
                     }
                 }
             }
-        } catch (RuntimeException re) {
-            throw re;
-        } catch (Exception e) {
+        } catch (IOException | ParserConfigurationException | TransformerException | DOMException | SAXException e) {
             errorSet.add(OAI_ADDRESS_ERROR + ": OAI server could not be reached");
             return errorSet;
+        } catch (RuntimeException re) {
+            throw re;
         }
 
         return errorSet;
diff --git a/dspace-api/src/main/java/org/dspace/health/InfoCheck.java b/dspace-api/src/main/java/org/dspace/health/InfoCheck.java
index ddb8785d6d..4b763bbff9 100644
--- a/dspace-api/src/main/java/org/dspace/health/InfoCheck.java
+++ b/dspace-api/src/main/java/org/dspace/health/InfoCheck.java
@@ -12,7 +12,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import org.apache.commons.io.FileUtils;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.services.ConfigurationService;
 import org.dspace.storage.bitstore.DSBitStoreService;
 import org.dspace.utils.DSpace;
@@ -24,9 +23,9 @@ public class InfoCheck extends Check {
 
     @Override
     public String run(ReportInfo ri) {
-        StringBuilder sb = new StringBuilder();
         ConfigurationService configurationService
             = new DSpace().getConfigurationService();
+        StringBuilder sb = new StringBuilder();
         sb.append("Generated: ").append(
             new Date().toString()
         ).append("\n");
@@ -38,12 +37,13 @@ public class InfoCheck extends Check {
         ).append("\n");
 
         sb.append("Url: ").append(
-            ConfigurationManager.getProperty("dspace.ui.url")
+            configurationService.getProperty("dspace.ui.url")
         ).append("\n");
         sb.append("\n");
 
-        DSBitStoreService localStore = new DSpace().getServiceManager().getServicesByType(DSBitStoreService.class)
-                                                   .get(0);
+        DSBitStoreService localStore = new DSpace().getServiceManager()
+                .getServicesByType(DSBitStoreService.class)
+                .get(0);
         for (String[] ss : new String[][] {
             new String[] {
                 localStore.getBaseDir().toString(),
diff --git a/dspace-api/src/main/java/org/dspace/health/Report.java b/dspace-api/src/main/java/org/dspace/health/Report.java
index 651d3ac1d7..28c451d188 100644
--- a/dspace-api/src/main/java/org/dspace/health/Report.java
+++ b/dspace-api/src/main/java/org/dspace/health/Report.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.health;
 
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -14,6 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.StringTokenizer;
+import javax.mail.MessagingException;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
@@ -21,11 +23,12 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Email;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.core.service.PluginService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
@@ -33,10 +36,10 @@ import org.dspace.services.factory.DSpaceServicesFactory;
  */
 public class Report {
 
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(Report.class);
+    private static final Logger log = LogManager.getLogger(Report.class);
     public static final String EMAIL_PATH = "config/emails/healthcheck";
     // store the individual check reports
-    private StringBuilder summary_;
+    private final StringBuilder summary_;
 
     // ctor
     //
@@ -95,6 +98,7 @@ public class Report {
         return checks;
     }
 
+    @Override
     public String toString() {
         return summary_.toString();
     }
@@ -173,10 +177,11 @@ public class Report {
         }
 
         try {
-
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
             // last n days
-            int for_last_n_days = ConfigurationManager.getIntProperty(
-                "healthcheck", "last_n_days");
+            int for_last_n_days = configurationService.getIntProperty(
+                "healthcheck.last_n_days");
             if (cmdline.hasOption(option_last_n)) {
                 for_last_n_days = Integer.getInteger(
                     cmdline.getOptionValue(option_last_n));
@@ -195,10 +200,10 @@ public class Report {
             if (cmdline.hasOption(option_email)) {
                 String to = cmdline.getOptionValue(option_email);
                 if (!to.contains("@")) {
-                    to = ConfigurationManager.getProperty(to);
+                    to = configurationService.getProperty(to);
                 }
                 try {
-                    String dspace_dir = ConfigurationManager.getProperty("dspace.dir");
+                    String dspace_dir = configurationService.getProperty("dspace.dir");
                     String email_path = dspace_dir.endsWith("/") ? dspace_dir
                         : dspace_dir + "/";
                     email_path += Report.EMAIL_PATH;
@@ -208,7 +213,7 @@ public class Report {
                     email.addRecipient(to);
                     email.addArgument(r.toString());
                     email.send();
-                } catch (Exception e) {
+                } catch (IOException | MessagingException e) {
                     log.fatal("Error sending email:", e);
                     System.err.println("Error sending email:\n" + e.getMessage());
                     System.exit(1);
diff --git a/dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java
index 9e34fd94da..9e427e0ef4 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java
@@ -18,10 +18,10 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -38,7 +38,7 @@ public class HandleIdentifierProvider extends IdentifierProvider {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(HandleIdentifierProvider.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(HandleIdentifierProvider.class);
 
     /**
      * Prefix registered to no one
@@ -97,7 +97,7 @@ public class HandleIdentifierProvider extends IdentifierProvider {
             }
 
             return id;
-        } catch (Exception e) {
+        } catch (IOException | SQLException | AuthorizeException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID(), e);
@@ -112,7 +112,7 @@ public class HandleIdentifierProvider extends IdentifierProvider {
                 Item item = (Item) dso;
                 populateHandleMetadata(context, item, identifier);
             }
-        } catch (Exception e) {
+        } catch (IOException | IllegalStateException | SQLException | AuthorizeException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID(), e);
@@ -124,7 +124,7 @@ public class HandleIdentifierProvider extends IdentifierProvider {
     public void reserve(Context context, DSpaceObject dso, String identifier) {
         try {
             handleService.createHandle(context, dso, identifier);
-        } catch (Exception e) {
+        } catch (IllegalStateException | SQLException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID());
@@ -147,7 +147,7 @@ public class HandleIdentifierProvider extends IdentifierProvider {
 
         try {
             return handleService.createHandle(context, dso);
-        } catch (Exception e) {
+        } catch (SQLException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID());
@@ -159,7 +159,7 @@ public class HandleIdentifierProvider extends IdentifierProvider {
         // We can do nothing with this, return null
         try {
             return handleService.resolveToObject(context, identifier);
-        } catch (Exception e) {
+        } catch (IllegalStateException | SQLException e) {
             log.error(LogManager.getHeader(context, "Error while resolving handle to item", "handle: " + identifier),
                       e);
         }
@@ -212,7 +212,9 @@ public class HandleIdentifierProvider extends IdentifierProvider {
      * @return configured prefix or "123456789"
      */
     public static String getPrefix() {
-        String prefix = ConfigurationManager.getProperty("handle.prefix");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String prefix = configurationService.getProperty("handle.prefix");
         if (null == prefix) {
             prefix = EXAMPLE_PREFIX; // XXX no good way to exit cleanly
             log.error("handle.prefix is not configured; using " + prefix);
diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
index 801b13be15..9d08d1d619 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
@@ -22,11 +22,11 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.versioning.Version;
 import org.dspace.versioning.VersionHistory;
@@ -46,7 +46,8 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
     /**
      * log4j category
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(VersionedHandleIdentifierProvider.class);
+    private static final Logger log
+            = org.apache.logging.log4j.LogManager.getLogger(VersionedHandleIdentifierProvider.class);
 
     /**
      * Prefix registered to no one
@@ -110,7 +111,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
             if (dso instanceof Item) {
                 populateHandleMetadata(context, (Item) dso, id);
             }
-        } catch (Exception e) {
+        } catch (IOException | SQLException | AuthorizeException e) {
             log.error(LogManager.getHeader(context, "Error while attempting to create handle",
                                            "Item id: " + (dso != null ? dso.getID() : "")), e);
             throw new RuntimeException(
@@ -261,7 +262,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
     public void reserve(Context context, DSpaceObject dso, String identifier) {
         try {
             handleService.createHandle(context, dso, identifier);
-        } catch (Exception e) {
+        } catch (IllegalStateException | SQLException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID());
@@ -295,7 +296,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
                 handleId = createNewIdentifier(context, dso, null);
             }
             return handleId;
-        } catch (Exception e) {
+        } catch (SQLException | AuthorizeException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID());
@@ -307,7 +308,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
         // We can do nothing with this, return null
         try {
             return handleService.resolveToObject(context, identifier);
-        } catch (Exception e) {
+        } catch (IllegalStateException | SQLException e) {
             log.error(LogManager.getHeader(context, "Error while resolving handle to item", "handle: " + identifier),
                       e);
         }
@@ -356,7 +357,9 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
      * @return configured prefix or "123456789"
      */
     public static String getPrefix() {
-        String prefix = ConfigurationManager.getProperty("handle.prefix");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String prefix = configurationService.getProperty("handle.prefix");
         if (null == prefix) {
             prefix = EXAMPLE_PREFIX; // XXX no good way to exit cleanly
             log.error("handle.prefix is not configured; using " + prefix);
diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
index d644c87367..82160bf92c 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
@@ -20,11 +20,11 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.versioning.Version;
 import org.dspace.versioning.VersionHistory;
@@ -43,7 +43,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
     /**
      * log4j category
      */
-    private static Logger log =
+    private static final Logger log =
             org.apache.logging.log4j.LogManager.getLogger(VersionedHandleIdentifierProviderWithCanonicalHandles.class);
 
     /**
@@ -231,7 +231,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                     modifyHandleMetadata(context, item, getCanonical(identifier));
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException | SQLException | AuthorizeException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID(), e);
@@ -284,7 +284,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
     public void reserve(Context context, DSpaceObject dso, String identifier) {
         try {
             handleService.createHandle(context, dso, identifier);
-        } catch (Exception e) {
+        } catch (IllegalStateException | SQLException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID());
@@ -318,7 +318,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                 handleId = createNewIdentifier(context, dso, null);
             }
             return handleId;
-        } catch (Exception e) {
+        } catch (SQLException | AuthorizeException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to create handle", "Item id: " + dso.getID()), e);
             throw new RuntimeException("Error while attempting to create identifier for Item id: " + dso.getID());
@@ -330,7 +330,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
         // We can do nothing with this, return null
         try {
             return handleService.resolveToObject(context, identifier);
-        } catch (Exception e) {
+        } catch (IllegalStateException | SQLException e) {
             log.error(LogManager.getHeader(context, "Error while resolving handle to item", "handle: " + identifier),
                       e);
         }
@@ -378,7 +378,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                     handleService.modifyHandleDSpaceObject(context, canonical, previous);
                 }
             }
-        } catch (Exception e) {
+        } catch (RuntimeException | SQLException e) {
             log.error(
                 LogManager.getHeader(context, "Error while attempting to register doi", "Item id: " + dso.getID()), e);
             throw new IdentifierException("Error while moving doi identifier", e);
@@ -404,7 +404,9 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
      * @return configured prefix or "123456789"
      */
     public static String getPrefix() {
-        String prefix = ConfigurationManager.getProperty("handle.prefix");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String prefix = configurationService.getProperty("handle.prefix");
         if (null == prefix) {
             prefix = EXAMPLE_PREFIX; // XXX no good way to exit cleanly
             log.error("handle.prefix is not configured; using " + prefix);
diff --git a/dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java b/dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java
index 3b71af74c1..73daaa9406 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java
@@ -17,6 +17,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
+import javax.mail.MessagingException;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -26,11 +27,11 @@ import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
@@ -42,6 +43,8 @@ import org.dspace.identifier.DOIIdentifierProvider;
 import org.dspace.identifier.IdentifierException;
 import org.dspace.identifier.factory.IdentifierServiceFactory;
 import org.dspace.identifier.service.DOIService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.utils.DSpace;
 
 
@@ -51,14 +54,15 @@ import org.dspace.utils.DSpace;
  */
 public class DOIOrganiser {
 
-    private static final Logger LOG = org.apache.logging.log4j.LogManager.getLogger(DOIOrganiser.class);
+    private static final Logger LOG = LogManager.getLogger(DOIOrganiser.class);
 
-    private DOIIdentifierProvider provider;
-    private Context context;
+    private final DOIIdentifierProvider provider;
+    private final Context context;
     private boolean quiet;
     protected HandleService handleService;
     protected ItemService itemService;
     protected DOIService doiService;
+    protected ConfigurationService configurationService;
 
     public DOIOrganiser(Context context, DOIIdentifierProvider provider) {
         this.context = context;
@@ -67,6 +71,7 @@ public class DOIOrganiser {
         this.handleService = HandleServiceFactory.getInstance().getHandleService();
         this.itemService = ContentServiceFactory.getInstance().getItemService();
         this.doiService = IdentifierServiceFactory.getInstance().getDOIService();
+        this.configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
     }
 
     public static void main(String[] args) {
@@ -191,7 +196,7 @@ public class DOIOrganiser {
             try {
                 List<DOI> dois = doiService
                     .getDOIsByStatus(context, Arrays.asList(DOIIdentifierProvider.TO_BE_RESERVED));
-                if (0 == dois.size()) {
+                if (dois.isEmpty()) {
                     System.err.println("There are no objects in the database "
                                            + "that could be reserved.");
                 }
@@ -211,7 +216,7 @@ public class DOIOrganiser {
             try {
                 List<DOI> dois = doiService
                     .getDOIsByStatus(context, Arrays.asList(DOIIdentifierProvider.TO_BE_REGISTERED));
-                if (0 == dois.size()) {
+                if (dois.isEmpty()) {
                     System.err.println("There are no objects in the database "
                                            + "that could be registered.");
                 }
@@ -232,7 +237,7 @@ public class DOIOrganiser {
                     DOIIdentifierProvider.UPDATE_BEFORE_REGISTRATION,
                     DOIIdentifierProvider.UPDATE_RESERVED,
                     DOIIdentifierProvider.UPDATE_REGISTERED));
-                if (0 == dois.size()) {
+                if (dois.isEmpty()) {
                     System.err.println("There are no objects in the database "
                                            + "whose metadata needs an update.");
                 }
@@ -252,7 +257,7 @@ public class DOIOrganiser {
             try {
                 List<DOI> dois = doiService
                     .getDOIsByStatus(context, Arrays.asList(DOIIdentifierProvider.TO_BE_DELETED));
-                if (0 == dois.size()) {
+                if (dois.isEmpty()) {
                     System.err.println("There are no objects in the database "
                                            + "that could be deleted.");
                 }
@@ -280,13 +285,7 @@ public class DOIOrganiser {
                 try {
                     DOI doiRow = organiser.resolveToDOI(identifier);
                     organiser.reserve(doiRow);
-                } catch (SQLException ex) {
-                    LOG.error(ex);
-                } catch (IllegalArgumentException ex) {
-                    LOG.error(ex);
-                } catch (IllegalStateException ex) {
-                    LOG.error(ex);
-                } catch (IdentifierException ex) {
+                } catch (SQLException | IllegalArgumentException | IllegalStateException | IdentifierException ex) {
                     LOG.error(ex);
                 }
             }
@@ -301,13 +300,7 @@ public class DOIOrganiser {
                 try {
                     DOI doiRow = organiser.resolveToDOI(identifier);
                     organiser.register(doiRow);
-                } catch (SQLException ex) {
-                    LOG.error(ex);
-                } catch (IllegalArgumentException ex) {
-                    LOG.error(ex);
-                } catch (IllegalStateException ex) {
-                    LOG.error(ex);
-                } catch (IdentifierException ex) {
+                } catch (SQLException | IllegalArgumentException | IllegalStateException | IdentifierException ex) {
                     LOG.error(ex);
                 }
             }
@@ -322,13 +315,7 @@ public class DOIOrganiser {
                 try {
                     DOI doiRow = organiser.resolveToDOI(identifier);
                     organiser.update(doiRow);
-                } catch (SQLException ex) {
-                    LOG.error(ex);
-                } catch (IllegalArgumentException ex) {
-                    LOG.error(ex);
-                } catch (IllegalStateException ex) {
-                    LOG.error(ex);
-                } catch (IdentifierException ex) {
+                } catch (SQLException | IllegalArgumentException | IllegalStateException | IdentifierException ex) {
                     LOG.error(ex);
                 }
             }
@@ -342,9 +329,7 @@ public class DOIOrganiser {
             } else {
                 try {
                     organiser.delete(identifier);
-                } catch (SQLException ex) {
-                    LOG.error(ex);
-                } catch (IllegalArgumentException ex) {
+                } catch (SQLException | IllegalArgumentException ex) {
                     LOG.error(ex);
                 }
             }
@@ -714,7 +699,7 @@ public class DOIOrganiser {
 
     private void sendAlertMail(String action, DSpaceObject dso, String doi, String reason)
         throws IOException {
-        String recipient = ConfigurationManager.getProperty("alert.recipient");
+        String recipient = configurationService.getProperty("alert.recipient");
 
         try {
             if (recipient != null) {
@@ -733,7 +718,7 @@ public class DOIOrganiser {
                     System.err.println("Email alert is sent.");
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException | MessagingException e) {
             LOG.warn("Unable to send email alert", e);
             if (!quiet) {
                 System.err.println("Unable to send email alert.");
diff --git a/dspace-api/src/main/java/org/dspace/sort/SortOption.java b/dspace-api/src/main/java/org/dspace/sort/SortOption.java
index 19634164ce..70250f90fa 100644
--- a/dspace-api/src/main/java/org/dspace/sort/SortOption.java
+++ b/dspace-api/src/main/java/org/dspace/sort/SortOption.java
@@ -17,8 +17,10 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Class to mediate with the sort configuration
@@ -26,13 +28,13 @@ import org.dspace.core.ConfigurationManager;
  * @author Richard Jones
  */
 public class SortOption {
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SortOption.class);
+    private static final Logger log = LogManager.getLogger(SortOption.class);
 
     public static final String ASCENDING = "ASC";
     public static final String DESCENDING = "DESC";
 
     /**
-     * the number of the sort option as given in the config file
+     * the number of the sort option as given in the configuration file
      */
     private int number;
 
@@ -77,7 +79,9 @@ public class SortOption {
             int idx = 1;
             String option;
 
-            while (((option = ConfigurationManager.getProperty("webui.itemlist.sort-option." + idx))) != null) {
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            while (((option = configurationService.getProperty("webui.itemlist.sort-option." + idx))) != null) {
                 SortOption so = new SortOption(idx, option);
                 newSortOptionsSet.add(so);
                 idx++;
diff --git a/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java b/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
index 9010edacf3..4197fc74af 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
@@ -34,11 +34,12 @@ import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.statistics.Dataset;
 import org.dspace.statistics.ObjectCount;
 import org.dspace.statistics.SolrLoggerServiceImpl;
@@ -78,6 +79,8 @@ public class StatisticsDataVisits extends StatisticsData {
     protected final ItemService itemService = ContentServiceFactory.getInstance().getItemService();
     protected final CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
     protected final CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
+    protected final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Construct a completely uninitialized query.
@@ -296,7 +299,7 @@ public class StatisticsDataVisits extends StatisticsData {
                 ObjectCount[] topCounts2 = queryFacetField(secondDataSet, secondDataSet.getQueries().get(0).getQuery(),
                                                            filterQuery, facetMinCount);
                 // Now that have results for both of them lets do x.y queries
-                List<String> facetQueries = new ArrayList<String>();
+                List<String> facetQueries = new ArrayList<>();
                 for (ObjectCount count2 : topCounts2) {
                     String facetQuery = secondDataSet.getFacetField() + ":" + ClientUtils
                         .escapeQueryChars(count2.getValue());
@@ -604,7 +607,7 @@ public class StatisticsDataVisits extends StatisticsData {
 
     protected Map<String, String> getAttributes(String value,
                                                 DatasetQuery datasetQuery, Context context) throws SQLException {
-        HashMap<String, String> attrs = new HashMap<String, String>();
+        HashMap<String, String> attrs = new HashMap<>();
         Query query = datasetQuery.getQueries().get(0);
         //TODO: CHANGE & THROW AWAY THIS ENTIRE METHOD
         //Check if int
@@ -652,7 +655,7 @@ public class StatisticsDataVisits extends StatisticsData {
                     }
 
 
-                    String url = ConfigurationManager.getProperty("dspace.ui.url") + "/bitstream/" + identifier + "/";
+                    String url = configurationService.getProperty("dspace.ui.url") + "/bitstream/" + identifier + "/";
 
                     // If we can put the pretty name of the bitstream on the end of the URL
                     try {
@@ -718,10 +721,10 @@ public class StatisticsDataVisits extends StatisticsData {
         private String name;
         private int max;
         private String facetField;
-        private List<Query> queries;
+        private final List<Query> queries;
 
         public DatasetQuery() {
-            queries = new ArrayList<Query>();
+            queries = new ArrayList<>();
         }
 
         public int getMax() {
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/DnsLookup.java b/dspace-api/src/main/java/org/dspace/statistics/util/DnsLookup.java
index 90444be936..e8594a2b54 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/DnsLookup.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/DnsLookup.java
@@ -9,7 +9,8 @@ package org.dspace.statistics.util;
 
 import java.io.IOException;
 
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.xbill.DNS.DClass;
 import org.xbill.DNS.ExtendedResolver;
 import org.xbill.DNS.Message;
@@ -21,7 +22,7 @@ import org.xbill.DNS.Section;
 import org.xbill.DNS.Type;
 
 /**
- * XBill DNS resolver to retrieve hostnames for client IP addresses.
+ * XBill DNS resolver to retrieve host names for client IP addresses.
  * TODO: deal with IPv6 addresses.
  *
  * @author kevinvandevelde at atmire.com
@@ -42,10 +43,12 @@ public class DnsLookup {
      * @throws IOException from infrastructure.
      */
     public static String reverseDns(String hostIp) throws IOException {
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
         Resolver res = new ExtendedResolver();
 
         // set the timeout, defaults to 200 milliseconds
-        int timeout = ConfigurationManager.getIntProperty("usage-statistics", "resolver.timeout", 200);
+        int timeout = configurationService.getIntProperty("usage-statistics.resolver.timeout", 200);
         res.setTimeout(0, timeout);
 
         Name name = ReverseMap.fromAddress(hostIp);
@@ -72,9 +75,10 @@ public class DnsLookup {
      */
     public static String forward(String hostname)
         throws IOException {
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
         Resolver res = new ExtendedResolver();
-        int timeout = ConfigurationManager.getIntProperty("usage-statistics",
-                                                          "resolver.timeout", 200);
+        int timeout = configurationService.getIntProperty("usage-statistics.resolver.timeout", 200);
         res.setTimeout(0, timeout);
 
         Name name = Name.fromString(hostname, Name.root);
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java b/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java
index ea82eca883..a9df091ab4 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsImporter.java
@@ -15,8 +15,10 @@ import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.InetAddress;
+import java.sql.SQLException;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -27,6 +29,7 @@ import java.util.Random;
 import java.util.UUID;
 
 import com.maxmind.geoip2.DatabaseReader;
+import com.maxmind.geoip2.exception.GeoIp2Exception;
 import com.maxmind.geoip2.model.CityResponse;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -34,6 +37,7 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.PosixParser;
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -49,10 +53,11 @@ import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.DSpaceObjectLegacySupportService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.statistics.SolrLoggerServiceImpl;
 import org.dspace.statistics.factory.StatisticsServiceFactory;
 import org.dspace.statistics.service.SolrLoggerService;
@@ -64,7 +69,7 @@ import org.dspace.statistics.service.SolrLoggerService;
  * @see ClassicDSpaceLogConverter
  */
 public class StatisticsImporter {
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(StatisticsImporter.class);
+    private static final Logger log = LogManager.getLogger(StatisticsImporter.class);
 
     /**
      * Date format (for solr)
@@ -75,7 +80,11 @@ public class StatisticsImporter {
             return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
         }
     };
-    protected final SolrLoggerService solrLoggerService = StatisticsServiceFactory.getInstance().getSolrLoggerService();
+
+    protected final SolrLoggerService solrLoggerService
+            = StatisticsServiceFactory.getInstance().getSolrLoggerService();
+    protected static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Solr server connection
@@ -176,7 +185,7 @@ public class StatisticsImporter {
                 }
                 System.out.println("Found " + localBitstreams.size());
 
-            } catch (Exception e) {
+            } catch (SQLException e) {
                 System.err.println("Error retrieving items from DSpace database:");
                 e.printStackTrace();
                 System.exit(1);
@@ -256,7 +265,7 @@ public class StatisticsImporter {
                         try {
                             dns = DnsLookup.reverseDns(ip);
                             dnsCache.put(ip, dns);
-                        } catch (Exception e) {
+                        } catch (IOException e) {
                             dns = "";
                         }
                     }
@@ -297,7 +306,7 @@ public class StatisticsImporter {
                         }
                         continue;
                     }
-                } catch (Exception e) {
+                } catch (GeoIp2Exception | IOException e) {
                     // No problem - just can't look them up
                 }
 
@@ -370,7 +379,7 @@ public class StatisticsImporter {
 
         } catch (RuntimeException re) {
             throw re;
-        } catch (Exception e) {
+        } catch (IOException | SQLException | ParseException | SolrServerException e) {
             System.err.println(e.getMessage());
             log.error(e.getMessage(), e);
         }
@@ -464,13 +473,13 @@ public class StatisticsImporter {
         boolean verbose = line.hasOption('v');
 
         // Find our solr server
-        String sserver = ConfigurationManager.getProperty("solr-statistics", "server");
+        String sserver = configurationService.getProperty("solr-statistics", "server");
         if (verbose) {
             System.out.println("Writing to solr server at: " + sserver);
         }
         solr = new HttpSolrClient.Builder(sserver).build();
 
-        String dbPath = ConfigurationManager.getProperty("usage-statistics", "dbfile");
+        String dbPath = configurationService.getProperty("usage-statistics", "dbfile");
         try {
             File dbFile = new File(dbPath);
             geoipLookup = new DatabaseReader.Builder(dbFile).build();
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
index 29f17bc442..d4c679330d 100644
--- a/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
@@ -12,6 +12,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
+import com.amazonaws.AmazonClientException;
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Region;
@@ -27,10 +28,12 @@ import com.amazonaws.services.s3.model.S3Object;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Bitstream;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Utils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.beans.factory.annotation.Required;
 
 /**
@@ -45,7 +48,7 @@ public class S3BitStoreService implements BitStoreService {
     /**
      * log4j log
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(S3BitStoreService.class);
+    private static final Logger log = LogManager.getLogger(S3BitStoreService.class);
 
     /**
      * Checksum algorithm
@@ -71,6 +74,8 @@ public class S3BitStoreService implements BitStoreService {
      */
     private AmazonS3 s3Service = null;
 
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
     public S3BitStoreService() {
     }
 
@@ -81,6 +86,7 @@ public class S3BitStoreService implements BitStoreService {
      * - secret key
      * - bucket name
      */
+    @Override
     public void init() throws IOException {
         if (StringUtils.isBlank(getAwsAccessKey()) || StringUtils.isBlank(getAwsSecretKey())) {
             log.warn("Empty S3 access or secret");
@@ -93,7 +99,7 @@ public class S3BitStoreService implements BitStoreService {
         // bucket name
         if (StringUtils.isEmpty(bucketName)) {
             // get hostname of DSpace UI to use to name bucket
-            String hostname = Utils.getHostName(ConfigurationManager.getProperty("dspace.ui.url"));
+            String hostname = Utils.getHostName(configurationService.getProperty("dspace.ui.url"));
             bucketName = "dspace-asset-" + hostname;
             log.warn("S3 BucketName is not configured, setting default: " + bucketName);
         }
@@ -103,7 +109,7 @@ public class S3BitStoreService implements BitStoreService {
                 s3Service.createBucket(bucketName);
                 log.info("Creating new S3 Bucket: " + bucketName);
             }
-        } catch (Exception e) {
+        } catch (AmazonClientException e) {
             log.error(e);
             throw new IOException(e);
         }
@@ -129,6 +135,7 @@ public class S3BitStoreService implements BitStoreService {
      *
      * @return a unique ID
      */
+    @Override
     public String generateId() {
         return Utils.generateKey();
     }
@@ -141,12 +148,13 @@ public class S3BitStoreService implements BitStoreService {
      * @return The stream of bits, or null
      * @throws java.io.IOException If a problem occurs while retrieving the bits
      */
+    @Override
     public InputStream get(Bitstream bitstream) throws IOException {
         String key = getFullKey(bitstream.getInternalId());
         try {
             S3Object object = s3Service.getObject(new GetObjectRequest(bucketName, key));
             return (object != null) ? object.getObjectContent() : null;
-        } catch (Exception e) {
+        } catch (AmazonClientException e) {
             log.error("get(" + key + ")", e);
             throw new IOException(e);
         }
@@ -163,6 +171,7 @@ public class S3BitStoreService implements BitStoreService {
      * @param in The stream of bits to store
      * @throws java.io.IOException If a problem occurs while storing the bits
      */
+    @Override
     public void put(Bitstream bitstream, InputStream in) throws IOException {
         String key = getFullKey(bitstream.getInternalId());
         //Copy istream to temp file, and send the file, with some metadata
@@ -180,7 +189,7 @@ public class S3BitStoreService implements BitStoreService {
 
             scratchFile.delete();
 
-        } catch (Exception e) {
+        } catch (AmazonClientException | IOException e) {
             log.error("put(" + bitstream.getInternalId() + ", is)", e);
             throw new IOException(e);
         } finally {
@@ -203,6 +212,7 @@ public class S3BitStoreService implements BitStoreService {
      * If file not found, then return null
      * @throws java.io.IOException If a problem occurs while obtaining metadata
      */
+    @Override
     public Map about(Bitstream bitstream, Map attrs) throws IOException {
         String key = getFullKey(bitstream.getInternalId());
         try {
@@ -225,7 +235,7 @@ public class S3BitStoreService implements BitStoreService {
             if (e.getStatusCode() == HttpStatus.SC_NOT_FOUND) {
                 return null;
             }
-        } catch (Exception e) {
+        } catch (AmazonClientException e) {
             log.error("about(" + key + ", attrs)", e);
             throw new IOException(e);
         }
@@ -238,11 +248,12 @@ public class S3BitStoreService implements BitStoreService {
      * @param bitstream The asset to delete
      * @throws java.io.IOException If a problem occurs while removing the asset
      */
+    @Override
     public void remove(Bitstream bitstream) throws IOException {
         String key = getFullKey(bitstream.getInternalId());
         try {
             s3Service.deleteObject(bucketName, key);
-        } catch (Exception e) {
+        } catch (AmazonClientException e) {
             log.error("remove(" + key + ")", e);
             throw new IOException(e);
         }
@@ -345,7 +356,7 @@ public class S3BitStoreService implements BitStoreService {
         store.s3Service.setRegion(usEast1);
 
         // get hostname of DSpace UI to use to name bucket
-        String hostname = Utils.getHostName(ConfigurationManager.getProperty("dspace.ui.url"));
+        String hostname = Utils.getHostName(configurationService.getProperty("dspace.ui.url"));
         //Bucketname should be lowercase
         store.bucketName = "dspace-asset-" + hostname + ".s3test";
         store.s3Service.createBucket(store.bucketName);
diff --git a/dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionLookupUtils.java b/dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionLookupUtils.java
index d537b0a5aa..148ebf4c55 100644
--- a/dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionLookupUtils.java
+++ b/dspace-api/src/main/java/org/dspace/submit/lookup/SubmissionLookupUtils.java
@@ -8,12 +8,14 @@
 package org.dspace.submit.lookup;
 
 import java.io.File;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
 import gr.ekt.bte.core.Record;
 import gr.ekt.bte.core.Value;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataSchema;
@@ -21,8 +23,9 @@ import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.MetadataSchemaService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * @author Andrea Bollini
@@ -31,17 +34,19 @@ import org.dspace.core.Context;
  * @author Panagiotis Koutsourakis
  */
 public class SubmissionLookupUtils {
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(SubmissionLookupUtils.class);
+    private static final Logger log = LogManager.getLogger(SubmissionLookupUtils.class);
 
     /**
      * Default constructor
      */
     private SubmissionLookupUtils() { }
 
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
     /**
      * Location of config file
      */
-    private static final String configFilePath = ConfigurationManager
+    private static final String configFilePath = configurationService
         .getProperty("dspace.dir")
         + File.separator
         + "config"
@@ -69,7 +74,7 @@ public class SubmissionLookupUtils {
                     SubmissionLookupService.SL_NAMESPACE_PREFIX)) {
                     List<MetadataValue> slCache = itemService.getMetadata(item, schema.getName(),
                                                                           dcElement, dcQualifier, Item.ANY);
-                    if (slCache.size() == 0) {
+                    if (slCache.isEmpty()) {
                         continue;
                     }
 
@@ -95,7 +100,7 @@ public class SubmissionLookupUtils {
                 }
             }
             return check;
-        } catch (Exception e) {
+        } catch (SQLException e) {
             log.error(e.getMessage(), e);
             throw new RuntimeException(e.getMessage(), e);
         }
@@ -121,7 +126,7 @@ public class SubmissionLookupUtils {
     }
 
     public static List<String> getValues(Record rec, String field) {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         List<Value> values = rec.getValues(field);
         if (values != null && values.size() > 0) {
             for (Value value : values) {
@@ -137,10 +142,10 @@ public class SubmissionLookupUtils {
         result.append("\nPublication {\n");
 
         for (String field : record.getFields()) {
-            result.append("--" + field + ":\n");
+            result.append("--").append(field).append(":\n");
             List<Value> values = record.getValues(field);
             for (Value value : values) {
-                result.append("\t" + value.getAsString() + "\n");
+                result.append("\t").append(value.getAsString()).append("\n");
             }
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/util/SolrImportExport.java b/dspace-api/src/main/java/org/dspace/util/SolrImportExport.java
index 6f35de1165..5e75679b28 100644
--- a/dspace-api/src/main/java/org/dspace/util/SolrImportExport.java
+++ b/dspace-api/src/main/java/org/dspace/util/SolrImportExport.java
@@ -28,6 +28,7 @@ import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -43,7 +44,8 @@ import org.apache.solr.client.solrj.response.RangeFacet;
 import org.apache.solr.common.luke.FieldFlag;
 import org.apache.solr.common.params.CoreAdminParams;
 import org.apache.solr.common.params.FacetParams;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * Utility class to export, clear and import Solr indexes.
@@ -95,7 +97,9 @@ public class SolrImportExport {
 
     private static final String MULTIPLE_VALUES_SPLITTER = ",";
 
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SolrImportExport.class);
+    private static final Logger log = LogManager.getLogger(SolrImportExport.class);
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Default constructor
@@ -248,8 +252,8 @@ public class SolrImportExport {
         //The configuration details for the statistics shards reside within the "statistics" folder
         String instanceIndexName = indexName.startsWith("statistics-") ? "statistics" : indexName;
 
-        String solrInstanceDir = ConfigurationManager
-            .getProperty("dspace.dir") + File.separator + "solr" + File.separator + instanceIndexName;
+        String solrInstanceDir = configurationService.getProperty("dspace.dir")
+                + File.separator + "solr" + File.separator + instanceIndexName;
         // the [dspace]/solr/[indexName]/conf directory needs to be available on the local machine for this to work
         // -- we need access to the schema.xml and solrconfig.xml file, plus files referenced from there
         // if this directory can't be found, output an error message and skip this index
@@ -294,7 +298,7 @@ public class SolrImportExport {
             }
 
             // Create a temp directory to store temporary core data
-            File tempDataDir = new File(ConfigurationManager.getProperty(
+            File tempDataDir = new File(configurationService.getProperty(
                 "dspace.dir") + File.separator + "temp" + File.separator + "solr-data");
             boolean createdTempDataDir = tempDataDir.mkdirs();
             if (!createdTempDataDir && !tempDataDir.exists()) {
@@ -334,7 +338,7 @@ public class SolrImportExport {
 
                 // clear actual core (temp core name, clearing actual data dir) & import
                 importIndex(indexName, exportDir, tempSolrUrl, true);
-            } catch (Exception e) {
+            } catch (IOException | SolrServerException | SolrImportExportException e) {
                 // we ran into some problems with the export/import -- keep going to try and restore the solr cores
                 System.err.println(
                     "Encountered problem during reindex: " + e.getMessage() + ", will attempt to restore Solr cores");
@@ -406,7 +410,6 @@ public class SolrImportExport {
      *                  and ends with .csv (to match what is generated by #makeExportFilename).
      * @param solrUrl   The solr URL for the index to export. Must not be null.
      * @param clear     if true, clear the index before importing.
-     * @param overwrite if true, skip _version_ field on import to disable Solr's optimistic concurrency functionality
      * @throws IOException               if there is a problem reading the files or communicating with Solr.
      * @throws SolrServerException       if there is a problem reading the files or communicating with Solr.
      * @throws SolrImportExportException if there is a problem communicating with Solr.
@@ -659,7 +662,8 @@ public class SolrImportExport {
         if (StringUtils.isNotBlank(directoryValue)) {
             return directoryValue;
         }
-        return ConfigurationManager.getProperty("dspace.dir") + File.separator + "solr-export" + File.separator;
+        return configurationService.getProperty("dspace.dir")
+                + File.separator + "solr-export" + File.separator;
     }
 
     /**
@@ -695,10 +699,10 @@ public class SolrImportExport {
     private static String makeSolrUrl(String indexName) {
         if (indexName.startsWith("statistics")) {
             // TODO account for year shards properly?
-            return ConfigurationManager.getProperty("solr-statistics", "server") + indexName
+            return configurationService.getProperty("solr-statistics.server") + indexName
                 .replaceFirst("statistics", "");
         } else if ("authority".equals(indexName)) {
-            return ConfigurationManager.getProperty("solr.authority.server");
+            return configurationService.getProperty("solr.authority.server");
         }
         return "http://localhost:8080/solr/" + indexName; // TODO better default?
     }
diff --git a/dspace-api/src/main/java/org/dspace/vocabulary/ControlledVocabulary.java b/dspace-api/src/main/java/org/dspace/vocabulary/ControlledVocabulary.java
index 314467ffcb..ee1b0445bb 100644
--- a/dspace-api/src/main/java/org/dspace/vocabulary/ControlledVocabulary.java
+++ b/dspace-api/src/main/java/org/dspace/vocabulary/ControlledVocabulary.java
@@ -17,7 +17,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
 import org.apache.xpath.XPathAPI;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -57,8 +58,12 @@ public class ControlledVocabulary {
     public static ControlledVocabulary loadVocabulary(String fileName)
         throws IOException, SAXException, ParserConfigurationException, TransformerException {
         StringBuilder filePath = new StringBuilder();
-        filePath.append(ConfigurationManager.getProperty("dspace.dir")).append(File.separatorChar).append("config")
-                .append(File.separatorChar).append("controlled-vocabularies").append(File.separator).append(fileName)
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        filePath.append(configurationService.getProperty("dspace.dir"))
+                .append(File.separatorChar).append("config")
+                .append(File.separatorChar).append("controlled-vocabularies")
+                .append(File.separator).append(fileName)
                 .append(".xml");
 
         File controlledVocFile = new File(filePath.toString());
@@ -99,7 +104,7 @@ public class ControlledVocabulary {
         }
         NodeList subNodes = XPathAPI.selectNodeList(node, "isComposedBy/node");
 
-        List<ControlledVocabulary> subVocabularies = new ArrayList<ControlledVocabulary>(subNodes.getLength());
+        List<ControlledVocabulary> subVocabularies = new ArrayList<>(subNodes.getLength());
         for (int i = 0; i < subNodes.getLength(); i++) {
             subVocabularies.add(loadVocabularyNode(subNodes.item(i), value));
         }
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowUtils.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowUtils.java
index 7edafe7efe..03cd105ca4 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowUtils.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowUtils.java
@@ -15,20 +15,23 @@ import java.util.Date;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.util.Util;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
 import org.dspace.core.I18nUtil;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.GroupService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.xmlworkflow.factory.XmlWorkflowFactory;
 import org.dspace.xmlworkflow.factory.XmlWorkflowServiceFactory;
 import org.dspace.xmlworkflow.state.Workflow;
@@ -47,13 +50,15 @@ public class WorkflowUtils extends Util {
     /**
      * log4j category
      */
-    public static Logger log = org.apache.logging.log4j.LogManager.getLogger(WorkflowUtils.class);
+    public static Logger log = LogManager.getLogger(WorkflowUtils.class);
 
     protected static final CollectionRoleService collectionRoleService =
         XmlWorkflowServiceFactory.getInstance().getCollectionRoleService();
     protected static final GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
     protected static final XmlWorkflowFactory xmlWorkflowFactory = XmlWorkflowServiceFactory.getInstance()
                                                                                             .getWorkflowFactory();
+    protected static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Default constructor
@@ -153,15 +158,13 @@ public class WorkflowUtils extends Util {
         Context c = (Context) request.getAttribute("dspace.context");
 
         try {
-            String recipient = ConfigurationManager
-                .getProperty("alert.recipient");
+            String recipient = configurationService.getProperty("alert.recipient");
 
             if (StringUtils.isNotBlank(recipient)) {
                 Email email = Email.getEmail(I18nUtil.getEmailFilename(c.getCurrentLocale(), "internal_error"));
 
                 email.addRecipient(recipient);
-                email.addArgument(ConfigurationManager
-                                      .getProperty("dspace.ui.url"));
+                email.addArgument(configurationService.getProperty("dspace.ui.url"));
                 email.addArgument(new Date());
                 email.addArgument(request.getSession().getId());
                 email.addArgument(logInfo);
@@ -181,7 +184,7 @@ public class WorkflowUtils extends Util {
                 email.addArgument(stackTrace);
                 email.send();
             }
-        } catch (Exception e) {
+        } catch (IOException | MessagingException e) {
             // Not much we can do here!
             log.warn("Unable to send email alert", e);
         }
@@ -239,7 +242,7 @@ public class WorkflowUtils extends Util {
     public static Map<String, Role> getCollectionRoles(Collection thisCollection)
         throws IOException, WorkflowConfigurationException, SQLException {
         Workflow workflow = xmlWorkflowFactory.getWorkflow(thisCollection);
-        LinkedHashMap<String, Role> result = new LinkedHashMap<String, Role>();
+        LinkedHashMap<String, Role> result = new LinkedHashMap<>();
         if (workflow != null) {
             //Make sure we find one
             Map<String, Role> allRoles = workflow.getRoles();
@@ -260,7 +263,7 @@ public class WorkflowUtils extends Util {
     public static Map<String, Role> getCollectionAndRepositoryRoles(Collection thisCollection)
         throws IOException, WorkflowConfigurationException, SQLException {
         Workflow workflow = xmlWorkflowFactory.getWorkflow(thisCollection);
-        LinkedHashMap<String, Role> result = new LinkedHashMap<String, Role>();
+        LinkedHashMap<String, Role> result = new LinkedHashMap<>();
         if (workflow != null) {
             //Make sure we find one
             Map<String, Role> allRoles = workflow.getRoles();
@@ -282,7 +285,7 @@ public class WorkflowUtils extends Util {
     public static Map<String, Role> getAllExternalRoles(Collection thisCollection)
         throws IOException, WorkflowConfigurationException, SQLException {
         Workflow workflow = xmlWorkflowFactory.getWorkflow(thisCollection);
-        LinkedHashMap<String, Role> result = new LinkedHashMap<String, Role>();
+        LinkedHashMap<String, Role> result = new LinkedHashMap<>();
         if (workflow != null) {
             //Make sure we find one
             Map<String, Role> allRoles = workflow.getRoles();
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
index 285a219cfc..e2ac626a6c 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
@@ -40,7 +40,6 @@ import org.dspace.content.service.BundleService;
 import org.dspace.content.service.InstallItemService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Email;
@@ -51,6 +50,7 @@ import org.dspace.eperson.Group;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.event.Event;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.usage.UsageWorkflowEvent;
 import org.dspace.workflow.WorkflowException;
@@ -88,7 +88,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
     /* support for 'no notification' */
     protected Map<UUID, Boolean> noEMail = new HashMap<>();
 
-    private Logger log = org.apache.logging.log4j.LogManager.getLogger(XmlWorkflowServiceImpl.class);
+    private final Logger log = org.apache.logging.log4j.LogManager.getLogger(XmlWorkflowServiceImpl.class);
 
     @Autowired(required = true)
     protected AuthorizeService authorizeService;
@@ -122,6 +122,8 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
     protected BitstreamFormatService bitstreamFormatService;
     @Autowired(required = true)
     protected BitstreamService bitstreamService;
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
 
     protected XmlWorkflowServiceImpl() {
 
@@ -137,7 +139,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
 
     @Override
     public List<String> getEPersonDeleteConstraints(Context context, EPerson ePerson) throws SQLException {
-        List<String> constraints = new ArrayList<String>();
+        List<String> constraints = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(claimedTaskService.findByEperson(context, ePerson))) {
             constraints.add("cwf_claimtask");
         }
@@ -237,7 +239,9 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
     /**
      * startWithoutNotify() starts the workflow normally, but disables
      * notifications (useful for large imports,) for the first workflow step -
-     * subsequent notifications happen normally
+     * subsequent notifications happen normally.
+     * @param context the current DSpace session.
+     * @param wsi the submitted Item entering workflow.
      */
     @Override
     public XmlWorkflowItem startWithoutNotify(Context context, WorkspaceItem wsi)
@@ -436,7 +440,8 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
                         return null;
                     }
                 }
-            } catch (Exception e) {
+            } catch (IOException | SQLException | AuthorizeException
+                    | WorkflowException | WorkflowConfigurationException e) {
                 log.error("error while processing workflow outcome", e);
                 e.printStackTrace();
             } finally {
@@ -463,8 +468,8 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
             Collection myCollection = wfi.getCollection();
             String workflowStepString = null;
 
-            List<EPerson> currentEpersonOwners = new ArrayList<EPerson>();
-            List<Group> currentGroupOwners = new ArrayList<Group>();
+            List<EPerson> currentEpersonOwners = new ArrayList<>();
+            List<Group> currentGroupOwners = new ArrayList<>();
             //These are only null if our item is sent back to the submission
             if (newStep != null && newActionConfig != null) {
                 workflowStepString = workflowId + "." + newStep.getId() + "." + newActionConfig.getId();
@@ -497,7 +502,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
             usageWorkflowEvent.setGroupOwners(currentGroupOwners.toArray(new Group[currentGroupOwners.size()]));
 
             DSpaceServicesFactory.getInstance().getEventService().fireEvent(usageWorkflowEvent);
-        } catch (Exception e) {
+        } catch (SQLException e) {
             //Catch all errors we do not want our workflow to crash because the logging threw an exception
             log.error(LogManager.getHeader(c, "Error while logging workflow event", "Workflow Item: " + wfi.getID()),
                       e);
@@ -736,11 +741,12 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
         grantUserAllItemPolicies(context, wi.getItem(), e, ResourcePolicy.TYPE_WORKFLOW);
     }
 
+    @Override
     public void grantUserAllItemPolicies(Context context, Item item, EPerson epa, String policyType)
         throws AuthorizeException, SQLException {
         if (epa != null) {
             //A list of policies the user has for this item
-            List<Integer> userHasPolicies = new ArrayList<Integer>();
+            List<Integer> userHasPolicies = new ArrayList<>();
             List<ResourcePolicy> itempols = authorizeService.getPolicies(context, item);
             for (ResourcePolicy resourcePolicy : itempols) {
                 if (epa.equals(resourcePolicy.getEPerson())) {
@@ -772,7 +778,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
         throws AuthorizeException, SQLException {
         if (group != null) {
             //A list of policies the user has for this item
-            List<Integer> groupHasPolicies = new ArrayList<Integer>();
+            List<Integer> groupHasPolicies = new ArrayList<>();
             List<ResourcePolicy> itempols = authorizeService.getPolicies(context, item);
             for (ResourcePolicy resourcePolicy : itempols) {
                 if (group.equals(resourcePolicy.getGroup())) {
@@ -829,6 +835,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
         }
     }
 
+    @Override
     public void removeUserItemPolicies(Context context, Item item, EPerson e) throws SQLException, AuthorizeException {
         if (e != null && item.getSubmitter() != null) {
             //Also remove any lingering authorizations from this user
@@ -1088,13 +1095,13 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
                 email.addArgument(coll.getName());
                 email.addArgument(rejector);
                 email.addArgument(reason);
-                email.addArgument(ConfigurationManager.getProperty("dspace.ui.url") + "/mydspace");
+                email.addArgument(configurationService.getProperty("dspace.ui.url") + "/mydspace");
 
                 email.send();
             } else {
                 // DO nothing
             }
-        } catch (Exception ex) {
+        } catch (IOException | MessagingException ex) {
             // log this email error
             log.warn(LogManager.getHeader(c, "notify_of_reject",
                     "cannot email user" + " eperson_id" + e.getID()
@@ -1105,7 +1112,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
 
     @Override
     public String getMyDSpaceLink() {
-        return ConfigurationManager.getProperty("dspace.ui.url") + "/mydspace";
+        return configurationService.getProperty("dspace.ui.url") + "/mydspace";
     }
 
     protected void revokeReviewerPolicies(Context context, Item item) throws SQLException, AuthorizeException {
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/ClaimAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/ClaimAction.java
index 36b2aaeee5..744bf69136 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/ClaimAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/ClaimAction.java
@@ -15,10 +15,11 @@ import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletRequest;
 
 import org.dspace.authorize.AuthorizeException;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.eperson.EPerson;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.xmlworkflow.Role;
 import org.dspace.xmlworkflow.RoleMembers;
 import org.dspace.xmlworkflow.WorkflowConfigurationException;
@@ -38,6 +39,8 @@ import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
  * @author Mark Diggory (markd at atmire dot com)
  */
 public class ClaimAction extends UserSelectionAction {
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     @Override
     public void activate(Context context, XmlWorkflowItem wfItem) throws SQLException, IOException, AuthorizeException {
@@ -105,7 +108,7 @@ public class ClaimAction extends UserSelectionAction {
             //Create task for the users left
             XmlWorkflowServiceFactory.getInstance().getXmlWorkflowService()
                                      .createPoolTasks(c, wfi, roleMembers, getParent().getStep(), getParent());
-            if (ConfigurationManager.getBooleanProperty("workflow", "notify.returned.tasks", true)) {
+            if (configurationService.getBooleanProperty("workflow.notify.returned.tasks", true)) {
                 alertUsersOnActivation(c, wfi, roleMembers);
             }
 
@@ -135,7 +138,7 @@ public class ClaimAction extends UserSelectionAction {
                 RoleMembers roleMembers = role.getMembers(context, wfi);
 
                 ArrayList<EPerson> epersons = roleMembers.getAllUniqueMembers(context);
-                return !(epersons.size() == 0 || step.getRequiredUsers() > epersons.size());
+                return !(epersons.isEmpty() || step.getRequiredUsers() > epersons.size());
             } else {
                 // We don't have a role and do have a UI so throw a workflow exception
                 throw new WorkflowConfigurationException(
diff --git a/dspace-api/src/test/java/org/dspace/content/SiteTest.java b/dspace-api/src/test/java/org/dspace/content/SiteTest.java
index 8cc57410f1..3d3e04feee 100644
--- a/dspace-api/src/test/java/org/dspace/content/SiteTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/SiteTest.java
@@ -17,13 +17,15 @@ import java.sql.SQLException;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractUnitTest;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.SiteService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.eperson.Group;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,14 +40,17 @@ public class SiteTest extends AbstractUnitTest {
     /**
      * log4j category
      */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SiteTest.class);
+    private static final Logger log = LogManager.getLogger(SiteTest.class);
 
     /**
      * Site instance for the tests
      */
     private Site s;
 
-    private SiteService siteService = ContentServiceFactory.getInstance().getSiteService();
+    private final SiteService siteService
+            = ContentServiceFactory.getInstance().getSiteService();
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * This method will be run before every test as per @Before. It will
@@ -105,8 +110,8 @@ public class SiteTest extends AbstractUnitTest {
      */
     @Test
     public void testGetHandle() {
-        assertThat("testGetHandle 0", s.getHandle(), equalTo(ConfigurationManager.getProperty("handle.prefix")
-                                                                 + "/0"));
+        assertThat("testGetHandle 0", s.getHandle(),
+                equalTo(configurationService.getProperty("handle.prefix") + "/0"));
     }
 
     /**
@@ -114,12 +119,13 @@ public class SiteTest extends AbstractUnitTest {
      */
     @Test
     public void testGetSiteHandle() {
-        assertThat("testGetSiteHandle 0", s.getHandle(), equalTo(ConfigurationManager.getProperty("handle.prefix")
-                                                                     + "/0"));
+        assertThat("testGetSiteHandle 0", s.getHandle(),
+                equalTo(configurationService.getProperty("handle.prefix") + "/0"));
     }
 
     /**
      * Test of find method, of class Site.
+     * @throws java.lang.Exception passed through.
      */
     @Test
     public void testSiteFind() throws Exception {
@@ -133,17 +139,19 @@ public class SiteTest extends AbstractUnitTest {
      */
     @Test
     public void testGetName() {
-        assertThat("testGetName 0", s.getName(), equalTo(ConfigurationManager.getProperty("dspace.name")));
-        assertThat("testGetName 1", siteService.getName(s), equalTo(ConfigurationManager.getProperty("dspace.name")));
+        assertThat("testGetName 0", s.getName(),
+                equalTo(configurationService.getProperty("dspace.name")));
+        assertThat("testGetName 1", siteService.getName(s),
+                equalTo(configurationService.getProperty("dspace.name")));
     }
 
-
     /**
      * Test of getURL method, of class Site.
      */
     @Test
     public void testGetURL() {
-        assertThat("testGetURL 0", s.getURL(), equalTo(ConfigurationManager.getProperty("dspace.ui.url")));
+        assertThat("testGetURL 0", s.getURL(),
+                equalTo(configurationService.getProperty("dspace.ui.url")));
     }
 
     @Test
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceItem.java b/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceItem.java
index 267449be07..d1f78ee671 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceItem.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/data/DSpaceItem.java
@@ -18,7 +18,8 @@ import com.lyncode.xoai.dataprovider.data.About;
 import com.lyncode.xoai.dataprovider.data.Item;
 import com.lyncode.xoai.dataprovider.xml.xoai.Element;
 import com.lyncode.xoai.dataprovider.xml.xoai.Element.Field;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * @author Lyncode Development Team (dspace at lyncode dot com)
@@ -29,7 +30,7 @@ public abstract class DSpaceItem implements Item {
     }
 
     private static List<Element> flat(List<Element> input) {
-        List<Element> elems = new ArrayList<Element>();
+        List<Element> elems = new ArrayList<>();
         for (Element e : input) {
             if (e.getElement() != null) {
                 elems.addAll(e.getElement());
@@ -39,7 +40,7 @@ public abstract class DSpaceItem implements Item {
     }
 
     private static List<String> values(List<Element> input) {
-        List<String> elems = new ArrayList<String>();
+        List<String> elems = new ArrayList<>();
         for (Element e : input) {
             if (e.getElement() != null && !e.getElement().isEmpty() && e.getElement().get(0).getField() != null) {
                 for (Field f : e.getElement().get(0).getField()) {
@@ -68,8 +69,9 @@ public abstract class DSpaceItem implements Item {
 
     public static String buildIdentifier(String handle) {
         if (_prefix == null) {
-            _prefix = ConfigurationManager.getProperty("oai",
-                                                       "identifier.prefix");
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            _prefix = configurationService.getProperty("oai.identifier.prefix");
         }
         return "oai:" + _prefix + ":" + handle;
     }
@@ -90,13 +92,13 @@ public abstract class DSpaceItem implements Item {
         } else if (parts.length == 3) {
             return this.getMetadata(parts[0], parts[1], parts[2]);
         } else {
-            return new ArrayList<String>();
+            return new ArrayList<>();
         }
     }
 
     @Override
     public List<About> getAbout() {
-        return new ArrayList<About>();
+        return new ArrayList<>();
     }
 
     protected abstract String getHandle();
@@ -107,7 +109,7 @@ public abstract class DSpaceItem implements Item {
     }
 
     private static class MetadataNamePredicate implements Predicate<Element> {
-        private String name;
+        private final String name;
 
         public MetadataNamePredicate(String n) {
             name = n;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/cache/DSpaceXOAICacheService.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/cache/DSpaceXOAICacheService.java
index 5072895387..9acd09e1f9 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/cache/DSpaceXOAICacheService.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/cache/DSpaceXOAICacheService.java
@@ -27,9 +27,8 @@ import com.lyncode.xoai.dataprovider.xml.XmlOutputContext;
 import com.lyncode.xoai.dataprovider.xml.oaipmh.OAIPMH;
 import com.lyncode.xoai.util.Base64Utils;
 import org.apache.commons.io.FileUtils;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
 import org.dspace.xoai.services.api.cache.XOAICacheService;
-import org.dspace.xoai.services.api.config.ConfigurationService;
 import org.dspace.xoai.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -39,9 +38,12 @@ public class DSpaceXOAICacheService implements XOAICacheService {
     private static String baseDir;
     private static String staticHead;
 
-    private static String getBaseDir() {
+    @Autowired
+    ConfigurationService configurationService;
+
+    private String getBaseDir() {
         if (baseDir == null) {
-            String dir = ConfigurationManager.getProperty("oai", "cache.dir") + REQUEST_DIR;
+            String dir = configurationService.getProperty("oai.cache.dir") + REQUEST_DIR;
             baseDir = dir;
         }
         return baseDir;
@@ -61,10 +63,7 @@ public class DSpaceXOAICacheService implements XOAICacheService {
         return staticHead + "<responseDate>" + DateUtils.format(date) + "</responseDate>";
     }
 
-    @Autowired
-    ConfigurationService configurationService;
-
-    private XOAIManager manager;
+    private final XOAIManager manager;
 
     public DSpaceXOAICacheService(XOAIManager manager) {
         this.manager = manager;
@@ -82,7 +81,7 @@ public class DSpaceXOAICacheService implements XOAICacheService {
 
     @Override
     public boolean isActive() {
-        return configurationService.getBooleanProperty("oai", "cache", true);
+        return configurationService.getBooleanProperty("oai.cache", true);
     }
 
     @Override
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/cache/DSpaceXOAILastCompilationCacheService.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/cache/DSpaceXOAILastCompilationCacheService.java
index 5ddacae4b7..3c881856f0 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/cache/DSpaceXOAILastCompilationCacheService.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/cache/DSpaceXOAILastCompilationCacheService.java
@@ -15,8 +15,9 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import org.apache.commons.io.FileUtils;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
 import org.dspace.xoai.services.api.cache.XOAILastCompilationCacheService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 public class DSpaceXOAILastCompilationCacheService implements XOAILastCompilationCacheService {
@@ -31,9 +32,12 @@ public class DSpaceXOAILastCompilationCacheService implements XOAILastCompilatio
 
     private static File file = null;
 
-    private static File getFile() {
+    @Autowired(required = true)
+    ConfigurationService configurationService;
+
+    private File getFile() {
         if (file == null) {
-            String dir = ConfigurationManager.getProperty("oai", "cache.dir") + DATEFILE;
+            String dir = configurationService.getProperty("oai.cache.dir") + DATEFILE;
             file = new File(dir);
         }
         return file;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java
index d668261a3c..26dd976495 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/resources/DSpaceResourceResolver.java
@@ -18,14 +18,20 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
 
 import com.lyncode.xoai.dataprovider.services.api.ResourceResolver;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 public class DSpaceResourceResolver implements ResourceResolver {
     private static final TransformerFactory transformerFactory = TransformerFactory
             .newInstance("net.sf.saxon.TransformerFactoryImpl", null);
 
-    private final String basePath = ConfigurationManager.getProperty("oai",
-                                                                     "config.dir");
+    private final String basePath;
+
+    public DSpaceResourceResolver() {
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        basePath = configurationService.getProperty("oai.config.dir");
+    }
 
     @Override
     public InputStream getResource(String path) throws IOException {
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/solr/DSpaceSolrServer.java b/dspace-oai/src/main/java/org/dspace/xoai/solr/DSpaceSolrServer.java
index 99c071c6b9..158f73be1d 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/solr/DSpaceSolrServer.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/solr/DSpaceSolrServer.java
@@ -13,7 +13,8 @@ import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * @author Lyncode Development Team (dspace at lyncode dot com)
@@ -30,7 +31,9 @@ public class DSpaceSolrServer {
 
     public static SolrClient getServer() throws SolrServerException {
         if (_server == null) {
-            String serverUrl = ConfigurationManager.getProperty("oai.solr.url");
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String serverUrl = configurationService.getProperty("oai.solr.url");
             try {
                 _server = new HttpSolrClient.Builder(serverUrl).build();
                 log.debug("OAI Solr Server Initialized");
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java b/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
index c2369bce23..3ff3194850 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
@@ -31,10 +31,11 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.RelationshipService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Utils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.xoai.data.DSpaceItem;
 
 /**
@@ -56,6 +57,8 @@ public class ItemUtils {
     private static final BitstreamService bitstreamService
             = ContentServiceFactory.getInstance().getBitstreamService();
 
+    private static final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
     /**
      * Default constructor
      */
@@ -105,7 +108,7 @@ public class ItemUtils {
                 String url = "";
                 String bsName = bit.getName();
                 String sid = String.valueOf(bit.getSequenceID());
-                String baseUrl = ConfigurationManager.getProperty("oai", "bitstream.baseUrl");
+                String baseUrl = configurationService.getProperty("oai", "bitstream.baseUrl");
                 String handle = null;
                 // get handle of parent Item of this bitstream, if there
                 // is one:
@@ -284,9 +287,9 @@ public class ItemUtils {
 
         // Repository Info
         Element repository = create("repository");
-        repository.getField().add(createValue("url", ConfigurationManager.getProperty("dspace.ui.url")));
-        repository.getField().add(createValue("name", ConfigurationManager.getProperty("dspace.name")));
-        repository.getField().add(createValue("mail", ConfigurationManager.getProperty("mail.admin")));
+        repository.getField().add(createValue("url", configurationService.getProperty("dspace.ui.url")));
+        repository.getField().add(createValue("name", configurationService.getProperty("dspace.name")));
+        repository.getField().add(createValue("mail", configurationService.getProperty("mail.admin")));
         metadata.getElement().add(repository);
 
         // Licensing info
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
index f8158d9887..a1793c6776 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
@@ -71,10 +71,10 @@ import org.dspace.content.BitstreamFormat;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.DSpaceObjectService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.RequestService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.util.UUIDUtils;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -134,7 +134,7 @@ public class Utils {
     private ConfigurationService configurationService;
 
     /** Cache to support fast lookups of LinkRest method annotation information. */
-    private Map<Method, Optional<LinkRest>> linkAnnotationForMethod = new HashMap<>();
+    private final Map<Method, Optional<LinkRest>> linkAnnotationForMethod = new HashMap<>();
 
     public <T> Page<T> getPage(List<T> fullContents, @Nullable Pageable optionalPageable) {
         Pageable pageable = getPageable(optionalPageable);
@@ -149,7 +149,7 @@ public class Utils {
                 pageContent = fullContents.subList(Math.toIntExact(pageable.getOffset()),
                         Math.toIntExact(pageable.getOffset()) + pageable.getPageSize());
             }
-            return new PageImpl<T>(pageContent, pageable, total);
+            return new PageImpl<>(pageContent, pageable, total);
         }
     }
 
@@ -304,11 +304,12 @@ public class Utils {
     }
 
     /**
-     * Build the canonical representation of a metadata key in DSpace. ie
+     * Build the canonical representation of a metadata key in DSpace. I.e.
      * <schema>.<element>[.<qualifier>]
      *
      * @param schema
      * @param element
+     * @param qualifier
      * @return
      */
     public String getMetadataKey(String schema, String element, String qualifier) {
@@ -320,11 +321,11 @@ public class Utils {
      *
      * @param multipartFile
      *            the multipartFile representing the uploaded file. Please note that it is a complex object including
-     *            additional information other than the binary like the orginal file name and the mimetype
+     *            additional information other than the binary like the original file name and the MIME type
      * @param prefixTempName
      *            the prefix to use to generate the filename of the temporary file
      * @param suffixTempName
-     *            the suffic to use to generate the filename of the temporary file
+     *            the suffix to use to generate the filename of the temporary file
      * @return the temporary file on the server
      * @throws IOException
      * @throws FileNotFoundException
@@ -332,8 +333,10 @@ public class Utils {
     public static File getFile(MultipartFile multipartFile, String prefixTempName, String suffixTempName)
             throws IOException, FileNotFoundException {
         // TODO after change item-submission into
-        String tempDir = (ConfigurationManager.getProperty("upload.temp.dir") != null)
-                ? ConfigurationManager.getProperty("upload.temp.dir")
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        String tempDir = (configurationService.hasProperty("upload.temp.dir"))
+                ? configurationService.getProperty("upload.temp.dir")
                 : System.getProperty("java.io.tmpdir");
         File uploadDir = new File(tempDir);
         if (!uploadDir.exists()) {
@@ -349,7 +352,7 @@ public class Utils {
     }
 
     /**
-     * Return the filename part from a multipartFile upload that could eventually contains the fullpath on the client
+     * Return the filename part from a multipartFile upload that could eventually contains the full path on the client
 
      *
      * @param multipartFile
diff --git a/dspace-sword/src/main/java/org/dspace/sword/BitstreamEntryGenerator.java b/dspace-sword/src/main/java/org/dspace/sword/BitstreamEntryGenerator.java
index fe0962ca48..e1b35402ae 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/BitstreamEntryGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/BitstreamEntryGenerator.java
@@ -10,13 +10,15 @@ package org.dspace.sword;
 import java.sql.SQLException;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Bitstream;
 import org.dspace.content.BitstreamFormat;
 import org.dspace.content.Bundle;
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.atom.Content;
 import org.purl.sword.atom.ContentType;
 import org.purl.sword.atom.InvalidMediaTypeException;
@@ -33,7 +35,7 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
     /**
      * logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(BitstreamEntryGenerator.class);
+    private static final Logger log = LogManager.getLogger(BitstreamEntryGenerator.class);
 
     /**
      * Create a new ATOM Entry generator which can provide a SWORD Entry for
@@ -50,6 +52,7 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
      * Add all the subject classifications from the bibliographic
      * metadata.
      */
+    @Override
     protected void addCategories() {
         // do nothing
     }
@@ -57,6 +60,7 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
     /**
      * Set the content type that DSpace received.
      */
+    @Override
     protected void addContentElement()
         throws DSpaceSWORDException {
         try {
@@ -100,13 +104,16 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
      * they can be used to access the resource over http (i.e.
      * a real URL).
      */
+    @Override
     protected void addIdentifier()
         throws DSpaceSWORDException {
         // if this is a deposit which is no op we can't do anything here
         if (this.deposit != null && this.deposit.isNoOp()) {
             // just use the dspace url as the
             // property
-            String cfg = ConfigurationManager.getProperty("dspace.ui.url");
+            ConfigurationService configurationService
+                    = DSpaceServicesFactory.getInstance().getConfigurationService();
+            String cfg = configurationService.getProperty("dspace.ui.url");
             entry.setId(cfg);
 
             return;
@@ -119,7 +126,6 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
         String bsurl = urlManager.getBitstreamUrl(this.bitstream);
         entry.setId(bsurl);
         log.debug("Added identifier for bitstream with url=" + bsurl);
-        return;
 
         // FIXME: later on we will maybe have a workflow page supplied
         // by the sword interface?
@@ -128,6 +134,7 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add links associated with this item.
      */
+    @Override
     protected void addLinks()
         throws DSpaceSWORDException {
         // if this is a deposit which is no op we can't do anything here
@@ -163,14 +170,16 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add the date of publication from the bibliographic metadata
      */
+    @Override
     protected void addPublishDate() {
         // do nothing
     }
 
     /**
      * Add rights information.  This attaches an href to the URL
-     * of the item's licence file
+     * of the item's license file
      */
+    @Override
     protected void addRights()
         throws DSpaceSWORDException {
         try {
@@ -219,6 +228,7 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add the summary/abstract from the bibliographic metadata
      */
+    @Override
     protected void addSummary() {
         // do nothing
     }
@@ -226,6 +236,7 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add the title from the bibliographic metadata
      */
+    @Override
     protected void addTitle() {
         Title title = new Title();
         title.setContent(this.bitstream.getName());
@@ -237,6 +248,7 @@ public class BitstreamEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add the date that this item was last updated
      */
+    @Override
     protected void addLastUpdatedDate() {
         // do nothing
     }
diff --git a/dspace-sword/src/main/java/org/dspace/sword/CollectionCollectionGenerator.java b/dspace-sword/src/main/java/org/dspace/sword/CollectionCollectionGenerator.java
index 6c0927f016..fdb34395a1 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/CollectionCollectionGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CollectionCollectionGenerator.java
@@ -10,11 +10,13 @@ package org.dspace.sword;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.base.Collection;
 
 /**
@@ -25,12 +27,15 @@ public class CollectionCollectionGenerator extends ATOMCollectionGenerator {
     /**
      * logger
      */
-    private static Logger log =
-        org.apache.logging.log4j.LogManager.getLogger(CollectionCollectionGenerator.class);
+    private static final Logger log =
+        LogManager.getLogger(CollectionCollectionGenerator.class);
 
     protected CollectionService collectionService =
         ContentServiceFactory.getInstance().getCollectionService();
 
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     /**
      * Construct an object taking the SWORD service instance an argument
      *
@@ -48,6 +53,7 @@ public class CollectionCollectionGenerator extends ATOMCollectionGenerator {
      * @param dso target DSpace object
      * @throws DSpaceSWORDException can be thrown by the internals of the DSpace SWORD implementation
      */
+    @Override
     public Collection buildCollection(DSpaceObject dso)
         throws DSpaceSWORDException {
         if (!(dso instanceof org.dspace.content.Collection)) {
@@ -122,8 +128,8 @@ public class CollectionCollectionGenerator extends ATOMCollectionGenerator {
 
         // should we offer the items in the collection up as deposit
         // targets?
-        boolean itemService = ConfigurationManager
-            .getBooleanProperty("sword-server", "expose-items");
+        boolean itemService = configurationService
+            .getBooleanProperty("sword-server.expose-items");
         if (itemService) {
             String subService = urlManager.constructSubServiceUrl(col);
             scol.setService(subService);
diff --git a/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java b/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
index 98018ee811..3384a4d2bf 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
@@ -12,6 +12,7 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
@@ -25,8 +26,9 @@ import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.base.Deposit;
 import org.purl.sword.base.ErrorCodes;
 import org.purl.sword.base.SWORDErrorException;
@@ -40,7 +42,7 @@ public class CollectionDepositor extends Depositor {
     /**
      * logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(CollectionDepositor.class);
+    private static final Logger log = LogManager.getLogger(CollectionDepositor.class);
 
     protected ItemService itemService =
         ContentServiceFactory.getInstance().getItemService();
@@ -54,6 +56,8 @@ public class CollectionDepositor extends Depositor {
     protected BitstreamFormatService bitstreamFormatService =
         ContentServiceFactory.getInstance().getBitstreamFormatService();
 
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
     /**
      * The DSpace Collection we are depositing into
      */
@@ -90,6 +94,7 @@ public class CollectionDepositor extends Depositor {
      * @throws SWORDErrorException  on generic SWORD exception
      * @throws DSpaceSWORDException can be thrown by the internals of the DSpace SWORD implementation
      */
+    @Override
     public DepositResult doDeposit(Deposit deposit)
         throws SWORDErrorException, DSpaceSWORDException {
         // get the things out of the service that we need
@@ -145,7 +150,7 @@ public class CollectionDepositor extends Depositor {
                 // for a moment
                 context.turnOffAuthorisationSystem();
 
-                String bundleName = ConfigurationManager.getProperty(
+                String bundleName = configurationService.getProperty(
                     "sword-server", "bundle.name");
                 if (bundleName == null || "".equals(bundleName)) {
                     bundleName = "SWORD";
@@ -215,13 +220,14 @@ public class CollectionDepositor extends Depositor {
     /**
      * Reverse any changes which may have resulted as the consequence of a deposit.
      *
-     * This is inteded for use during no-op deposits, and should be called at the
+     * This is intended for use during no-op deposits, and should be called at the
      * end of such a deposit process in order to remove any temporary files and
      * to abort the database connection, so no changes are written.
      *
      * @param result deposit result to undo
      * @throws DSpaceSWORDException can be thrown by the internals of the DSpace SWORD implementation
      */
+    @Override
     public void undoDeposit(DepositResult result) throws DSpaceSWORDException {
         SWORDContext sc = swordService.getSwordContext();
 
diff --git a/dspace-sword/src/main/java/org/dspace/sword/CollectionLocation.java b/dspace-sword/src/main/java/org/dspace/sword/CollectionLocation.java
index 555ee1b97d..bd09ba7cd6 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/CollectionLocation.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CollectionLocation.java
@@ -11,13 +11,15 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.sql.SQLException;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
 import org.dspace.content.DSpaceObject;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 /**
  * This class provides a single point of contact for
@@ -30,10 +32,12 @@ public class CollectionLocation {
     /**
      * Log4j logger
      */
-    public static final Logger log = org.apache.logging.log4j.LogManager.getLogger(CollectionLocation.class);
+    public static final Logger log = LogManager.getLogger(CollectionLocation.class);
 
     protected HandleService handleService = HandleServiceFactory.getInstance()
                                                                 .getHandleService();
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Obtain the deposit URL for the given collection.  These URLs
@@ -106,10 +110,10 @@ public class CollectionLocation {
      */
     private String getBaseUrl()
         throws DSpaceSWORDException {
-        String depositUrl = ConfigurationManager.getProperty(
-            "sword-server", "deposit.url");
+        String depositUrl = configurationService.getProperty(
+            "sword-server.deposit.url");
         if (depositUrl == null || "".equals(depositUrl)) {
-            String dspaceUrl = ConfigurationManager
+            String dspaceUrl = configurationService
                 .getProperty("dspace.server.url");
             if (dspaceUrl == null || "".equals(dspaceUrl)) {
                 throw new DSpaceSWORDException(
diff --git a/dspace-sword/src/main/java/org/dspace/sword/DSpaceATOMEntry.java b/dspace-sword/src/main/java/org/dspace/sword/DSpaceATOMEntry.java
index d99c1de424..47a033cee6 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/DSpaceATOMEntry.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/DSpaceATOMEntry.java
@@ -10,7 +10,8 @@ package org.dspace.sword;
 import org.dspace.content.Bitstream;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.atom.Author;
 import org.purl.sword.atom.Contributor;
 import org.purl.sword.atom.Generator;
@@ -196,8 +197,10 @@ public abstract class DSpaceATOMEntry {
      * add the generator field content
      */
     protected void addGenerator() {
-        boolean identify = ConfigurationManager.getBooleanProperty(
-            "sword-server", "identify-version");
+        ConfigurationService configurationService
+                = DSpaceServicesFactory.getInstance().getConfigurationService();
+        boolean identify = configurationService.getBooleanProperty(
+            "sword-server.identify-version");
         SWORDUrlManager urlManager = swordService.getUrlManager();
         String softwareUri = urlManager.getGeneratorUrl();
         if (identify) {
diff --git a/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java b/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
index da99cfcc36..68bae5b848 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
@@ -25,8 +25,9 @@ import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.base.Deposit;
 import org.purl.sword.base.ErrorCodes;
 import org.purl.sword.base.SWORDErrorException;
@@ -44,6 +45,9 @@ public class ItemDepositor extends Depositor {
     protected BitstreamFormatService bitstreamFormatService = ContentServiceFactory
         .getInstance().getBitstreamFormatService();
 
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     private Item item;
 
     public ItemDepositor(SWORDService swordService, DSpaceObject dso)
@@ -59,6 +63,7 @@ public class ItemDepositor extends Depositor {
         this.item = (Item) dso;
     }
 
+    @Override
     public DepositResult doDeposit(Deposit deposit)
         throws SWORDErrorException, DSpaceSWORDException {
         // get the things out of the service that we need
@@ -108,8 +113,8 @@ public class ItemDepositor extends Depositor {
                 // for a moment
                 context.turnOffAuthorisationSystem();
 
-                String bundleName = ConfigurationManager
-                    .getProperty("sword-server", "bundle.name");
+                String bundleName = configurationService
+                    .getProperty("sword-server.bundle.name");
                 if (StringUtils.isBlank(bundleName)) {
                     bundleName = "SWORD";
                 }
@@ -175,6 +180,7 @@ public class ItemDepositor extends Depositor {
         return result;
     }
 
+    @Override
     public void undoDeposit(DepositResult result) throws DSpaceSWORDException {
         try {
             SWORDContext sc = swordService.getSwordContext();
diff --git a/dspace-sword/src/main/java/org/dspace/sword/ItemEntryGenerator.java b/dspace-sword/src/main/java/org/dspace/sword/ItemEntryGenerator.java
index c0a78e1866..01f3556d1c 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/ItemEntryGenerator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ItemEntryGenerator.java
@@ -11,6 +11,7 @@ import java.sql.SQLException;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Bitstream;
 import org.dspace.content.BitstreamFormat;
@@ -19,10 +20,11 @@ import org.dspace.content.DCDate;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.atom.Content;
 import org.purl.sword.atom.ContentType;
 import org.purl.sword.atom.InvalidMediaTypeException;
@@ -40,13 +42,15 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
     /**
      * logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemEntryGenerator.class);
+    private static final Logger log = LogManager.getLogger(ItemEntryGenerator.class);
 
     protected HandleService handleService = HandleServiceFactory.getInstance()
                                                                 .getHandleService();
 
     protected ItemService itemService = ContentServiceFactory.getInstance()
                                                              .getItemService();
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     protected ItemEntryGenerator(SWORDService service) {
         super(service);
@@ -56,6 +60,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
      * Add all the subject classifications from the bibliographic
      * metadata.
      */
+    @Override
     protected void addCategories() {
         List<MetadataValue> dcv = itemService
             .getMetadataByMetadataString(item, "dc.subject.*");
@@ -70,6 +75,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
      * Set the content type that DSpace received.  This is just
      * "application/zip" in this default implementation.
      */
+    @Override
     protected void addContentElement()
         throws DSpaceSWORDException {
         // get the things we need out of the service
@@ -83,11 +89,10 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
                 }
 
                 if (StringUtils.isNotBlank(handle)) {
-                    boolean keepOriginal = ConfigurationManager
-                        .getBooleanProperty("sword-server",
-                                            "keep-original-package");
-                    String swordBundle = ConfigurationManager
-                        .getProperty("sword-server", "bundle.name");
+                    boolean keepOriginal = configurationService
+                        .getBooleanProperty("sword-server.keep-original-package");
+                    String swordBundle = configurationService
+                        .getProperty("sword-server.bundle.name");
                     if (StringUtils.isBlank(swordBundle)) {
                         swordBundle = "SWORD";
                     }
@@ -146,6 +151,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
      * they can be used to access the resource over http (i.e.
      * a real URL).
      */
+    @Override
     protected void addIdentifier() {
         // it's possible that the item hasn't been assigned a handle yet
         if (!this.deposit.isNoOp()) {
@@ -162,7 +168,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
 
         // if we get this far, then we just use the dspace url as the
         // property
-        String cfg = ConfigurationManager.getProperty("dspace.ui.url");
+        String cfg = configurationService.getProperty("dspace.ui.url");
         entry.setId(cfg);
 
         // FIXME: later on we will maybe have a workflow page supplied
@@ -172,6 +178,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add links associated with this item.
      */
+    @Override
     protected void addLinks()
         throws DSpaceSWORDException {
         SWORDUrlManager urlManager = swordService.getUrlManager();
@@ -223,6 +230,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add the date of publication from the bibliographic metadata
      */
+    @Override
     protected void addPublishDate() {
         List<MetadataValue> dcv = itemService
             .getMetadataByMetadataString(item, "dc.date.issued");
@@ -233,8 +241,9 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
 
     /**
      * Add rights information.  This attaches an href to the URL
-     * of the item's licence file
+     * of the item's license file
      */
+    @Override
     protected void addRights()
         throws DSpaceSWORDException {
         SWORDUrlManager urlManager = swordService.getUrlManager();
@@ -246,7 +255,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
             return;
         }
 
-        String base = ConfigurationManager.getProperty("dspace.ui.url");
+        String base = configurationService.getProperty("dspace.ui.url");
 
         // if there's no base URL, we are stuck
         if (base == null) {
@@ -275,6 +284,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add the summary/abstract from the bibliographic metadata
      */
+    @Override
     protected void addSummary() {
         List<MetadataValue> dcv = itemService
             .getMetadataByMetadataString(item, "dc.description.abstract");
@@ -291,6 +301,7 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add the title from the bibliographic metadata
      */
+    @Override
     protected void addTitle() {
         List<MetadataValue> dcv = itemService
             .getMetadataByMetadataString(item, "dc.title");
@@ -307,9 +318,10 @@ public class ItemEntryGenerator extends DSpaceATOMEntry {
     /**
      * Add the date that this item was last updated
      */
+    @Override
     protected void addLastUpdatedDate() {
-        String config = ConfigurationManager
-            .getProperty("sword-server", "updated.field");
+        String config = configurationService
+            .getProperty("sword-server.updated.field");
         List<MetadataValue> dcv = itemService
             .getMetadataByMetadataString(item, config);
         if (dcv != null && dcv.size() == 1) {
diff --git a/dspace-sword/src/main/java/org/dspace/sword/SWORDAuthenticator.java b/dspace-sword/src/main/java/org/dspace/sword/SWORDAuthenticator.java
index ec46ab8f22..ad2a7721a3 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDAuthenticator.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDAuthenticator.java
@@ -27,7 +27,6 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
@@ -35,6 +34,8 @@ import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.base.AtomDocumentRequest;
 import org.purl.sword.base.Deposit;
 import org.purl.sword.base.ErrorCodes;
@@ -53,7 +54,7 @@ public class SWORDAuthenticator {
     /**
      * logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(SWORDAuthenticator.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SWORDAuthenticator.class);
 
     protected AuthenticationService authenticationService =
         AuthenticateServiceFactory.getInstance().getAuthenticationService();
@@ -73,6 +74,9 @@ public class SWORDAuthenticator {
     protected ItemService itemService =
         ContentServiceFactory.getInstance().getItemService();
 
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     /**
      * Does the given username and password authenticate for the
      * given DSpace Context?
@@ -263,8 +267,8 @@ public class SWORDAuthenticator {
         }
 
         // first find out if we support on-behalf-of deposit
-        boolean mediated = ConfigurationManager.getBooleanProperty(
-            "sword-server", "on-behalf-of.enable");
+        boolean mediated = configurationService.getBooleanProperty(
+            "sword-server.on-behalf-of.enable");
         if (!mediated && obo != null) {
             // user is trying to do a mediated deposit on a repository which does not support it
             log.error(
diff --git a/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java b/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java
index 6d7ca18367..d0cd9ee2ad 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java
@@ -12,6 +12,7 @@ import java.sql.SQLException;
 import java.util.Date;
 import java.util.StringTokenizer;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
 import org.dspace.content.DCDate;
@@ -21,11 +22,12 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.packager.PackageIngester;
 import org.dspace.content.packager.PackageParameters;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.base.Deposit;
 import org.purl.sword.base.SWORDErrorException;
 
@@ -34,15 +36,18 @@ public class SWORDMETSIngester implements SWORDIngester {
 
     protected ItemService itemService = ContentServiceFactory.getInstance()
                                                              .getItemService();
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
      * Log4j logger
      */
-    public static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SWORDMETSIngester.class);
+    public static final Logger log = LogManager.getLogger(SWORDMETSIngester.class);
 
     /* (non-Javadoc)
      * @see org.dspace.sword.SWORDIngester#ingest(org.dspace.core.Context, org.purl.sword.base.Deposit)
      */
+    @Override
     public DepositResult ingest(SWORDService service, Deposit deposit,
                                 DSpaceObject dso)
         throws DSpaceSWORDException, SWORDErrorException {
@@ -64,8 +69,7 @@ public class SWORDMETSIngester implements SWORDIngester {
             File depositFile = deposit.getFile();
 
             // load the plugin manager for the required configuration
-            String cfg = ConfigurationManager.getProperty("sword-server",
-                                                          "mets-ingester.package-ingester");
+            String cfg = configurationService.getProperty("sword-server.mets-ingester.package-ingester");
             if (cfg == null || "".equals(cfg)) {
                 cfg = "METS";  // default to METS
             }
@@ -87,14 +91,14 @@ public class SWORDMETSIngester implements SWORDIngester {
             params.setWorkflowEnabled(true);
 
             // Should restore mode be enabled, i.e. keep existing handle?
-            if (ConfigurationManager
-                .getBooleanProperty("sword-server", "restore-mode.enable",
+            if (configurationService
+                .getBooleanProperty("sword-server.restore-mode.enable",
                                     false)) {
                 params.setRestoreModeEnabled(true);
             }
 
             // Whether or not to use the collection template
-            params.setUseCollectionTemplate(ConfigurationManager
+            params.setUseCollectionTemplate(configurationService
                                                 .getBooleanProperty(
                                                     "mets.default.ingest.useCollectionTemplate",
                                                     false));
@@ -181,8 +185,8 @@ public class SWORDMETSIngester implements SWORDIngester {
      */
     private void setUpdatedDate(Context context, Item item)
         throws DSpaceSWORDException {
-        String field = ConfigurationManager
-            .getProperty("sword-server", "updated.field");
+        String field = configurationService
+            .getProperty("sword-server.updated.field");
         if (field == null || "".equals(field)) {
             throw new DSpaceSWORDException(
                 "No configuration, or configuration is invalid for: sword.updated.field");
@@ -221,8 +225,8 @@ public class SWORDMETSIngester implements SWORDIngester {
             return;
         }
 
-        String field = ConfigurationManager
-            .getProperty("sword-server", "slug.field");
+        String field = configurationService
+            .getProperty("sword-server.slug.field");
         if (field == null || "".equals(field)) {
             throw new DSpaceSWORDException(
                 "No configuration, or configuration is invalid for: sword.slug.field");
diff --git a/dspace-sword/src/main/java/org/dspace/sword/SWORDUrlManager.java b/dspace-sword/src/main/java/org/dspace/sword/SWORDUrlManager.java
index 4f0c79f908..3b01e16f43 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDUrlManager.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDUrlManager.java
@@ -21,10 +21,11 @@ import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.base.SWORDErrorException;
 
 /**
@@ -37,12 +38,12 @@ public class SWORDUrlManager {
     /**
      * the SWORD configuration
      */
-    private SWORDConfiguration config;
+    private final SWORDConfiguration config;
 
     /**
      * the active DSpace context
      */
-    private Context context;
+    private final Context context;
 
     protected HandleService handleService =
         HandleServiceFactory.getInstance().getHandleService();
@@ -50,6 +51,9 @@ public class SWORDUrlManager {
     protected BitstreamService bitstreamService =
         ContentServiceFactory.getInstance().getBitstreamService();
 
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     public SWORDUrlManager(SWORDConfiguration config, Context context) {
         this.config = config;
         this.context = context;
@@ -62,8 +66,8 @@ public class SWORDUrlManager {
      * @return the generator URL for ATOM entry documents
      */
     public String getGeneratorUrl() {
-        String cfg = ConfigurationManager.getProperty(
-            "sword-server", "generator.url");
+        String cfg = configurationService.getProperty(
+            "sword-server.generator.url");
         if (cfg == null || "".equals(cfg)) {
             return SWORDProperties.SOFTWARE_URI;
         }
@@ -300,10 +304,10 @@ public class SWORDUrlManager {
      */
     public String getBaseServiceDocumentUrl()
         throws DSpaceSWORDException {
-        String depositUrl = ConfigurationManager.getProperty(
-            "sword-server", "servicedocument.url");
+        String depositUrl = configurationService.getProperty(
+            "sword-server.servicedocument.url");
         if (depositUrl == null || "".equals(depositUrl)) {
-            String dspaceUrl = ConfigurationManager.getProperty(
+            String dspaceUrl = configurationService.getProperty(
                 "dspace.server.url");
             if (dspaceUrl == null || "".equals(dspaceUrl)) {
                 throw new DSpaceSWORDException(
@@ -343,10 +347,10 @@ public class SWORDUrlManager {
      */
     public String getBaseDepositUrl()
         throws DSpaceSWORDException {
-        String depositUrl = ConfigurationManager.getProperty(
-            "sword-server", "deposit.url");
+        String depositUrl = configurationService.getProperty(
+            "sword-server.deposit.url");
         if (depositUrl == null || "".equals(depositUrl)) {
-            String dspaceUrl = ConfigurationManager.getProperty(
+            String dspaceUrl = configurationService.getProperty(
                 "dspace.server.url");
             if (dspaceUrl == null || "".equals(dspaceUrl)) {
                 throw new DSpaceSWORDException(
@@ -421,7 +425,7 @@ public class SWORDUrlManager {
             }
 
             String handle = item.getHandle();
-            String bsLink = ConfigurationManager.getProperty("dspace.ui.url");
+            String bsLink = configurationService.getProperty("dspace.ui.url");
 
             if (handle != null && !"".equals(handle)) {
                 bsLink = bsLink + "/bitstream/" + handle + "/" +
@@ -447,10 +451,10 @@ public class SWORDUrlManager {
      */
     public String getBaseMediaLinkUrl()
         throws DSpaceSWORDException {
-        String mlUrl = ConfigurationManager.getProperty(
+        String mlUrl = configurationService.getProperty(
             "sword-server", "media-link.url");
         if (StringUtils.isBlank(mlUrl)) {
-            String dspaceUrl = ConfigurationManager.getProperty(
+            String dspaceUrl = configurationService.getProperty(
                 "dspace.server.url");
             if (dspaceUrl == null || "".equals(dspaceUrl)) {
                 throw new DSpaceSWORDException(
diff --git a/dspace-sword/src/main/java/org/dspace/sword/ServiceDocumentManager.java b/dspace-sword/src/main/java/org/dspace/sword/ServiceDocumentManager.java
index 63ac543648..64f0d8af65 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/ServiceDocumentManager.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ServiceDocumentManager.java
@@ -16,8 +16,9 @@ import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.purl.sword.atom.Generator;
 import org.purl.sword.base.SWORDErrorException;
 import org.purl.sword.base.Service;
@@ -31,9 +32,12 @@ public class ServiceDocumentManager {
     protected CommunityService communityService = ContentServiceFactory
         .getInstance().getCommunityService();
 
-    private SWORDService swordService;
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
-    private SWORDAuthenticator swordAuth;
+    private final SWORDService swordService;
+
+    private final SWORDAuthenticator swordAuth;
 
     public ServiceDocumentManager(SWORDService service) {
         this.swordService = service;
@@ -97,13 +101,13 @@ public class ServiceDocumentManager {
             // we are dealing with the default service document
 
             // set the title of the workspace as per the name of the DSpace installation
-            String ws = ConfigurationManager.getProperty("dspace.name");
+            String ws = configurationService.getProperty("dspace.name");
             Workspace workspace = new Workspace();
             workspace.setTitle(ws);
 
             // next thing to do is determine whether the default is communities or collections
-            boolean swordCommunities = ConfigurationManager.getBooleanProperty(
-                "sword-server", "expose-communities");
+            boolean swordCommunities = configurationService.getBooleanProperty(
+                "sword-server.expose-communities");
 
             if (swordCommunities) {
                 List<Community> comms = swordAuth.getAllowedCommunities(
@@ -178,8 +182,8 @@ public class ServiceDocumentManager {
      * @param service The service document to add the generator to
      */
     private void addGenerator(Service service) {
-        boolean identify = ConfigurationManager.getBooleanProperty(
-            "sword-server", "identify-version", false);
+        boolean identify = configurationService.getBooleanProperty(
+            "sword-server.identify-version", false);
         SWORDUrlManager urlManager = swordService.getUrlManager();
         String softwareUri = urlManager.getGeneratorUrl();
         if (identify) {
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSimpleDC.java b/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSimpleDC.java
index 5362a08adf..185751cef0 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSimpleDC.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSimpleDC.java
@@ -17,7 +17,8 @@ import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 public class AbstractSimpleDC {
     protected HashMap<String, String> dcMap = null;
@@ -27,16 +28,18 @@ public class AbstractSimpleDC {
     protected ItemService itemService = ContentServiceFactory.getInstance()
                                                              .getItemService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     protected void loadMetadataMaps() {
         if (this.dcMap == null) {
             // we should load our DC map from configuration
             this.dcMap = new HashMap<>();
-            Properties props = ConfigurationManager
-                .getProperties("swordv2-server");
+            Properties props = configurationService.getProperties();
             for (Object key : props.keySet()) {
                 String keyString = (String) key;
-                if (keyString.startsWith("simpledc.")) {
-                    String k = keyString.substring("simpledc.".length());
+                if (keyString.startsWith("swordv2-server.simpledc.")) {
+                    String k = keyString.substring("swordv2-server.simpledc.".length());
                     String v = (String) props.get(key);
                     this.dcMap.put(k, v);
                 }
@@ -45,12 +48,11 @@ public class AbstractSimpleDC {
 
         if (this.atomMap == null) {
             this.atomMap = new HashMap<>();
-            Properties props = ConfigurationManager
-                .getProperties("swordv2-server");
+            Properties props = configurationService.getProperties();
             for (Object key : props.keySet()) {
                 String keyString = (String) key;
-                if (keyString.startsWith("atom.")) {
-                    String k = keyString.substring("atom.".length());
+                if (keyString.startsWith("swordv2-server.atom.")) {
+                    String k = keyString.substring("swordv2-server.atom.".length());
                     String v = (String) props.get(key);
                     this.atomMap.put(k, v);
                 }
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSwordContentIngester.java b/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSwordContentIngester.java
index 0a26ec7957..4e9aa54af5 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSwordContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/AbstractSwordContentIngester.java
@@ -12,6 +12,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.StringTokenizer;
 
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.BitstreamFormat;
 import org.dspace.content.Collection;
@@ -21,8 +22,9 @@ import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.Deposit;
 import org.swordapp.server.SwordAuthException;
 import org.swordapp.server.SwordError;
@@ -30,7 +32,7 @@ import org.swordapp.server.SwordServerException;
 
 public abstract class AbstractSwordContentIngester
     implements SwordContentIngester {
-    public static final Logger log = org.apache.logging.log4j.LogManager.getLogger(
+    public static final Logger log = LogManager.getLogger(
         AbstractSwordContentIngester.class);
 
     protected BitstreamFormatService bitstreamFormatService =
@@ -39,6 +41,10 @@ public abstract class AbstractSwordContentIngester
     protected ItemService itemService =
         ContentServiceFactory.getInstance().getItemService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    @Override
     public DepositResult ingest(Context context, Deposit deposit,
                                 DSpaceObject dso, VerboseDescription verboseDescription)
         throws DSpaceSwordException, SwordError, SwordAuthException,
@@ -46,6 +52,7 @@ public abstract class AbstractSwordContentIngester
         return this.ingest(context, deposit, dso, verboseDescription, null);
     }
 
+    @Override
     public DepositResult ingest(Context context, Deposit deposit,
                                 DSpaceObject dso, VerboseDescription verboseDescription,
                                 DepositResult result)
@@ -110,8 +117,8 @@ public abstract class AbstractSwordContentIngester
     protected void setUpdatedDate(Context context, Item item,
                                   VerboseDescription verboseDescription)
         throws DSpaceSwordException {
-        String field = ConfigurationManager
-            .getProperty("swordv2-server", "updated.field");
+        String field = configurationService
+            .getProperty("swordv2-server.updated.field");
         if (field == null || "".equals(field)) {
             throw new DSpaceSwordException(
                 "No configuration, or configuration is invalid for: sword.updated.field");
@@ -153,8 +160,8 @@ public abstract class AbstractSwordContentIngester
             return;
         }
 
-        String field = ConfigurationManager
-            .getProperty("swordv2-server", "slug.field");
+        String field = configurationService
+            .getProperty("swordv2-server.slug.field");
         if (field == null || "".equals(field)) {
             throw new DSpaceSwordException(
                 "No configuration, or configuration is invalid for: sword.slug.field");
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/AtomStatementDisseminator.java b/dspace-swordv2/src/main/java/org/dspace/sword2/AtomStatementDisseminator.java
index 7c41e3c263..18709ce697 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/AtomStatementDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/AtomStatementDisseminator.java
@@ -13,8 +13,9 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.AtomStatement;
 import org.swordapp.server.Statement;
 import org.swordapp.server.SwordError;
@@ -24,19 +25,22 @@ public class AtomStatementDisseminator extends GenericStatementDisseminator
     implements SwordStatementDisseminator {
     protected ItemService itemService = ContentServiceFactory.getInstance()
                                                              .getItemService();
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
+    @Override
     public Statement disseminate(Context context, Item item)
         throws DSpaceSwordException, SwordError, SwordServerException {
         SwordUrlManager urlManager = new SwordUrlManager(
             new SwordConfigurationDSpace(), context);
         String feedUri = urlManager.getAtomStatementUri(item);
 
-        String authorField = ConfigurationManager
-            .getProperty("swordv2-server", "author.field");
-        String titleField = ConfigurationManager
-            .getProperty("swordv2-server", "title.field");
-        String updatedField = ConfigurationManager
-            .getProperty("swordv2-server", "updated.field");
+        String authorField = configurationService
+            .getProperty("swordv2-server.author.field");
+        String titleField = configurationService
+            .getProperty("swordv2-server.title.field");
+        String updatedField = configurationService
+            .getProperty("swordv2-server.updated.field");
 
         String author = this.stringMetadata(item, authorField);
         String title = this.stringMetadata(item, titleField);
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionCollectionGenerator.java b/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionCollectionGenerator.java
index 34cf27d631..ff58c3f1b5 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionCollectionGenerator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionCollectionGenerator.java
@@ -11,14 +11,16 @@ import java.util.List;
 
 import org.apache.abdera.i18n.iri.IRI;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.SwordCollection;
 
 /**
@@ -26,12 +28,15 @@ import org.swordapp.server.SwordCollection;
  * DSpace Collections
  */
 public class CollectionCollectionGenerator implements AtomCollectionGenerator {
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(
+    private static final Logger log = LogManager.getLogger(
         CommunityCollectionGenerator.class);
 
     protected CollectionService collectionService =
         ContentServiceFactory.getInstance().getCollectionService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     /**
      * Build the collection for the given DSpaceObject.  In this implementation,
      * if the object is not a DSpace Collection, it will throw DSpaceSwordException
@@ -41,6 +46,7 @@ public class CollectionCollectionGenerator implements AtomCollectionGenerator {
      * @return the SWORD ATOM collection
      * @throws DSpaceSwordException can be thrown by the internals of the DSpace SWORD implementation
      */
+    @Override
     public SwordCollection buildCollection(Context context, DSpaceObject dso,
                                            SwordConfigurationDSpace swordConfig)
         throws DSpaceSwordException {
@@ -118,7 +124,7 @@ public class CollectionCollectionGenerator implements AtomCollectionGenerator {
 
         // should we offer the items in the collection up as deposit
         // targets?
-        boolean itemService = ConfigurationManager.getBooleanProperty(
+        boolean itemService = configurationService.getBooleanProperty(
             "sword.expose-items");
         if (itemService) {
             String subService = urlManager.constructSubServiceUrl(col);
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionListManagerDSpace.java b/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionListManagerDSpace.java
index 6e1febf9a4..3beea04d95 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionListManagerDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/CollectionListManagerDSpace.java
@@ -22,7 +22,6 @@ import org.dspace.content.MetadataValue;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.workflow.WorkflowItem;
@@ -43,6 +42,7 @@ public class CollectionListManagerDSpace extends DSpaceSwordAPI
     protected WorkflowItemService workflowItemService = WorkflowServiceFactory
         .getInstance().getWorkflowItemService();
 
+    @Override
     public Feed listCollectionContents(IRI colIRI,
                                        AuthCredentials authCredentials, SwordConfiguration swordConfig)
         throws SwordServerException, SwordError, SwordAuthException {
@@ -84,8 +84,8 @@ public class CollectionListManagerDSpace extends DSpaceSwordAPI
         for (Item item : items) {
             Entry entry = feed.addEntry();
             entry.setId(urlManager.getEditIRI(item).toString());
-            String title = this.stringMetadata(item, ConfigurationManager
-                .getProperty("swordv2-server", "title.field"));
+            String title = this.stringMetadata(item, configurationService
+                .getProperty("swordv2-server.title.field"));
             title = title == null ? "Untitled" : title;
             entry.setTitle(title);
             entry.addLink(
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java b/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java
index 2e0f4412f7..b92e246afe 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java
@@ -39,10 +39,11 @@ import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
 import org.dspace.core.Utils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.AuthCredentials;
 import org.swordapp.server.Deposit;
 import org.swordapp.server.DepositReceipt;
@@ -52,7 +53,7 @@ import org.swordapp.server.SwordServerException;
 import org.swordapp.server.UriRegistry;
 
 public class DSpaceSwordAPI {
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(DSpaceSwordAPI.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(DSpaceSwordAPI.class);
 
     protected ItemService itemService =
         ContentServiceFactory.getInstance().getItemService();
@@ -66,6 +67,9 @@ public class DSpaceSwordAPI {
     protected BitstreamFormatService bitstreamFormatService =
         ContentServiceFactory.getInstance().getBitstreamFormatService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     public SwordContext noAuthContext()
         throws DSpaceSwordException {
         SwordContext sc = new SwordContext();
@@ -115,7 +119,7 @@ public class DSpaceSwordAPI {
 
         String[] parts = acceptHeader.split(",");
 
-        List<Object[]> unsorted = new ArrayList<Object[]>();
+        List<Object[]> unsorted = new ArrayList<>();
         float highest_q = 0;
         int counter = 0;
         for (String part : parts) {
@@ -174,7 +178,7 @@ public class DSpaceSwordAPI {
 
         // set up a dictionary to hold our sorted results.  The dictionary will be keyed with the q value, and the
         // value of each key will be a list of content type strings (in no particular order)
-        TreeMap<Float, List<String>> sorted = new TreeMap<Float, List<String>>();
+        TreeMap<Float, List<String>> sorted = new TreeMap<>();
 
         // go through the unsorted list
         for (Object[] oa : unsorted) {
@@ -192,7 +196,7 @@ public class DSpaceSwordAPI {
                 if (sorted.containsKey(qv)) {
                     sorted.get(qv).add(contentType);
                 } else {
-                    List<String> cts = new ArrayList<String>();
+                    List<String> cts = new ArrayList<>();
                     cts.add(contentType);
                     sorted.put(qv, cts);
                 }
@@ -205,7 +209,7 @@ public class DSpaceSwordAPI {
                 if (sorted.containsKey(nq)) {
                     sorted.get(nq).add(contentType);
                 } else {
-                    List<String> cts = new ArrayList<String>();
+                    List<String> cts = new ArrayList<>();
                     cts.add(contentType);
                     sorted.put(nq, cts);
                 }
@@ -255,8 +259,8 @@ public class DSpaceSwordAPI {
                 // for a moment
                 context.turnOffAuthorisationSystem();
 
-                String bundleName = ConfigurationManager.getProperty(
-                    "swordv2-server", "bundle.name");
+                String bundleName = configurationService.getProperty(
+                    "swordv2-server.bundle.name");
                 if (bundleName == null || "".equals(bundleName)) {
                     bundleName = "SWORD";
                 }
@@ -496,9 +500,8 @@ public class DSpaceSwordAPI {
 
     protected void addVerboseDescription(DepositReceipt receipt,
                                          VerboseDescription verboseDescription) {
-        boolean includeVerbose = ConfigurationManager
-            .getBooleanProperty("swordv2-server",
-                                "verbose-description.receipt.enable");
+        boolean includeVerbose = configurationService
+            .getBooleanProperty("swordv2-server.verbose-description.receipt.enable");
         if (includeVerbose) {
             receipt.setVerboseDescription(verboseDescription.toString());
         }
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/FeedContentDisseminator.java b/dspace-swordv2/src/main/java/org/dspace/sword2/FeedContentDisseminator.java
index 3dd10ec81f..84a8668e7a 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/FeedContentDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/FeedContentDisseminator.java
@@ -25,7 +25,6 @@ import org.dspace.content.Bitstream;
 import org.dspace.content.BitstreamFormat;
 import org.dspace.content.Bundle;
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.swordapp.server.SwordError;
@@ -33,6 +32,7 @@ import org.swordapp.server.SwordServerException;
 
 public class FeedContentDisseminator extends AbstractSimpleDC
     implements SwordContentDisseminator {
+    @Override
     public InputStream disseminate(Context context, Item item)
         throws DSpaceSwordException, SwordError, SwordServerException {
         try {
@@ -82,8 +82,8 @@ public class FeedContentDisseminator extends AbstractSimpleDC
         }
 
         // ensure that the feed has one author or more
-        if (feed.getAuthors().size() == 0) {
-            feed.addAuthor(ConfigurationManager.getProperty("dspace.name"));
+        if (feed.getAuthors().isEmpty()) {
+            feed.addAuthor(configurationService.getProperty("dspace.name"));
         }
     }
 
@@ -126,30 +126,36 @@ public class FeedContentDisseminator extends AbstractSimpleDC
         entry.setContent(new IRI(bsUrl), contentType);
     }
 
+    @Override
     public boolean disseminatesContentType(String contentType)
         throws DSpaceSwordException, SwordError, SwordServerException {
         return "application/atom+xml".equals(contentType) ||
             "application/atom+xml;type=feed".equals(contentType);
     }
 
+    @Override
     public boolean disseminatesPackage(String contentType)
         throws DSpaceSwordException, SwordError, SwordServerException {
         // we're just going to ignore packaging formats here
         return true;
     }
 
+    @Override
     public void setContentType(String contentType) {
         // we just return the one format, so ignore this
     }
 
+    @Override
     public void setPackaging(String packaging) {
         // we just return the one format, so ignore this
     }
 
+    @Override
     public String getContentType() {
         return "application/atom+xml;type=feed";
     }
 
+    @Override
     public String getPackaging() {
         // no packaging
         return null;
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java b/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java
index ad806daf04..b452698514 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.abdera.i18n.iri.IRI;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
@@ -23,9 +24,10 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.DepositReceipt;
 import org.swordapp.server.SwordError;
 import org.swordapp.server.SwordServerException;
@@ -40,11 +42,14 @@ public class ReceiptGenerator {
     /**
      * logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(ReceiptGenerator.class);
+    private static final Logger log = LogManager.getLogger(ReceiptGenerator.class);
 
     protected ItemService itemService =
         ContentServiceFactory.getInstance().getItemService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     protected DepositReceipt createFileReceipt(Context context,
                                                DepositResult result, SwordConfigurationDSpace config)
         throws DSpaceSwordException, SwordError, SwordServerException {
@@ -122,7 +127,7 @@ public class ReceiptGenerator {
                     od.getFormat(context).getMIMEType());
             }
 
-            Map<String, String> derived = new HashMap<String, String>();
+            Map<String, String> derived = new HashMap<>();
             List<Bitstream> drs = result.getDerivedResources();
             if (drs != null) {
                 for (Bitstream bs : result.getDerivedResources()) {
@@ -319,8 +324,8 @@ public class ReceiptGenerator {
      */
     protected void addLastUpdatedDate(DepositResult result,
                                       DepositReceipt receipt) {
-        String config = ConfigurationManager.getProperty(
-            "swordv2-server", "updated.field");
+        String config = configurationService.getProperty(
+            "swordv2-server.updated.field");
         List<MetadataValue> dcv = itemService.getMetadataByMetadataString(
             result.getItem(), config);
         if (dcv != null && dcv.size() == 1) {
@@ -342,8 +347,8 @@ public class ReceiptGenerator {
      * @param receipt deposit receipt
      */
     protected void addLastUpdatedDate(Item item, DepositReceipt receipt) {
-        String config = ConfigurationManager.getProperty(
-            "swordv2-server", "updated.field");
+        String config = configurationService.getProperty(
+            "swordv2-server.updated.field");
         List<MetadataValue> dcv = itemService.getMetadataByMetadataString(
             item, config);
         if (dcv != null && dcv.size() == 1) {
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/ServiceDocumentManagerDSpace.java b/dspace-swordv2/src/main/java/org/dspace/sword2/ServiceDocumentManagerDSpace.java
index 37f7406478..76acc94e1e 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/ServiceDocumentManagerDSpace.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/ServiceDocumentManagerDSpace.java
@@ -15,9 +15,10 @@ import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CommunityService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.LogManager;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.AuthCredentials;
 import org.swordapp.server.ServiceDocument;
 import org.swordapp.server.ServiceDocumentManager;
@@ -32,12 +33,16 @@ public class ServiceDocumentManagerDSpace implements ServiceDocumentManager {
     /**
      * logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager
+    private static final Logger log = org.apache.logging.log4j.LogManager
         .getLogger(ServiceDocumentManagerDSpace.class);
 
     protected CommunityService communityService = ContentServiceFactory
         .getInstance().getCommunityService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    @Override
     public ServiceDocument getServiceDocument(String sdUri,
                                               AuthCredentials authCredentials, SwordConfiguration config)
         throws SwordError, SwordServerException, SwordAuthException {
@@ -118,13 +123,13 @@ public class ServiceDocumentManagerDSpace implements ServiceDocumentManager {
             // we are dealing with the default service document
 
             // set the title of the workspace as per the name of the DSpace installation
-            String ws = ConfigurationManager.getProperty("dspace.name");
+            String ws = configurationService.getProperty("dspace.name");
             SwordWorkspace workspace = new SwordWorkspace();
             workspace.setTitle(ws);
 
             // next thing to do is determine whether the default is communities or collections
-            boolean swordCommunities = ConfigurationManager
-                .getBooleanProperty("swordv2-server", "expose-communities");
+            boolean swordCommunities = configurationService
+                .getBooleanProperty("swordv2-server.expose-communities");
 
             if (swordCommunities) {
                 List<Community> comms = swordAuth
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentDisseminator.java b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentDisseminator.java
index ce235f8318..7816af1f8d 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentDisseminator.java
@@ -24,10 +24,11 @@ import org.dspace.content.Bundle;
 import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Utils;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.SwordError;
 import org.swordapp.server.SwordServerException;
 import org.swordapp.server.UriRegistry;
@@ -36,11 +37,15 @@ public class SimpleZipContentDisseminator implements SwordContentDisseminator {
     protected BitstreamService bitstreamService = ContentServiceFactory
         .getInstance().getBitstreamService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    @Override
     public InputStream disseminate(Context context, Item item)
         throws DSpaceSwordException, SwordError, SwordServerException {
         try {
             // first write everything to a temp file
-            String tempDir = ConfigurationManager
+            String tempDir = configurationService
                 .getProperty("upload.temp.dir");
             String fn =
                 tempDir + File.separator + "SWORD." + item.getID() + "." +
@@ -71,28 +76,34 @@ public class SimpleZipContentDisseminator implements SwordContentDisseminator {
         }
     }
 
+    @Override
     public boolean disseminatesContentType(String contentType)
         throws DSpaceSwordException, SwordError, SwordServerException {
         return "application/zip".equals(contentType);
     }
 
+    @Override
     public boolean disseminatesPackage(String contentType)
         throws DSpaceSwordException, SwordError, SwordServerException {
         return UriRegistry.PACKAGE_SIMPLE_ZIP.equals(contentType);
     }
 
+    @Override
     public void setContentType(String contentType) {
         // this only does the one thing, so we can ignore this
     }
 
+    @Override
     public void setPackaging(String packaging) {
         // this only does the one thing, so we can ignore this
     }
 
+    @Override
     public String getContentType() {
         return "application/zip";
     }
 
+    @Override
     public String getPackaging() {
         return UriRegistry.PACKAGE_SIMPLE_ZIP;
     }
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java
index 3c42b82720..a77caa655b 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java
@@ -20,7 +20,6 @@ import org.dspace.content.packager.PackageParameters;
 import org.dspace.content.packager.PackageUtils;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.handle.factory.HandleServiceFactory;
@@ -46,6 +45,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester {
     protected HandleService handleService =
         HandleServiceFactory.getInstance().getHandleService();
 
+    @Override
     public DepositResult ingest(Context context, Deposit deposit,
                                 DSpaceObject dso, VerboseDescription verboseDescription)
         throws DSpaceSwordException, SwordError, SwordAuthException,
@@ -90,8 +90,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester {
             File depositFile = deposit.getFile();
 
             // load the plugin manager for the required configuration
-            String cfg = ConfigurationManager.getProperty("swordv2-server",
-                                                          "mets-ingester.package-ingester");
+            String cfg = configurationService.getProperty("swordv2-server.mets-ingester.package-ingester");
             if (cfg == null || "".equals(cfg)) {
                 cfg = "METS";  // default to METS
             }
@@ -109,13 +108,13 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester {
             params.setWorkflowEnabled(true);
 
             // Should restore mode be enabled, i.e. keep existing handle?
-            if (ConfigurationManager.getBooleanProperty(
-                "swordv2-server", "restore-mode.enable", false)) {
+            if (configurationService.getBooleanProperty(
+                "swordv2-server.restore-mode.enable", false)) {
                 params.setRestoreModeEnabled(true);
             }
 
             // Whether or not to use the collection template
-            params.setUseCollectionTemplate(ConfigurationManager
+            params.setUseCollectionTemplate(configurationService
                                                 .getBooleanProperty(
                                                     "mets.default.ingest.useCollectionTemplate", false));
 
@@ -203,8 +202,8 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester {
             File depositFile = deposit.getFile();
 
             // load the plugin manager for the required configuration
-            String cfg = ConfigurationManager.getProperty(
-                "swordv2-server", "mets-ingester.package-ingester");
+            String cfg = configurationService.getProperty(
+                "swordv2-server.mets-ingester.package-ingester");
             if (cfg == null || "".equals(cfg)) {
                 cfg = "METS";  // default to METS
             }
@@ -222,13 +221,13 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester {
             params.setWorkflowEnabled(true);
 
             // Should restore mode be enabled, i.e. keep existing handle?
-            if (ConfigurationManager.getBooleanProperty(
-                "swordv2-server", "restore-mode.enable", false)) {
+            if (configurationService.getBooleanProperty(
+                "swordv2-server.restore-mode.enable", false)) {
                 params.setRestoreModeEnabled(true);
             }
 
             // Whether or not to use the collection template
-            params.setUseCollectionTemplate(ConfigurationManager
+            params.setUseCollectionTemplate(configurationService
                                                 .getBooleanProperty(
                                                     "mets.default.ingest.useCollectionTemplate", false));
 
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java
index 7088f31c1a..3fdb677c99 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java
@@ -22,10 +22,11 @@ import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.SwordError;
 
 /**
@@ -44,15 +45,18 @@ public class SwordUrlManager {
     protected HandleService handleService =
         HandleServiceFactory.getInstance().getHandleService();
 
+    protected ConfigurationService configurationService =
+            DSpaceServicesFactory.getInstance().getConfigurationService();
+
     /**
      * the SWORD configuration
      */
-    private SwordConfigurationDSpace config;
+    private final SwordConfigurationDSpace config;
 
     /**
      * the active DSpace context
      */
-    private Context context;
+    private final Context context;
 
     public SwordUrlManager(SwordConfigurationDSpace config, Context context) {
         this.config = config;
@@ -92,9 +96,9 @@ public class SwordUrlManager {
 
     public String getSwordBaseUrl()
         throws DSpaceSwordException {
-        String sUrl = ConfigurationManager.getProperty("swordv2-server", "url");
+        String sUrl = configurationService.getProperty("swordv2-server.url");
         if (sUrl == null || "".equals(sUrl)) {
-            String dspaceUrl = ConfigurationManager
+            String dspaceUrl = configurationService
                 .getProperty("dspace.server.url");
             if (dspaceUrl == null || "".equals(dspaceUrl)) {
                 throw new DSpaceSwordException(
@@ -299,10 +303,10 @@ public class SwordUrlManager {
      */
     public String getBaseServiceDocumentUrl()
         throws DSpaceSwordException {
-        String sdUrl = ConfigurationManager
-            .getProperty("swordv2-server", "servicedocument.url");
+        String sdUrl = configurationService
+            .getProperty("swordv2-server.servicedocument.url");
         if (sdUrl == null || "".equals(sdUrl)) {
-            String dspaceUrl = ConfigurationManager
+            String dspaceUrl = configurationService
                 .getProperty("dspace.server.url");
             if (dspaceUrl == null || "".equals(dspaceUrl)) {
                 throw new DSpaceSwordException(
@@ -341,10 +345,10 @@ public class SwordUrlManager {
      */
     public String getBaseCollectionUrl()
         throws DSpaceSwordException {
-        String depositUrl = ConfigurationManager
-            .getProperty("swordv2-server", "collection.url");
+        String depositUrl = configurationService
+            .getProperty("swordv2-server.collection.url");
         if (depositUrl == null || "".equals(depositUrl)) {
-            String dspaceUrl = ConfigurationManager
+            String dspaceUrl = configurationService
                 .getProperty("dspace.server.url");
             if (dspaceUrl == null || "".equals(dspaceUrl)) {
                 throw new DSpaceSwordException(
@@ -407,7 +411,7 @@ public class SwordUrlManager {
             }
 
             String handle = item.getHandle();
-            String bsLink = ConfigurationManager.getProperty("dspace.ui.url");
+            String bsLink = configurationService.getProperty("dspace.ui.url");
 
             if (handle != null && !"".equals(handle)) {
                 bsLink = bsLink + "/bitstream/" + handle + "/" +
@@ -485,7 +489,7 @@ public class SwordUrlManager {
 
         // if the item is in the workspace, we need to give it it's own special identifier
         if (wft.isItemInWorkspace(context, item)) {
-            String urlTemplate = ConfigurationManager
+            String urlTemplate = configurationService
                 .getProperty("swordv2-server", "workspace.url-template");
             if (urlTemplate != null) {
                 return urlTemplate.replace("#wsid#", Integer.toString(
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/VersionManager.java b/dspace-swordv2/src/main/java/org/dspace/sword2/VersionManager.java
index 7212d8caaa..c44f4887df 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/VersionManager.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/VersionManager.java
@@ -22,8 +22,9 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 
 public class VersionManager {
     protected ItemService itemService = ContentServiceFactory.getInstance()
@@ -35,10 +36,13 @@ public class VersionManager {
     protected BitstreamService bitstreamService = ContentServiceFactory
         .getInstance().getBitstreamService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     public void removeBundle(Context context, Item item, String name)
         throws SQLException, AuthorizeException, IOException {
-        boolean keep = ConfigurationManager
-            .getBooleanProperty("swordv2-server", "versions.keep");
+        boolean keep = configurationService
+            .getBooleanProperty("swordv2-server.versions.keep");
         Iterator<Bundle> bundles = item.getBundles().iterator();
         while (bundles.hasNext()) {
             Bundle b = bundles.next();
@@ -51,8 +55,8 @@ public class VersionManager {
 
     public void removeBundle(Context context, Item item, Bundle source)
         throws SQLException, AuthorizeException, IOException {
-        boolean keep = ConfigurationManager
-            .getBooleanProperty("swordv2-server", "versions.keep");
+        boolean keep = configurationService
+            .getBooleanProperty("swordv2-server.versions.keep");
         this.removeBundle(context, item, source, keep);
     }
 
@@ -80,8 +84,8 @@ public class VersionManager {
 
     public void removeBitstream(Context context, Item item, Bitstream bitstream)
         throws SQLException, AuthorizeException, IOException {
-        boolean keep = ConfigurationManager
-            .getBooleanProperty("swordv2-server", "versions.keep");
+        boolean keep = configurationService
+            .getBooleanProperty("swordv2-server.versions.keep");
         this.removeBitstream(context, item, bitstream, keep);
     }
 
@@ -121,11 +125,8 @@ public class VersionManager {
     private Bundle archiveBitstream(Context context, Item item,
                                     Bitstream bitstream)
         throws SQLException, AuthorizeException, IOException {
-        String swordBundle = ConfigurationManager
-            .getProperty("swordv2-server", "bundle.deleted");
-        if (swordBundle == null) {
-            swordBundle = "DELETED";
-        }
+        String swordBundle = configurationService
+            .getProperty("swordv2-server.bundle.deleted", "DELETED");
 
         List<Bundle> bundles = item.getBundles();
         Bundle archive = null;
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java
index f463116dd5..ea5a52091f 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java
@@ -14,9 +14,10 @@ import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.Deposit;
 import org.swordapp.server.SwordError;
 import org.swordapp.server.UriRegistry;
@@ -27,29 +28,38 @@ import org.swordapp.server.UriRegistry;
  * performed on items which are in the deposit phase.
  */
 public class WorkflowManagerDefault implements WorkflowManager {
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    @Override
     public void retrieveServiceDoc(Context context) throws SwordError {
         // do nothing - operation allowed
     }
 
+    @Override
     public void listCollectionContents(Context context, Collection collection)
         throws SwordError {
         // do nothing - operation allowed
     }
 
+    @Override
     public void createResource(Context context, Collection collection)
         throws SwordError {
         // do nothing - operation allowed
     }
 
+    @Override
     public void retrieveContent(Context context, Item item) throws SwordError {
         // do nothing - operation allowed
     }
 
+    @Override
     public void retrieveBitstream(Context context, Bitstream bitstream)
         throws SwordError, DSpaceSwordException {
         // do nothing - operation allowed
     }
 
+    @Override
     public void replaceResourceContent(Context context, Item item)
         throws SwordError, DSpaceSwordException {
         WorkflowTools wft = new WorkflowTools();
@@ -64,11 +74,11 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void replaceMetadata(Context context, Item item)
         throws SwordError, DSpaceSwordException {
-        boolean allowUpdate = ConfigurationManager
-            .getBooleanProperty("swordv2-server",
-                                "workflowmanagerdefault.always-update-metadata");
+        boolean allowUpdate = configurationService
+            .getBooleanProperty("swordv2-server.workflowmanagerdefault.always-update-metadata");
         if (allowUpdate) {
             // all updates are allowed
             return;
@@ -87,12 +97,14 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void replaceMetadataAndMediaResource(Context context, Item item)
         throws SwordError, DSpaceSwordException {
         this.replaceResourceContent(context, item);
         this.replaceMetadata(context, item);
     }
 
+    @Override
     public void deleteMediaResource(Context context, Item item)
         throws SwordError, DSpaceSwordException {
         WorkflowTools wft = new WorkflowTools();
@@ -107,6 +119,7 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void deleteBitstream(Context context, Bitstream bitstream)
         throws SwordError, DSpaceSwordException {
         // this is equivalent to asking whether the media resource in the item can be deleted
@@ -130,14 +143,14 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void replaceBitstream(Context context, Bitstream bitstream)
         throws SwordError, DSpaceSwordException {
         // File replace with DSpace actually violates the RESTful environment, so it is
         // turned off by default, and strongly advised against.  Nonetheless, it is used
         // by some DepositMO aware extensions, so must be supported (as shown below)
-        boolean fileReplace = ConfigurationManager
-            .getBooleanProperty("swordv2-server",
-                                "workflowmanagerdefault.file-replace.enable");
+        boolean fileReplace = configurationService
+            .getBooleanProperty("swordv2-server.workflowmanagerdefault.file-replace.enable");
         if (!fileReplace) {
             throw new SwordError(UriRegistry.ERROR_METHOD_NOT_ALLOWED,
                                  "DSpace does not support file replace; you should DELETE the original file and PUT " +
@@ -164,6 +177,7 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void addResourceContent(Context context, Item item)
         throws SwordError, DSpaceSwordException {
         WorkflowTools wft = new WorkflowTools();
@@ -178,11 +192,11 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void addMetadata(Context context, Item item)
         throws SwordError, DSpaceSwordException {
-        boolean allowUpdate = ConfigurationManager
-            .getBooleanProperty("swordv2-server",
-                                "workflowmanagerdefault.always-update-metadata");
+        boolean allowUpdate = configurationService
+            .getBooleanProperty("swordv2-server.workflowmanagerdefault.always-update-metadata");
         if (allowUpdate) {
             // all updates are allowed
             return;
@@ -201,6 +215,7 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void deleteItem(Context context, Item item)
         throws SwordError, DSpaceSwordException {
         WorkflowTools wft = new WorkflowTools();
@@ -215,11 +230,13 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void retrieveStatement(Context context, Item item)
         throws SwordError, DSpaceSwordException {
         // do nothing - operation allowed
     }
 
+    @Override
     public void modifyState(Context context, Item item)
         throws SwordError, DSpaceSwordException {
         WorkflowTools wft = new WorkflowTools();
@@ -234,12 +251,14 @@ public class WorkflowManagerDefault implements WorkflowManager {
         }
     }
 
+    @Override
     public void resolveState(Context context, Deposit deposit,
                              DepositResult result, VerboseDescription verboseDescription)
         throws DSpaceSwordException {
         this.resolveState(context, deposit, result, verboseDescription, true);
     }
 
+    @Override
     public void resolveState(Context context, Deposit deposit,
                              DepositResult result, VerboseDescription verboseDescription,
                              boolean containerOperation)
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowTools.java b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowTools.java
index eb44e9f2d3..bb20866447 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowTools.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowTools.java
@@ -15,8 +15,9 @@ import org.dspace.content.Item;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.workflow.WorkflowException;
 import org.dspace.workflow.WorkflowItem;
 import org.dspace.workflow.WorkflowItemService;
@@ -33,6 +34,9 @@ public class WorkflowTools {
     protected WorkflowService workflowService =
         WorkflowServiceFactory.getInstance().getWorkflowService();
 
+    protected ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
     /**
      * Is the given item in the DSpace workflow?
      * <p>
@@ -127,8 +131,8 @@ public class WorkflowTools {
             WorkspaceItem wsi = this.getWorkspaceItem(context, item);
 
             // kick off the workflow
-            boolean notify = ConfigurationManager
-                .getBooleanProperty("swordv2-server", "workflow.notify");
+            boolean notify = configurationService
+                .getBooleanProperty("swordv2-server.workflow.notify");
             if (notify) {
                 workflowService.start(context, wsi);
             } else {