Ongoing json improvement