refactoring due to repository split