Make configuration more robust