Refactoring of POI controller