Added more config stuff