updated key mappings to use no-recursive mappings