Improved shortcode