Updated to support shortcode in CLF Collab. Still has minor bugs