Added back the registry