Added more config options