More work on JSON parsing/serialization