Make smarter config