Some changes in user model