Added support for user id matching.