AG-3863: also storing in json format