Refactoring Repository into single DataRepository with Interface
Fixing merging conflicts