Increased shortcode support functionality