Add support for extended identifiers and removal of duplicate identifiers