Moved repository interfaces over to traits