Improve conf_sync