Added support for JSON parser