Fixed broken default mappings