Update to not use multi-json