config refactored