Added shortcode functionality