Convert PKCS#11 client to Add-on