Replaced CreateHashKey with CreateEntityKey