Separate the indexing concerns out of the Persistence module