Added pupil and class list component.