Added some json parsing