Adapted to the removal of the bundle classes.