More safe collection handling