Adding updated certs and encryption