Schema changes for SASL support