Updating to use json