Add support for POIs