Use new Repository interface.