Added additional shortcode options