Add query.* syntactic sugar