Reflect new way of mapping keys.