small update for equivalence iterators
support for custom variables in link contract instantiation