improved performance of Unifier