[WIP] Query constructor API changes

What if its an resource?