Move shared methods to a base class