Datastore count speed imrpovements