Converted treetap to the new system