Added Activity and Rubric functionality