Update to support SDK version 2.0p5