Added certificate on demand generation.