Updated code for CC.Common.JSON change