Added support for SASL