Before separating into classes
POI matching extracted into a new class