Updated UML and manual