Change around the base classes