POI class extended

NI implemented