refactoring for new configuration style