diff --git a/plugin/api.go b/plugin/api.go
index 7756eec9c8..69f5ca0b8a 100644
--- a/plugin/api.go
+++ b/plugin/api.go
@@ -20,17 +20,20 @@ type API interface {
 	// LoadPluginConfiguration loads the plugin's configuration. dest should be a pointer to a
 	// struct that the configuration JSON can be unmarshalled to.
 	//
+	// @tag Plugin
 	// Minimum server version: 5.2
 	LoadPluginConfiguration(dest interface{}) error
 
 	// RegisterCommand registers a custom slash command. When the command is triggered, your plugin
 	// can fulfill it via the ExecuteCommand hook.
 	//
+	// @tag Command
 	// Minimum server version: 5.2
 	RegisterCommand(command *model.Command) error
 
 	// UnregisterCommand unregisters a command previously registered via RegisterCommand.
 	//
+	// @tag Command
 	// Minimum server version: 5.2
 	UnregisterCommand(teamId, trigger string) error
 
@@ -41,139 +44,168 @@ type API interface {
 
 	// GetConfig fetches the currently persisted config
 	//
+	// @tag Configuration
 	// Minimum server version: 5.2
 	GetConfig() *model.Config
 
 	// GetUnsanitizedConfig fetches the currently persisted config without removing secrets.
 	//
+	// @tag Configuration
 	// Minimum server version: 5.16
 	GetUnsanitizedConfig() *model.Config
 
 	// SaveConfig sets the given config and persists the changes
 	//
+	// @tag Configuration
 	// Minimum server version: 5.2
 	SaveConfig(config *model.Config) *model.AppError
 
 	// GetPluginConfig fetches the currently persisted config of plugin
 	//
+	// @tag Plugin
 	// Minimum server version: 5.6
 	GetPluginConfig() map[string]interface{}
 
 	// SavePluginConfig sets the given config for plugin and persists the changes
 	//
+	// @tag Plugin
 	// Minimum server version: 5.6
 	SavePluginConfig(config map[string]interface{}) *model.AppError
 
 	// GetBundlePath returns the absolute path where the plugin's bundle was unpacked.
 	//
+	// @tag Plugin
 	// Minimum server version: 5.10
 	GetBundlePath() (string, error)
 
 	// GetLicense returns the current license used by the Mattermost server. Returns nil if the
 	// the server does not have a license.
 	//
+	// @tag Server
 	// Minimum server version: 5.10
 	GetLicense() *model.License
 
 	// GetServerVersion return the current Mattermost server version
 	//
+	// @tag Server
 	// Minimum server version: 5.4
 	GetServerVersion() string
 
 	// GetSystemInstallDate returns the time that Mattermost was first installed and ran.
 	//
+	// @tag Server
 	// Minimum server version: 5.10
 	GetSystemInstallDate() (int64, *model.AppError)
 
 	// GetDiagnosticId returns a unique identifier used by the server for diagnostic reports.
 	//
+	// @tag Server
 	// Minimum server version: 5.10
 	GetDiagnosticId() string
 
 	// CreateUser creates a user.
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	CreateUser(user *model.User) (*model.User, *model.AppError)
 
 	// DeleteUser deletes a user.
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	DeleteUser(userId string) *model.AppError
 
 	// GetUsers a list of users based on search options.
 	//
+	// @tag User
 	// Minimum server version: 5.10
 	GetUsers(options *model.UserGetOptions) ([]*model.User, *model.AppError)
 
 	// GetUser gets a user.
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	GetUser(userId string) (*model.User, *model.AppError)
 
 	// GetUserByEmail gets a user by their email address.
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	GetUserByEmail(email string) (*model.User, *model.AppError)
 
 	// GetUserByUsername gets a user by their username.
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	GetUserByUsername(name string) (*model.User, *model.AppError)
 
 	// GetUsersByUsernames gets users by their usernames.
 	//
+	// @tag User
 	// Minimum server version: 5.6
 	GetUsersByUsernames(usernames []string) ([]*model.User, *model.AppError)
 
 	// GetUsersInTeam gets users in team.
 	//
+	// @tag User
+	// @tag Team
 	// Minimum server version: 5.6
 	GetUsersInTeam(teamId string, page int, perPage int) ([]*model.User, *model.AppError)
 
 	// GetTeamIcon gets the team icon.
 	//
+	// @tag Team
 	// Minimum server version: 5.6
 	GetTeamIcon(teamId string) ([]byte, *model.AppError)
 
 	// SetTeamIcon sets the team icon.
 	//
+	// @tag Team
 	// Minimum server version: 5.6
 	SetTeamIcon(teamId string, data []byte) *model.AppError
 
 	// RemoveTeamIcon removes the team icon.
 	//
+	// @tag Team
 	// Minimum server version: 5.6
 	RemoveTeamIcon(teamId string) *model.AppError
 
 	// UpdateUser updates a user.
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	UpdateUser(user *model.User) (*model.User, *model.AppError)
 
 	// GetUserStatus will get a user's status.
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	GetUserStatus(userId string) (*model.Status, *model.AppError)
 
 	// GetUserStatusesByIds will return a list of user statuses based on the provided slice of user IDs.
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	GetUserStatusesByIds(userIds []string) ([]*model.Status, *model.AppError)
 
 	// UpdateUserStatus will set a user's status until the user, or another integration/plugin, sets it back to online.
 	// The status parameter can be: "online", "away", "dnd", or "offline".
 	//
+	// @tag User
 	// Minimum server version: 5.2
 	UpdateUserStatus(userId, status string) (*model.Status, *model.AppError)
 
 	// UpdateUserActive deactivates or reactivates an user.
 	//
+	// @tag User
 	// Minimum server version: 5.8
 	UpdateUserActive(userId string, active bool) *model.AppError
 
 	// GetUsersInChannel returns a page of users in a channel. Page counting starts at 0.
 	// The sortBy parameter can be: "username" or "status".
 	//
+	// @tag User
+	// @tag Channel
 	// Minimum server version: 5.6
 	GetUsersInChannel(channelId, sortBy string, page, perPage int) ([]*model.User, *model.AppError)
 
@@ -182,312 +214,403 @@ type API interface {
 	// Returns a map with attribute names as keys and the user's attributes as values.
 	// Requires an enterprise license, LDAP to be configured and for the user to use LDAP as an authentication method.
 	//
+	// @tag User
 	// Minimum server version: 5.3
 	GetLDAPUserAttributes(userId string, attributes []string) (map[string]string, *model.AppError)
 
 	// CreateTeam creates a team.
 	//
+	// @tag Team
 	// Minimum server version: 5.2
 	CreateTeam(team *model.Team) (*model.Team, *model.AppError)
 
 	// DeleteTeam deletes a team.
 	//
+	// @tag Team
 	// Minimum server version: 5.2
 	DeleteTeam(teamId string) *model.AppError
 
 	// GetTeam gets all teams.
 	//
+	// @tag Team
 	// Minimum server version: 5.2
 	GetTeams() ([]*model.Team, *model.AppError)
 
 	// GetTeam gets a team.
 	//
+	// @tag Team
 	// Minimum server version: 5.2
 	GetTeam(teamId string) (*model.Team, *model.AppError)
 
 	// GetTeamByName gets a team by its name.
 	//
+	// @tag Team
 	// Minimum server version: 5.2
 	GetTeamByName(name string) (*model.Team, *model.AppError)
 
 	// GetTeamsUnreadForUser gets the unread message and mention counts for each team to which the given user belongs.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.6
 	GetTeamsUnreadForUser(userId string) ([]*model.TeamUnread, *model.AppError)
 
 	// UpdateTeam updates a team.
 	//
+	// @tag Team
 	// Minimum server version: 5.2
 	UpdateTeam(team *model.Team) (*model.Team, *model.AppError)
 
 	// SearchTeams search a team.
 	//
+	// @tag Team
 	// Minimum server version: 5.8
 	SearchTeams(term string) ([]*model.Team, *model.AppError)
 
 	// GetTeamsForUser returns list of teams of given user ID.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.6
 	GetTeamsForUser(userId string) ([]*model.Team, *model.AppError)
 
 	// CreateTeamMember creates a team membership.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.2
 	CreateTeamMember(teamId, userId string) (*model.TeamMember, *model.AppError)
 
-	// CreateTeamMember creates a team membership for all provided user ids.
+	// CreateTeamMembers creates a team membership for all provided user ids.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.2
 	CreateTeamMembers(teamId string, userIds []string, requestorId string) ([]*model.TeamMember, *model.AppError)
 
 	// DeleteTeamMember deletes a team membership.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.2
 	DeleteTeamMember(teamId, userId, requestorId string) *model.AppError
 
 	// GetTeamMembers returns the memberships of a specific team.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.2
 	GetTeamMembers(teamId string, page, perPage int) ([]*model.TeamMember, *model.AppError)
 
 	// GetTeamMember returns a specific membership.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.2
 	GetTeamMember(teamId, userId string) (*model.TeamMember, *model.AppError)
 
 	// GetTeamMembersForUser returns all team memberships for a user.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.10
 	GetTeamMembersForUser(userId string, page int, perPage int) ([]*model.TeamMember, *model.AppError)
 
 	// UpdateTeamMemberRoles updates the role for a team membership.
 	//
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.2
 	UpdateTeamMemberRoles(teamId, userId, newRoles string) (*model.TeamMember, *model.AppError)
 
 	// CreateChannel creates a channel.
 	//
+	// @tag Channel
 	// Minimum server version: 5.2
 	CreateChannel(channel *model.Channel) (*model.Channel, *model.AppError)
 
 	// DeleteChannel deletes a channel.
 	//
+	// @tag Channel
 	// Minimum server version: 5.2
 	DeleteChannel(channelId string) *model.AppError
 
 	// GetPublicChannelsForTeam gets a list of all channels.
 	//
+	// @tag Channel
+	// @tag Team
 	// Minimum server version: 5.2
 	GetPublicChannelsForTeam(teamId string, page, perPage int) ([]*model.Channel, *model.AppError)
 
 	// GetChannel gets a channel.
 	//
+	// @tag Channel
 	// Minimum server version: 5.2
 	GetChannel(channelId string) (*model.Channel, *model.AppError)
 
 	// GetChannelByName gets a channel by its name, given a team id.
 	//
+	// @tag Channel
 	// Minimum server version: 5.2
 	GetChannelByName(teamId, name string, includeDeleted bool) (*model.Channel, *model.AppError)
 
 	// GetChannelByNameForTeamName gets a channel by its name, given a team name.
 	//
+	// @tag Channel
+	// @tag Team
 	// Minimum server version: 5.2
 	GetChannelByNameForTeamName(teamName, channelName string, includeDeleted bool) (*model.Channel, *model.AppError)
 
 	// GetChannelsForTeamForUser gets a list of channels for given user ID in given team ID.
 	//
+	// @tag Channel
+	// @tag Team
+	// @tag User
 	// Minimum server version: 5.6
 	GetChannelsForTeamForUser(teamId, userId string, includeDeleted bool) ([]*model.Channel, *model.AppError)
 
 	// GetChannelStats gets statistics for a channel.
 	//
+	// @tag Channel
 	// Minimum server version: 5.6
 	GetChannelStats(channelId string) (*model.ChannelStats, *model.AppError)
 
 	// GetDirectChannel gets a direct message channel.
 	// If the channel does not exist it will create it.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.2
 	GetDirectChannel(userId1, userId2 string) (*model.Channel, *model.AppError)
 
 	// GetGroupChannel gets a group message channel.
 	// If the channel does not exist it will create it.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.2
 	GetGroupChannel(userIds []string) (*model.Channel, *model.AppError)
 
 	// UpdateChannel updates a channel.
 	//
+	// @tag Channel
 	// Minimum server version: 5.2
 	UpdateChannel(channel *model.Channel) (*model.Channel, *model.AppError)
 
 	// SearchChannels returns the channels on a team matching the provided search term.
 	//
+	// @tag Channel
 	// Minimum server version: 5.6
 	SearchChannels(teamId string, term string) ([]*model.Channel, *model.AppError)
 
 	// SearchUsers returns a list of users based on some search criteria.
 	//
+	// @tag User
 	// Minimum server version: 5.6
 	SearchUsers(search *model.UserSearch) ([]*model.User, *model.AppError)
 
 	// SearchPostsInTeam returns a list of posts in a specific team that match the given params.
 	//
+	// @tag Post
+	// @tag Team
 	// Minimum server version: 5.10
 	SearchPostsInTeam(teamId string, paramsList []*model.SearchParams) ([]*model.Post, *model.AppError)
 
 	// AddChannelMember joins a user to a channel (as if they joined themselves)
 	// This means the user will not receive notifications for joining the channel.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.2
 	AddChannelMember(channelId, userId string) (*model.ChannelMember, *model.AppError)
 
 	// AddUserToChannel adds a user to a channel as if the specified user had invited them.
 	// This means the user will receive the regular notifications for being added to the channel.
 	//
+	// @tag User
+	// @tag Channel
 	// Minimum server version: 5.18
 	AddUserToChannel(channelId, userId, asUserId string) (*model.ChannelMember, *model.AppError)
 
 	// GetChannelMember gets a channel membership for a user.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.2
 	GetChannelMember(channelId, userId string) (*model.ChannelMember, *model.AppError)
 
 	// GetChannelMembers gets a channel membership for all users.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.6
 	GetChannelMembers(channelId string, page, perPage int) (*model.ChannelMembers, *model.AppError)
 
 	// GetChannelMembersByIds gets a channel membership for a particular User
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.6
 	GetChannelMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError)
 
 	// GetChannelMembersForUser returns all channel memberships on a team for a user.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.10
 	GetChannelMembersForUser(teamId, userId string, page, perPage int) ([]*model.ChannelMember, *model.AppError)
 
 	// UpdateChannelMemberRoles updates a user's roles for a channel.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.2
 	UpdateChannelMemberRoles(channelId, userId, newRoles string) (*model.ChannelMember, *model.AppError)
 
 	// UpdateChannelMemberNotifications updates a user's notification properties for a channel.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.2
 	UpdateChannelMemberNotifications(channelId, userId string, notifications map[string]string) (*model.ChannelMember, *model.AppError)
 
 	// GetGroup gets a group by ID.
 	//
+	// @tag Group
 	// Minimum server version: 5.18
 	GetGroup(groupId string) (*model.Group, *model.AppError)
 
 	// GetGroupByName gets a group by name.
 	//
+	// @tag Group
 	// Minimum server version: 5.18
 	GetGroupByName(name string) (*model.Group, *model.AppError)
 
 	// GetGroupsForUser gets the groups a user is in.
 	//
+	// @tag Group
+	// @tag User
 	// Minimum server version: 5.18
 	GetGroupsForUser(userId string) ([]*model.Group, *model.AppError)
 
 	// DeleteChannelMember deletes a channel membership for a user.
 	//
+	// @tag Channel
+	// @tag User
 	// Minimum server version: 5.2
 	DeleteChannelMember(channelId, userId string) *model.AppError
 
 	// CreatePost creates a post.
 	//
+	// @tag Post
 	// Minimum server version: 5.2
 	CreatePost(post *model.Post) (*model.Post, *model.AppError)
 
 	// AddReaction add a reaction to a post.
 	//
+	// @tag Post
 	// Minimum server version: 5.3
 	AddReaction(reaction *model.Reaction) (*model.Reaction, *model.AppError)
 
 	// RemoveReaction remove a reaction from a post.
 	//
+	// @tag Post
 	// Minimum server version: 5.3
 	RemoveReaction(reaction *model.Reaction) *model.AppError
 
 	// GetReaction get the reactions of a post.
 	//
+	// @tag Post
 	// Minimum server version: 5.3
 	GetReactions(postId string) ([]*model.Reaction, *model.AppError)
 
 	// SendEphemeralPost creates an ephemeral post.
 	//
+	// @tag Post
 	// Minimum server version: 5.2
 	SendEphemeralPost(userId string, post *model.Post) *model.Post
 
 	// UpdateEphemeralPost updates an ephemeral message previously sent to the user.
 	// EXPERIMENTAL: This API is experimental and can be changed without advance notice.
 	//
+	// @tag Post
 	// Minimum server version: 5.2
 	UpdateEphemeralPost(userId string, post *model.Post) *model.Post
 
 	// DeleteEphemeralPost deletes an ephemeral message previously sent to the user.
 	// EXPERIMENTAL: This API is experimental and can be changed without advance notice.
 	//
+	// @tag Post
 	// Minimum server version: 5.2
 	DeleteEphemeralPost(userId, postId string)
 
 	// DeletePost deletes a post.
 	//
+	// @tag Post
 	// Minimum server version: 5.2
 	DeletePost(postId string) *model.AppError
 
 	// GetPostThread gets a post with all the other posts in the same thread.
 	//
+	// @tag Post
 	// Minimum server version: 5.6
 	GetPostThread(postId string) (*model.PostList, *model.AppError)
 
 	// GetPost gets a post.
 	//
+	// @tag Post
 	// Minimum server version: 5.2
 	GetPost(postId string) (*model.Post, *model.AppError)
 
 	// GetPostsSince gets posts created after a specified time as Unix time in milliseconds.
 	//
+	// @tag Post
+	// @tag Channel
 	// Minimum server version: 5.6
 	GetPostsSince(channelId string, time int64) (*model.PostList, *model.AppError)
 
 	// GetPostsAfter gets a page of posts that were posted after the post provided.
 	//
+	// @tag Post
+	// @tag Channel
 	// Minimum server version: 5.6
 	GetPostsAfter(channelId, postId string, page, perPage int) (*model.PostList, *model.AppError)
 
 	// GetPostsBefore gets a page of posts that were posted before the post provided.
 	//
+	// @tag Post
+	// @tag Channel
 	// Minimum server version: 5.6
 	GetPostsBefore(channelId, postId string, page, perPage int) (*model.PostList, *model.AppError)
 
 	// GetPostsForChannel gets a list of posts for a channel.
 	//
+	// @tag Post
+	// @tag Channel
 	// Minimum server version: 5.6
 	GetPostsForChannel(channelId string, page, perPage int) (*model.PostList, *model.AppError)
 
 	// GetTeamStats gets a team's statistics
 	//
+	// @tag Team
 	// Minimum server version: 5.8
 	GetTeamStats(teamId string) (*model.TeamStats, *model.AppError)
 
 	// UpdatePost updates a post.
 	//
+	// @tag Post
 	// Minimum server version: 5.2
 	UpdatePost(post *model.Post) (*model.Post, *model.AppError)
 
 	// GetProfileImage gets user's profile image.
 	//
+	// @tag User
 	// Minimum server version: 5.6
 	GetProfileImage(userId string) ([]byte, *model.AppError)
 
 	// SetProfileImage sets a user's profile image.
 	//
+	// @tag User
 	// Minimum server version: 5.6
 	SetProfileImage(userId string, data []byte) *model.AppError
 
@@ -495,16 +618,19 @@ type API interface {
 	//
 	// The sortBy parameter can be: "name".
 	//
+	// @tag Emoji
 	// Minimum server version: 5.6
 	GetEmojiList(sortBy string, page, perPage int) ([]*model.Emoji, *model.AppError)
 
 	// GetEmojiByName gets an emoji by it's name.
 	//
+	// @tag Emoji
 	// Minimum server version: 5.6
 	GetEmojiByName(name string) (*model.Emoji, *model.AppError)
 
 	// GetEmoji returns a custom emoji based on the emojiId string.
 	//
+	// @tag Emoji
 	// Minimum server version: 5.6
 	GetEmoji(emojiId string) (*model.Emoji, *model.AppError)
 
@@ -515,36 +641,45 @@ type API interface {
 	// to CreatePost. Use this API to duplicate a post and its file attachments without
 	// actually duplicating the uploaded files.
 	//
+	// @tag File
+	// @tag User
 	// Minimum server version: 5.2
 	CopyFileInfos(userId string, fileIds []string) ([]string, *model.AppError)
 
 	// GetFileInfo gets a File Info for a specific fileId
 	//
+	// @tag File
 	// Minimum server version: 5.3
 	GetFileInfo(fileId string) (*model.FileInfo, *model.AppError)
 
 	// GetFile gets content of a file by it's ID
 	//
+	// @tag File
 	// Minimum server version: 5.8
 	GetFile(fileId string) ([]byte, *model.AppError)
 
 	// GetFileLink gets the public link to a file by fileId.
 	//
+	// @tag File
 	// Minimum server version: 5.6
 	GetFileLink(fileId string) (string, *model.AppError)
 
 	// ReadFileAtPath reads the file from the backend for a specific path
 	//
+	// @tag File
 	// Minimum server version: 5.3
 	ReadFile(path string) ([]byte, *model.AppError)
 
 	// GetEmojiImage returns the emoji image.
 	//
+	// @tag Emoji
 	// Minimum server version: 5.6
 	GetEmojiImage(emojiId string) ([]byte, string, *model.AppError)
 
 	// UploadFile will upload a file to a channel using a multipart request, to be later attached to a post.
 	//
+	// @tag File
+	// @tag Channel
 	// Minimum server version: 5.6
 	UploadFile(data []byte, channelId string, filename string) (*model.FileInfo, *model.AppError)
 
@@ -559,32 +694,38 @@ type API interface {
 
 	// GetPlugins will return a list of plugin manifests for currently active plugins.
 	//
+	// @tag Plugin
 	// Minimum server version: 5.6
 	GetPlugins() ([]*model.Manifest, *model.AppError)
 
 	// EnablePlugin will enable an plugin installed.
 	//
+	// @tag Plugin
 	// Minimum server version: 5.6
 	EnablePlugin(id string) *model.AppError
 
 	// DisablePlugin will disable an enabled plugin.
 	//
+	// @tag Plugin
 	// Minimum server version: 5.6
 	DisablePlugin(id string) *model.AppError
 
 	// RemovePlugin will disable and delete a plugin.
 	//
+	// @tag Plugin
 	// Minimum server version: 5.6
 	RemovePlugin(id string) *model.AppError
 
 	// GetPluginStatus will return the status of a plugin.
 	//
+	// @tag Plugin
 	// Minimum server version: 5.6
 	GetPluginStatus(id string) (*model.PluginStatus, *model.AppError)
 
 	// InstallPlugin will upload another plugin with tar.gz file.
 	// Previous version will be replaced on replace true.
 	//
+	// @tag Plugin
 	// Minimum server version: 5.18
 	InstallPlugin(file io.Reader, replace bool) (*model.Manifest, *model.AppError)
 
@@ -593,6 +734,7 @@ type API interface {
 	// KVSet stores a key-value pair, unique per plugin.
 	// Provided helper functions and internal plugin code will use the prefix `mmi_` before keys. Do not use this prefix.
 	//
+	// @tag KeyValueStore
 	// Minimum server version: 5.2
 	KVSet(key string, value []byte) *model.AppError
 
@@ -602,6 +744,7 @@ type API interface {
 	// Returns (false, nil) if current value != oldValue or key already exists when inserting
 	// Returns (true, nil) if current value == oldValue or new key is inserted
 	//
+	// @tag KeyValueStore
 	// Minimum server version: 5.12
 	KVCompareAndSet(key string, oldValue, newValue []byte) (bool, *model.AppError)
 
@@ -610,6 +753,7 @@ type API interface {
 	// Returns (false, nil) if current value != oldValue or key does not exist when deleting
 	// Returns (true, nil) if current value == oldValue and the key was deleted
 	//
+	// @tag KeyValueStore
 	// Minimum server version: 5.16
 	KVCompareAndDelete(key string, oldValue []byte) (bool, *model.AppError)
 
@@ -624,26 +768,31 @@ type API interface {
 
 	// KVSet stores a key-value pair with an expiry time, unique per plugin.
 	//
+	// @tag KeyValueStore
 	// Minimum server version: 5.6
 	KVSetWithExpiry(key string, value []byte, expireInSeconds int64) *model.AppError
 
 	// KVGet retrieves a value based on the key, unique per plugin. Returns nil for non-existent keys.
 	//
+	// @tag KeyValueStore
 	// Minimum server version: 5.2
 	KVGet(key string) ([]byte, *model.AppError)
 
 	// KVDelete removes a key-value pair, unique per plugin. Returns nil for non-existent keys.
 	//
+	// @tag KeyValueStore
 	// Minimum server version: 5.2
 	KVDelete(key string) *model.AppError
 
 	// KVDeleteAll removes all key-value pairs for a plugin.
 	//
+	// @tag KeyValueStore
 	// Minimum server version: 5.6
 	KVDeleteAll() *model.AppError
 
 	// KVList lists all keys for a plugin.
 	//
+	// @tag KeyValueStore
 	// Minimum server version: 5.6
 	KVList(page, perPage int) ([]string, *model.AppError)
 
@@ -657,16 +806,21 @@ type API interface {
 
 	// HasPermissionTo check if the user has the permission at system scope.
 	//
+	// @tag User
 	// Minimum server version: 5.3
 	HasPermissionTo(userId string, permission *model.Permission) bool
 
 	// HasPermissionToTeam check if the user has the permission at team scope.
 	//
+	// @tag User
+	// @tag Team
 	// Minimum server version: 5.3
 	HasPermissionToTeam(userId, teamId string, permission *model.Permission) bool
 
 	// HasPermissionToChannel check if the user has the permission at channel scope.
 	//
+	// @tag User
+	// @tag Channel
 	// Minimum server version: 5.3
 	HasPermissionToChannel(userId, channelId string, permission *model.Permission) bool
 
@@ -674,6 +828,7 @@ type API interface {
 	// Appropriate context such as the plugin name will already be added as fields so plugins
 	// do not need to add that info.
 	//
+	// @tag Logging
 	// Minimum server version: 5.2
 	LogDebug(msg string, keyValuePairs ...interface{})
 
@@ -681,6 +836,7 @@ type API interface {
 	// Appropriate context such as the plugin name will already be added as fields so plugins
 	// do not need to add that info.
 	//
+	// @tag Logging
 	// Minimum server version: 5.2
 	LogInfo(msg string, keyValuePairs ...interface{})
 
@@ -688,6 +844,7 @@ type API interface {
 	// Appropriate context such as the plugin name will already be added as fields so plugins
 	// do not need to add that info.
 	//
+	// @tag Logging
 	// Minimum server version: 5.2
 	LogError(msg string, keyValuePairs ...interface{})
 
@@ -695,6 +852,7 @@ type API interface {
 	// Appropriate context such as the plugin name will already be added as fields so plugins
 	// do not need to add that info.
 	//
+	// @tag Logging
 	// Minimum server version: 5.2
 	LogWarn(msg string, keyValuePairs ...interface{})
 
@@ -705,47 +863,56 @@ type API interface {
 
 	// CreateBot creates the given bot and corresponding user.
 	//
+	// @tag Bot
 	// Minimum server version: 5.10
 	CreateBot(bot *model.Bot) (*model.Bot, *model.AppError)
 
 	// PatchBot applies the given patch to the bot and corresponding user.
 	//
+	// @tag Bot
 	// Minimum server version: 5.10
 	PatchBot(botUserId string, botPatch *model.BotPatch) (*model.Bot, *model.AppError)
 
 	// GetBot returns the given bot.
 	//
+	// @tag Bot
 	// Minimum server version: 5.10
 	GetBot(botUserId string, includeDeleted bool) (*model.Bot, *model.AppError)
 
 	// GetBots returns the requested page of bots.
 	//
+	// @tag Bot
 	// Minimum server version: 5.10
 	GetBots(options *model.BotGetOptions) ([]*model.Bot, *model.AppError)
 
 	// UpdateBotActive marks a bot as active or inactive, along with its corresponding user.
 	//
+	// @tag Bot
 	// Minimum server version: 5.10
 	UpdateBotActive(botUserId string, active bool) (*model.Bot, *model.AppError)
 
 	// PermanentDeleteBot permanently deletes a bot and its corresponding user.
 	//
+	// @tag Bot
 	// Minimum server version: 5.10
 	PermanentDeleteBot(botUserId string) *model.AppError
 
 	// GetBotIconImage gets LHS bot icon image.
 	//
+	// @tag Bot
 	// Minimum server version: 5.14
 	GetBotIconImage(botUserId string) ([]byte, *model.AppError)
 
 	// SetBotIconImage sets LHS bot icon image.
 	// Icon image must be SVG format, all other formats are rejected.
 	//
+	// @tag Bot
 	// Minimum server version: 5.14
 	SetBotIconImage(botUserId string, data []byte) *model.AppError
 
 	// DeleteBotIconImage deletes LHS bot icon image.
 	//
+	// @tag Bot
 	// Minimum server version: 5.14
 	DeleteBotIconImage(botUserId string) *model.AppError