Many updates to all classes