Add support for Beta 3