Convert to json-simple, and make slight modifications to the API