Add config parameters to enable/disable auto-propagate