configurators refactored