Updated classes package