Added json parsing for comments