Add more certificate stuff