Changes to configurator