Support for JSON added