Added support for beta
Added support for beta