Enhancements to JSON Creation

See title