Improve config integration