Start thinking a bit about OnQueryContext support