Combatant Type and Converter changes