Improve GfTree