Added querying architecture
Added upstream queries
Implemented the supplement mechanism