Updated to new config system.