Add Improvements in Configurator Module