Configuration made more resilient