Re-added support for TLS via the Options type