Moved common methods down to base class