Add expansion of constraints Person and Taxon