Added POI support.