Applied review comments to remove the configs from enforce configs to be global variable.