Changes needed by core-change (for adding dup detection)