POI functionality added + some name refactoring