Add support for natural POIs: Trees and Peaks.