Rework to allow for other prefs and configs