Change Preference to non-singleton instance