Added singleton support for POI's