Remove tag entity and add model.