Issue #255, add UML