Cleanup
Updated parse_json
Use another json-parser
Added additionalEntries to task