Improve identification in GXF and ILI