Change Preference class to non-singleton pattern