Improve config