Update Data Driven functionality with POI