Improved ImmutableCollector