Better JSON management