Update due to PointerEvent changes