Enhanced collection handling