New version to support yubikey