Improve key mapping.