Added support for parsing JSON the old way