Updated to use new POI feature.