Adds better de-dupe checking