Update for changes to base class