we already started the datastore changes to support pagination