Major changes for new config infrastructure