Improve configuration change handling