Add TLS and password mechanisms as options