Added certificate type verification