Added dangling tree support