Moved more code over to the new config system