Update for SDK v2.2.4