Replaced ForeignIdentifier by EntityForeignIdentifier