Started to add json parsing