OrionConfigurator refactor