Completed adding Shortcodes