Added 3.0 Beta Support