Expand thesaurus, recignize nested delegation
0.7.0