Update to reflect new config model