#94, add UMLs for issue #93 and #94