Refactors duplicate handling
Activates common duplicate handling