Fix for breakage regarding DataStoreIdentifiers