Improvements to config management