Replaced ForeignIdentifier by EntityForeignIdentifier.