improved collections support