Changes for Config and other issues