Making User model more efficient