Ok let me double check, may need to split those types out for now until we add PKCS#11 support for audit logging as well.