Major shortcode updates