Added working certificate support