* Added shortcode functionality