Added JSON storage capability