added configurator and common header