Added more classes and the certificates.