Make configuration more flexible.