Adding more config generation