Added more stuff to support the certificates