Changes to enable full saving of a forest