Some model update and Entity work completed