Add option to turn off default mappings