Yet another modification on json parsing..