Updated JSON handling https://app.asana.com/0/15843277689885/16220272163673