Update for 2.0 Beta 2