Added grader and json check