Improved the shortcode_config