Updated and reconfigured the configuration class