Small refactoring, configuration introduced