Add support for rebuilding failed consumer