Refactored Configuration controller