Continue to move common helpers etc across to base class (shortcode implementation)