Added GradeComponents