APD-96: Refactoring of ConfigurationService