Improved collection handling.