Some changes in User and Collection.