Improve Shortcode registration