Improved support for JSON