Minor changes
Update queries
creation
todo
Merge branch 'objectInteraction' of https://github.com/PPiMapBuilder/PPiRetriever.git into objectInteraction