Use new unification-fd