Added universal support for JSON.