Grid - Add support for collections