Some changes in User