Updated each class and removed compilation errors