Update for collections changes