Make necessary change for forest refactoring.