Add non-sasl support