New UML design