replaced "table" by "entity" using M.DataEntity