Add support for salt