More robust mult-agency support