updated user classes
updated classes