Added json parsing