Map example enhancement