Add shortcode support