Update UML schema, fix implementation details