Added Json Storage
Change in the indexing