Updated POI support