Updated classes diagram