Support V3 api

Change-Id: I219ef553f1a3b223c2365baf9b32d26f50023f88