Moving model away from POI dependency