Added extra fields to User