update to collections structure