Refactored config.