Changed how configuration works