Enhanced ER-diagram - Department of Computer Science