Added certificate to claims conversion