Added more config variables