Add option to force all prefs into a single container