Improved templates and collections.