Modified shortcode to accept all parameters