More resilient setup