More classes and updates