Updated generator with some fixes for Certificates in Azure