Added rubric definitions