Implement v2 of the API