Updated x509 plugin to the new builder API