Support multiple types & update toJSON #2304
+254
−34
Merged
Loading