Supporting more security types in the notional visitor