Updated user table to match class