Updated JSON structures