Add support for general domain queries

Specific queries are just wrappers over the top of the domain query