Major update to all classes