Reduce use of JObject