Update to work with SDK version v1.0.5