Update to support recent deprecations
Update config files to support new config macros