Updated code to work with new config key names.