Better tagging support in API.