[#358] refines UML hopefully for the last time