POI class extended

IPD implemented