Include better support of map name matching