Add Hardware Key support