Better multi-squad support