Updating the source code to match sample json structure