Added more config vars