Update to latest plan_executor