#91 corresponding changes
UserType fixes