Improving mapping with default labels