json structure improved