Work on UML schema