Updated to new RegistryHandler