Added support for removed classes.