Add other certificates and Bugfix