Update for CombatTag API change