For new mappings, set the default type to unresolved

- For existing mappings, use the existing type.