Updated configurator