Improved collections suite