Refactored config service