entity-model conversion added