Add ident and user mask matching