Add certificate support