Add duplication control