Update EntityType with RModel base class