Add back support for hardware keys