Improve configuration management