Updated to 2.0 Beta 7