Major improvements in User model.