DataRegistryImpl changes