Modified implementations of repository interfaces to try debugging