Made Shortcode  module easier