New version of the query plan