Changed namespace for collections