Added support for channel keys