Added shortcodes for rendering