Add failfast support