Add tagging feature for CPD plugin, courtesy Son Nguyen