Updates to parameterize and support new certs structure.