Added certificate queries