Updated the Configurator and other classes.