Added superclass tracking