Begin updating replacements for QueryGenerator class.