Rework to use new datastore structure with separate tables in one store rather than separate stores