Improved output json