Changed the way config options are loaded