Switch other APIs to v2