Added more config settings