Add support for JSON