Need additional gateway failure detection