Update for collections traits removal