Making more resilient to failures