Add more EStop and PassatStatus support