Updating to final 1.2.0 APIs