Separated issuer and made certificate logic