POI matching extracted into a new class