Updated for 2.0.0-beta SDK.