Add state to reports and status to dispatches