This should be part of the base class?