POI functionality complete