CollectionUtils improvements