Refactored configs