Updated to 2.0.0 Beta 7