Better handling of user prefs