Updates to the base classes