Implemented more JSON formatting