Add duplication checking