Support newest SDK