added support for collections