Class improvement