Added support for POI