Added shortcode override