Update everything to use new base classes.