Rework UML schema