[#355] refines UML