Added more config changes