Added support for JSON export