Refactor Configuration