Improved X509CertificateDatabase