Are you going to improve this json thing in this pull request, or do you prefer to improve it later?