Add support for other cipher types