Improve user model