Improved modifier mapping compatibility