Class view improvements