Add map_point and value_point