Add support for JSON format