Added support for the SSL changes