Adding shortcode support