Update for new json structure