Update on Class diagram and Report