Update key handler imports