Set up for new JSON data structuring