Add optional SASL support