Add support for future Query Execution Plan