Adding tagging support