Switch to V2 Endpoint