Added more params to shortcode