Support new sdk