Extending the POI functionality

This is not working yet. Commit for debugging.