Update Entity, Model

Update Entity, Model