Use new json wrappers in all calls