Moved JsonStorage from Common to Store