Added more failure states