Added support for new certificates