Migration to SDK 2.0 (beta2)