Added User id to shortcode & beginning annotation table