Changed json parsing structure