Added support for JSON