Fix #480 improve default mappings