Improved text and use of generic collection.