Added shortcode & "flag" attributes