Refactor JsonFileStore