Updated to match the SDK v0.3.0