Move other common code to base class