Refactoring, move base ops to BaseRepository