Update to use json