Moved more config params around