Handle ExecutionWaiting also, not just Started