More safa collection handling