Optimized feature collection, name and comment improvements