[#358] refines UML