Simplify main configurator functions
Use simplified configurator syntax everywhere