Added support for hw keys