Various enhancements to Collection