Replaced CreateHashKey with CreateEntityKey (might also fix #22)