Better class tracking