redesign entity and update model