Added invariant search tools