Added Support for collections