Improves key mapping