Added support for collections