- Added basic POI and POIIndicator support