Update shortcodes implementation