#479 JSON serialization / deserialization modifications