Improved collections support
Mo' fixes