Modify depdency injection
Introduce Query, an abstraction over statements and relations