Support for def queries and proxies