Updated JSON data models