Updates to all classes