Make configuration more compact