Change collections and add ids