Add support for other certificate types as well