add singleton pattern on store classes