Add the Entrust stuff in