Improved configuration saving / loading