Config files better managed