Added registryId field