Repository provider: some refactoring
Repository provider: some refactoring