Fixing client for v2 + adding generated Android client