Issue #46, modified uml