Updated generated import to support unique tags