Replaced old config options with imported equivs