Updated the UML and added some classes