Rework Entity.Update