Added IPOI and POI classes