Added JSON storage