configs refactored