Added new POI and D&I improvements