Add support for JSON parsin