Added grader functionality