Improve User model
Improve User model
Improve User model