Adjustments to use the new JSON API