Configuration implementation refactoring