#36, changed UML format