Added additional fields to the user class