Further internalDataStore integration