Removed reliance on structure tree