refactored the configuration