improved collection view support