[#361] refines UML