Fixed tracking of classes