Update to use cleaner json