Renaming
Refactored the configuration validation