Update for changes to the base classes