Issue #250, add UML