Change API to v2