Added extra fields to User model