Use Registry instead of JObject