Add collection util and minor tweaks.