New Query_plan design