Refactored common methods out to base class