Add hardware keys support (2/2)