[Incomplete] Add dynamic shorcodes - Raw shortcodes