Updated DataAccess for Entity Id various types