Update Optionals for beta 7