Adding support for `Query` objects in preparation for 0.2 goals