Updated with shortcode options