data store rework