Updated for beta 5 optional changes