model-entity conversion added