Updated json support