Updated case of classes