Update for sdk 2.0

latest commit 88c14ed627
@dearmash authored