Improve configs