Fix export issue, missing entity and type