Improve User model