Breaking changes to repository pattern