+ added POI classes