Improve forest generation