Refactoring of configuration service