A few class updates