Chris/Chuan updated UML, now using dia