Added TLS-ability