Updated datastore entities