Added grader components