Updated for SDK 2.0.