Better support for TagAPI.