Moved more config logic to Config.pm