Simplified JSON data format

Simplified JSON format and added upload