More class updates