JSON structure changes after code review