Changed sub-class calls