Restructured Parser and Query_Plan