Modified a bit User model