Refactoring of the Configurator.