I did this because you did the same in the InMemory impl