Refactored Configuration