Make relavent changes with forest refactoring.