Changed the ClassDiagram, added a peer rview that I got late