Refactored config options