Replace player+team with commander in Unit