Improve .Age and add tree types