* Resolution proposition to Issue#1055 (UML diagram left to do) * Deciding not to modify the UML diagram for now