Updated JSON processing