Improve shortcode