Added support for failure detection