Replaced ToDict with utils.CreateJsonFromModel
Added TODO