Add support for user type