Improve config transforms