Refactoring cert-server