changed mapping drivers to annotation, added CourseAlias and LabAlias