Change to QueryExecutionFactory