Must do : check Date & fix UML diagram