Updated the classes I care about