Add JsonConvertWrapper

Adds JsonConvertWrapper to fix JsonConvert visibility weirdness on Phils machine.