Improve JSON compliance