Move some things into the base class