Added full shortcode functionality