More configurator and refactoring support