Updated classes

Updated 7 classes