Change map_default to map_or