Refactored config classes