Added assignment extraction and dynamic tree