Added more config params