Added combat_system option