Moved functions to base class.