Updated for v2 of the API