[Issue #205][Issue #209][WIP] Salma added UMLs