Improved conversion and collections.