Update for Beta 3 compatibility