Updated Class diagram