Update with improved shortcode and CTP