Added fields to UserAccount class