Added grader and json