Added shortcode feature