Added seperate configuration code (configurator)