Add facto-plicate builder
Unify to handle not-match