Complete config model refactor