Add support for untiered fighter count