Class management improved