Add cert handling support