adding fields to ForestProperty to support #328, rearranging and migrating accordingly.