Add grader flexibility