Improved config management