Update classes and other major changes