added feature shortcode support