Refactored config values