System and Entity update