Improved configuration support