update for new entity converter mode