Added shortcode switch