More Work on the JSON Serializer