HB|AF: Added tree and tig