Add support for internalIdentifier