Updates to SSL and template