add PKs to entity data
ef storage provider fixes