Migrate to SDK v3.1

Last updated