Preferences manager refactor