Update with refactor of forest.